1 files changed, 31 insertions, 26 deletions

diff --git a/cpp/lib/broker/MessageStoreModule.cpp b/cpp/lib/broker/MessageStoreModule.cpp
index 676e86f84a..9939440ecb 100644
--- a/cpp/lib/broker/MessageStoreModule.cpp
+++ b/cpp/lib/broker/MessageStoreModule.cpp
@@ -28,77 +28,82 @@ MessageStoreModule::MessageStoreModule(const std::string& name) : store(name)
 {
 }
 
-void MessageStoreModule::create(const Queue& queue, const qpid::framing::FieldTable& settings)
+void MessageStoreModule::create(const PersistableQueue& queue)
 {
-    store->create(queue, settings);
+    store->create(queue);
 }
 
-void MessageStoreModule::destroy(const Queue& queue)
+void MessageStoreModule::destroy(const PersistableQueue& queue)
 {
     store->destroy(queue);
 }
 
-void MessageStoreModule::recover(RecoveryManager& registry, const MessageStoreSettings* const settings)
+void MessageStoreModule::create(const PersistableExchange& exchange)
 {
-    store->recover(registry, settings);
+    store->create(exchange);
 }
 
-void MessageStoreModule::stage(Message* const msg)
+void MessageStoreModule::destroy(const PersistableExchange& exchange)
+{
+    store->destroy(exchange);
+}
+
+void MessageStoreModule::recover(RecoveryManager& registry)
+{
+    store->recover(registry);
+}
+
+void MessageStoreModule::stage(PersistableMessage& msg)
 {
     store->stage(msg);
 }
 
-void MessageStoreModule::destroy(Message* const msg)
+void MessageStoreModule::destroy(PersistableMessage& msg)
 {
     store->destroy(msg);
 }
 
-void MessageStoreModule::appendContent(Message* const msg, const std::string& data)
+void MessageStoreModule::appendContent(PersistableMessage& msg, const std::string& data)
 {
     store->appendContent(msg, data);
 }
 
-void MessageStoreModule::loadContent(Message* const msg, string& data, uint64_t offset, uint32_t length)
+void MessageStoreModule::loadContent(PersistableMessage& msg, string& data, uint64_t offset, uint32_t length)
 {
     store->loadContent(msg, data, offset, length);
 }
 
-void MessageStoreModule::enqueue(TransactionContext* ctxt, Message* const msg, const Queue& queue, const string * const xid)
+void MessageStoreModule::enqueue(TransactionContext* ctxt, PersistableMessage& msg, const PersistableQueue& queue)
 {
-    store->enqueue(ctxt, msg, queue, xid);
+    store->enqueue(ctxt, msg, queue);
 }
 
-void MessageStoreModule::dequeue(TransactionContext* ctxt, Message* const msg, const Queue& queue, const string * const xid)
+void MessageStoreModule::dequeue(TransactionContext* ctxt, PersistableMessage& msg, const PersistableQueue& queue)
 {
-    store->dequeue(ctxt, msg, queue, xid);
+    store->dequeue(ctxt, msg, queue);
 }
 
-void MessageStoreModule::prepared(const string * const xid)
-{
-    store->prepared(xid);
-}
-
-void MessageStoreModule::committed(const string * const xid)
+std::auto_ptr<TransactionContext> MessageStoreModule::begin()
 {
-    store->committed(xid);
+    return store->begin();
 }
 
-void MessageStoreModule::aborted(const string * const xid)
+std::auto_ptr<TPCTransactionContext> MessageStoreModule::begin(const std::string& xid)
 {
-    store->aborted(xid);
+    return store->begin(xid);
 }
 
-std::auto_ptr<TransactionContext> MessageStoreModule::begin()
+void MessageStoreModule::prepare(TPCTransactionContext& txn)
 {
-    return store->begin();
+    store->prepare(txn);
 }
 
-void MessageStoreModule::commit(TransactionContext* ctxt)
+void MessageStoreModule::commit(TransactionContext& ctxt)
 {
     store->commit(ctxt);
 }
 
-void MessageStoreModule::abort(TransactionContext* ctxt)
+void MessageStoreModule::abort(TransactionContext& ctxt)
 {
     store->abort(ctxt);
 }