1 files changed, 8 insertions, 10 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java
index 69f9073f6e..433f618d1a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MessageStore.java
@@ -23,6 +23,9 @@ package org.apache.qpid.server.store;
 import java.util.Map;
 
 import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.store.handler.DistributedTransactionHandler;
+import org.apache.qpid.server.store.handler.MessageHandler;
+import org.apache.qpid.server.store.handler.MessageInstanceHandler;
 
 /**
  * MessageStore defines the interface to a storage area, which can be used to preserve the state of messages.
@@ -43,13 +46,6 @@ public interface MessageStore
      */
     void openMessageStore(ConfiguredObject<?> parent, Map<String, Object> messageStoreSettings);
 
-    /**
-     * Called after opening to recover messages and transactions with given recovery handlers
-     * @param messageRecoveryHandler
-     * @param transactionLogRecoveryHandler
-     */
-    void recoverMessageStore(MessageStoreRecoveryHandler messageRecoveryHandler, TransactionLogRecoveryHandler transactionLogRecoveryHandler);
-
     public <T extends StorableMessageMetaData> StoredMessage<T> addMessage(T metaData);
 
 
@@ -71,8 +67,10 @@ public interface MessageStore
 
     String getStoreLocation();
 
-    // TODO dead method - remove??
-    String getStoreType();
-
     void onDelete();
+
+    void visitMessages(MessageHandler handler) throws StoreException;
+    void visitMessageInstances(MessageInstanceHandler handler) throws StoreException;
+    void visitDistributedTransactions(DistributedTransactionHandler handler) throws StoreException;
+
 }