1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/lib/broker/RecoveryManager.h b/cpp/lib/broker/RecoveryManager.h
index d4e4cff3fd..700bbdcf80 100644
--- a/cpp/lib/broker/RecoveryManager.h
+++ b/cpp/lib/broker/RecoveryManager.h
@@ -21,20 +21,20 @@
 #ifndef _RecoveryManager_
 #define _RecoveryManager_
 
-#include <ExchangeRegistry.h>
-#include <QueueRegistry.h>
+#include "RecoverableQueue.h"
+#include "RecoverableMessage.h"
+#include "framing/Buffer.h"
 
 namespace qpid {
 namespace broker {
 
     class RecoveryManager{
-        QueueRegistry& queues;
-        ExchangeRegistry& exchanges;
     public:
-        RecoveryManager(QueueRegistry& queues, ExchangeRegistry& exchanges);
-        ~RecoveryManager();
-        Queue::shared_ptr recoverQueue(const std::string& name);
-        Exchange::shared_ptr recoverExchange(const std::string& name, const std::string& type);
+        virtual ~RecoveryManager(){}
+        virtual void recoverExchange(framing::Buffer& buffer) = 0;
+        virtual RecoverableQueue::shared_ptr recoverQueue(framing::Buffer& buffer) = 0;
+        virtual RecoverableMessage::shared_ptr recoverMessage(framing::Buffer& buffer) = 0;
+        virtual void recoveryComplete() = 0;
     };