diff -r 6fceb66e1ad7 -r 2fdc9cc89502 org/sonews/feed/FeedManager.java
--- a/org/sonews/feed/FeedManager.java	Fri Jun 26 16:48:50 2009 +0200
+++ b/org/sonews/feed/FeedManager.java	Wed Jul 22 14:04:05 2009 +0200
@@ -18,10 +18,10 @@
 
 package org.sonews.feed;
 
-import java.sql.SQLException;
 import java.util.List;
-import org.sonews.daemon.storage.Article;
-import org.sonews.daemon.storage.Database;
+import org.sonews.storage.Article;
+import org.sonews.storage.StorageBackendException;
+import org.sonews.storage.StorageManager;
 
 /**
  * Controlls push and pull feeder.
@@ -42,9 +42,9 @@
    * PullFeeder or PushFeeder.
    */
   public static synchronized void startFeeding()
-    throws SQLException
+    throws StorageBackendException
   {
-    List<Subscription> subsPull = Database.getInstance()
+    List<Subscription> subsPull = StorageManager.current()
       .getSubscriptions(TYPE_PULL);
     for(Subscription sub : subsPull)
     {
@@ -52,7 +52,7 @@
     }
     pullFeeder.start();
     
-    List<Subscription> subsPush = Database.getInstance()
+    List<Subscription> subsPush = StorageManager.current()
       .getSubscriptions(TYPE_PUSH);
     for(Subscription sub : subsPush)
     {