QPID-1631 : Convert MessageStore to TransactionLog and RoutingTable. Updated all references and provided a test to ensure that whilst we are transitioning the configuration we can use the old MessageStore classes that now implement both interfaces without any config updates. Updates to the configuration can come when the store are renamed *TransactionLog

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@744184 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 122 insertions, 77 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 5c54c0b57f..40b08a2e39 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -31,18 +31,17 @@ import org.apache.qpid.framing.FieldTableFactory;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.RequiredDeliveryException;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.queue.AMQMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.FailedDequeueException;
 import org.apache.qpid.server.queue.IncomingMessage;
 import org.apache.qpid.server.queue.MessageCleanupException;
-import org.apache.qpid.server.queue.MessageFactory;
 import org.apache.qpid.server.queue.MockProtocolSession;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.queue.SimpleAMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.store.MemoryMessageStore;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.SkeletonMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.subscription.Subscription;
@@ -64,11 +63,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
     protected final Set<TestQueue> queues = new HashSet<TestQueue>();
 
     /** Not used in this test, just there to stub out the routing calls */
-    private MessageStore _store = new MemoryMessageStore();
-
-    private StoreContext _storeContext = new StoreContext();
-
-    private MessageFactory _messageFactory = MessageFactory.getInstance();
+    private TransactionLog _transactionLog = new MemoryMessageStore();
 
     private int count;
 
@@ -107,7 +102,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
     protected void route(Message m) throws AMQException
     {
         exchange.route(m.getIncomingMessage());
-        m.getIncomingMessage().routingComplete(_store);
+        m.getIncomingMessage().routingComplete(_transactionLog);
         if (m.getIncomingMessage().allContentReceived())
         {
             m.getIncomingMessage().deliverToQueues();
@@ -382,9 +377,9 @@ public class AbstractHeadersExchangeTestBase extends TestCase
     static class Message
     {
 
-        private static MessageStore _messageStore = new SkeletonMessageStore();
+        private static TransactionLog _transactionLog = new SkeletonMessageStore();
 
-        private static TransactionalContext _txnContext = new NonTransactionalContext(_messageStore, new StoreContext(),
+        private static TransactionalContext _txnContext = new NonTransactionalContext(_transactionLog, new StoreContext(),
                                                                                       null,
                                                                                       new LinkedList<RequiredDeliveryException>()
         );
@@ -395,7 +390,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
 
             MessagePublishInfo mpi = getPublishRequest(id);
 
-            IncomingMessage incomming = new IncomingMessage(mpi, _txnContext, new MockProtocolSession(_messageStore), _messageStore);
+            IncomingMessage incomming = new IncomingMessage(mpi, _txnContext, new MockProtocolSession(_transactionLog), _transactionLog);
 
             try
             {
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
index 396b8c5128..f8544a33bd 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
@@ -27,10 +27,10 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.txn.TransactionalContext;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.RequiredDeliveryException;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
@@ -46,17 +46,16 @@ public class DestWildExchangeTest extends TestCase
     TopicExchange _exchange;
 
     VirtualHost _vhost;
-    MessageStore _store;
+    TransactionLog _tranasctionLog;
     StoreContext _context;
 
     InternalTestProtocolSession _protocolSession;
 
-
     public void setUp() throws AMQException
     {
         _exchange = new TopicExchange();
         _vhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
-        _store = new MemoryMessageStore();
+        _tranasctionLog = new MemoryMessageStore();
         _context = new StoreContext();
         _protocolSession = new InternalTestProtocolSession();
     }
@@ -75,7 +74,7 @@ public class DestWildExchangeTest extends TestCase
 
         MessagePublishInfo info = new MessagePublishInfoImpl(null, false, false, new AMQShortString("a.b"));
 
-        IncomingMessage message = new IncomingMessage(info, null, _protocolSession, _store);
+        IncomingMessage message = new IncomingMessage(info, null, _protocolSession, _tranasctionLog);
 
         _exchange.route(message);            
 
@@ -497,7 +496,7 @@ public class DestWildExchangeTest extends TestCase
             throws AMQException
     {
         _exchange.route(message);
-        message.routingComplete(_store);
+        message.routingComplete(_tranasctionLog);
         message.deliverToQueues();
     }
 
@@ -547,11 +546,11 @@ public class DestWildExchangeTest extends TestCase
     {
         MessagePublishInfo info = new MessagePublishInfoImpl(null, false, true, new AMQShortString(s));
 
-        TransactionalContext trancontext = new NonTransactionalContext(_store, _context, null,
+        TransactionalContext trancontext = new NonTransactionalContext(_tranasctionLog, _context, null,
                                                                        new LinkedList<RequiredDeliveryException>()
         );
 
-        IncomingMessage message = new IncomingMessage(info, trancontext,_protocolSession, _store);
+        IncomingMessage message = new IncomingMessage(info, trancontext,_protocolSession, _tranasctionLog);
         message.setContentHeaderBody( new ContentHeaderBody());
 
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
index d5db87350b..f6c307757b 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
@@ -28,11 +28,11 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.codec.AMQCodecFactory;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.SkeletonMessageStore;
 
 import javax.management.JMException;
@@ -45,7 +45,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase
     /** Used for debugging. */
     private static final Logger log = Logger.getLogger(AMQProtocolSessionMBeanTest.class);
 
-    private MessageStore _messageStore = new SkeletonMessageStore();
+    private TransactionLog _transactionLog = new SkeletonMessageStore();
     private AMQMinaProtocolSession _protocolSession;
     private AMQChannel _channel;
     private AMQProtocolSessionMBean _mbean;
@@ -60,7 +60,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase
                                                                    new AMQShortString("test"),
                                                                    true,
                                                                    _protocolSession.getVirtualHost(), null);
-        AMQChannel channel = new AMQChannel(_protocolSession,2, _messageStore);
+        AMQChannel channel = new AMQChannel(_protocolSession,2, _transactionLog);
         channel.setDefaultQueue(queue);
         _protocolSession.addChannel(channel);
         channelCount = _mbean.channels().size();
@@ -71,7 +71,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase
         assertTrue(_mbean.getMaximumNumberOfChannels() == 1000L);
 
         // check APIs
-        AMQChannel channel3 = new AMQChannel(_protocolSession, 3, _messageStore);
+        AMQChannel channel3 = new AMQChannel(_protocolSession, 3, _transactionLog);
         channel3.setLocalTransactional();
         _protocolSession.addChannel(channel3);
         _mbean.rollbackTransactions(2);
@@ -91,14 +91,14 @@ public class AMQProtocolSessionMBeanTest extends TestCase
         }
 
         // check if closing of session works
-        _protocolSession.addChannel(new AMQChannel(_protocolSession, 5, _messageStore));
+        _protocolSession.addChannel(new AMQChannel(_protocolSession, 5, _transactionLog));
         _mbean.closeConnection();
         try
         {
             channelCount = _mbean.channels().size();
             assertTrue(channelCount == 0);
             // session is now closed so adding another channel should throw an exception
-            _protocolSession.addChannel(new AMQChannel(_protocolSession, 6, _messageStore));
+            _protocolSession.addChannel(new AMQChannel(_protocolSession, 6, _transactionLog));
             fail();
         }
         catch (AMQException ex)
@@ -117,7 +117,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase
             new AMQMinaProtocolSession(new TestIoSession(), appRegistry.getVirtualHostRegistry(), new AMQCodecFactory(true),
                 null);
         _protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
-        _channel = new AMQChannel(_protocolSession, 1, _messageStore);
+        _channel = new AMQChannel(_protocolSession, 1, _transactionLog);
         _protocolSession.addChannel(_channel);
         _mbean = (AMQProtocolSessionMBean) _protocolSession.getManagedObject();
     }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
index be40535df9..1bc50db1d5 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.queue;
 
 import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -32,6 +31,7 @@ import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
 import org.apache.qpid.server.protocol.AMQMinaProtocolSession;
@@ -61,9 +61,9 @@ public class AMQQueueAlertTest extends TestCase
     private AMQQueueMBean _queueMBean;
     private VirtualHost _virtualHost;
     private AMQMinaProtocolSession _protocolSession;
-    private MessageStore _messageStore = new MemoryMessageStore();
+    private TransactionLog _transactionLog = new MemoryMessageStore();
     private StoreContext _storeContext = new StoreContext();
-    private TransactionalContext _transactionalContext = new NonTransactionalContext(_messageStore, _storeContext,
+    private TransactionalContext _transactionalContext = new NonTransactionalContext(_transactionLog, _storeContext,
                                                                                      null,
                                                                                      new LinkedList<RequiredDeliveryException>()
     );
@@ -186,7 +186,7 @@ public class AMQQueueAlertTest extends TestCase
     public void testQueueDepthAlertWithSubscribers() throws Exception
     {
         _protocolSession = new InternalTestProtocolSession();
-        AMQChannel channel = new AMQChannel(_protocolSession, 2, _messageStore);
+        AMQChannel channel = new AMQChannel(_protocolSession, 2, _transactionLog);
         _protocolSession.addChannel(channel);
 
         // Create queue
@@ -277,7 +277,7 @@ public class AMQQueueAlertTest extends TestCase
 
         ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
         contentHeaderBody.bodySize = size;   // in bytes
-        IncomingMessage message = new IncomingMessage(publish, _transactionalContext, _protocolSession, _messageStore);
+        IncomingMessage message = new IncomingMessage(publish, _transactionalContext, _protocolSession, _transactionLog);
         message.setContentHeaderBody(contentHeaderBody);
 
         return message;
@@ -308,7 +308,7 @@ public class AMQQueueAlertTest extends TestCase
             ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
             qs.add(_queue);
             messages[i].enqueue(qs);
-            messages[i].routingComplete(_messageStore);
+            messages[i].routingComplete(_transactionLog);
 
         }
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index 97c76c8e9d..daa8e4beb7 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -31,6 +31,7 @@ import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.RequiredDeliveryException;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.subscription.SubscriptionFactory;
 import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
@@ -41,7 +42,6 @@ import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.txn.NonTransactionalContext;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
@@ -60,7 +60,7 @@ public class AMQQueueMBeanTest extends TestCase
     private static long MESSAGE_SIZE = 1000;
     private AMQQueue _queue;
     private AMQQueueMBean _queueMBean;
-    private MessageStore _messageStore;
+    private TransactionLog _transactionLog;
     private StoreContext _storeContext = new StoreContext();
     private TransactionalContext _transactionalContext;
     private VirtualHost _virtualHost;
@@ -113,7 +113,7 @@ public class AMQQueueMBeanTest extends TestCase
     private void verifyBrokerState()
     {
 
-        TestableMemoryMessageStore store = new TestableMemoryMessageStore((MemoryMessageStore) _virtualHost.getMessageStore());
+        TestableMemoryMessageStore store = new TestableMemoryMessageStore((MemoryMessageStore) _virtualHost.getTransactionLog());
 
         // Unlike MessageReturnTest there is no need for a delay as there this thread does the clean up.
         assertNotNull("ContentBodyMap should not be null", store.getContentBodyMap());       
@@ -130,7 +130,7 @@ public class AMQQueueMBeanTest extends TestCase
 
 
         InternalTestProtocolSession protocolSession = new InternalTestProtocolSession();
-        AMQChannel channel = new AMQChannel(protocolSession, 1, _messageStore);
+        AMQChannel channel = new AMQChannel(protocolSession, 1, _transactionLog);
         protocolSession.addChannel(channel);
 
         Subscription subscription =
@@ -221,7 +221,7 @@ public class AMQQueueMBeanTest extends TestCase
         ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
         qs.add(_queue);
         msg.enqueue(qs);
-        msg.routingComplete(_messageStore);
+        msg.routingComplete(_transactionLog);
 
         long id = msg.getMessageId();
 
@@ -266,7 +266,7 @@ public class AMQQueueMBeanTest extends TestCase
         contentHeaderBody.bodySize = MESSAGE_SIZE;   // in bytes
         contentHeaderBody.properties = new BasicContentHeaderProperties();
         ((BasicContentHeaderProperties) contentHeaderBody.properties).setDeliveryMode((byte) (persistent ? 2 : 1));
-        IncomingMessage msg = new IncomingMessage(publish, _transactionalContext,  _protocolSession, _messageStore);
+        IncomingMessage msg = new IncomingMessage(publish, _transactionalContext,  _protocolSession, _transactionLog);
         msg.setContentHeaderBody(contentHeaderBody);
         return msg;
 
@@ -278,9 +278,9 @@ public class AMQQueueMBeanTest extends TestCase
         super.setUp();
         IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1);
         _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
-        _messageStore = _virtualHost.getMessageStore();
+        _transactionLog = _virtualHost.getTransactionLog();
 
-        _transactionalContext = new NonTransactionalContext(_messageStore, _storeContext,
+        _transactionalContext = new NonTransactionalContext(_transactionLog, _storeContext,
                                                             null,
                                                             new LinkedList<RequiredDeliveryException>()
         );
@@ -307,7 +307,7 @@ public class AMQQueueMBeanTest extends TestCase
             currentMessage.enqueue(qs);
 
             // route header
-            currentMessage.routingComplete(_messageStore);
+            currentMessage.routingComplete(_transactionLog);
 
             // Add the body so we have somthing to test later
             currentMessage.addContentBodyFrame(
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockPersistentAMQMessage.java b/java/broker/src/test/java/org/apache/qpid/server/queue/MockPersistentAMQMessage.java
index 3633481012..2a51f42e4e 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockPersistentAMQMessage.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/MockPersistentAMQMessage.java
@@ -21,13 +21,13 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 
 public class MockPersistentAMQMessage extends PersistentAMQMessage
 {
-    public MockPersistentAMQMessage(long messageId, MessageStore store)
+    public MockPersistentAMQMessage(long messageId, TransactionLog transactionLog)
             throws AMQException
     {
-       super(messageId, store);
+       super(messageId, transactionLog);
     }
 }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java b/java/broker/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
index 99c88fac3e..0cc33bf102 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
@@ -24,11 +24,11 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQConnectionException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.output.ProtocolOutputConverter;
 import org.apache.qpid.server.output.ProtocolOutputConverterRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.transport.Sender;
 
 import javax.security.sasl.SaslServer;
@@ -41,13 +41,11 @@ import java.security.Principal;
  */
 public class MockProtocolSession implements AMQProtocolSession
 {
-    private MessageStore _messageStore;
 
     private Map<Integer, AMQChannel> _channelMap = new HashMap<Integer, AMQChannel>();
 
-    public MockProtocolSession(MessageStore messageStore)
+    public MockProtocolSession(TransactionLog transactionLog)
     {
-        _messageStore = messageStore;
     }
 
     public void dataBlockReceived(AMQDataBlock message) throws Exception
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java b/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
index 1e47f764df..bcbd83cde3 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
@@ -73,6 +73,7 @@ public class PrincipalPermissionsTest extends TestCase
         } 
         catch (Exception e)
         {
+            e.printStackTrace();
             fail(e.getMessage());
         }
     }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index 36f640a325..7722eae116 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -30,7 +30,6 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.IncomingMessage;
-import org.apache.qpid.server.queue.MessageFactory;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.queue.AMQPriorityQueue;
 import org.apache.qpid.server.queue.SimpleAMQQueue;
@@ -39,6 +38,7 @@ import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.ContentHeaderBody;
@@ -151,7 +151,7 @@ public class MessageStoreTest extends TestCase
         //Load the Virtualhost with the required MessageStore
         reload(configuration);
 
-        MessageStore messageStore = _virtualHost.getMessageStore();
+        TransactionLog transactionLog = _virtualHost.getTransactionLog();
 
         createAllQueues();
         createAllTopicQueues();
@@ -190,9 +190,9 @@ public class MessageStoreTest extends TestCase
 
         assertEquals("Not all queues correctly registered", 8, _virtualHost.getQueueRegistry().getQueues().size());
 
-        if (!messageStore.isPersistent())
+        if (!transactionLog.isPersistent())
         {
-            _logger.warn("Unable to test Persistent capabilities of messages store(" + messageStore.getClass() + ") as it is not capable of peristence.");
+            _logger.warn("Unable to test Persistent capabilities of messages store(" + transactionLog.getClass() + ") as it is not capable of peristence.");
             return;
         }
 
@@ -348,10 +348,10 @@ public class MessageStoreTest extends TestCase
         try
         {
             currentMessage = new IncomingMessage(messageInfo,
-                                                 new NonTransactionalContext(_virtualHost.getMessageStore(),
+                                                 new NonTransactionalContext(_virtualHost.getTransactionLog(),
                                                                              new StoreContext(), null, null),
                                                  new InternalTestProtocolSession(),
-                                                 _virtualHost.getMessageStore());
+                                                 _virtualHost.getTransactionLog());
         }
         catch (AMQException e)
         {
@@ -388,7 +388,7 @@ public class MessageStoreTest extends TestCase
 
         try
         {
-            currentMessage.routingComplete(_virtualHost.getMessageStore());
+            currentMessage.routingComplete(_virtualHost.getTransactionLog());
         }
         catch (AMQException e)
         {
@@ -486,7 +486,7 @@ public class MessageStoreTest extends TestCase
 
             if (queue.isDurable() && !queue.isAutoDelete())
             {
-                _virtualHost.getMessageStore().createQueue(queue, queueArguments);
+                _virtualHost.getRoutingTable().createQueue(queue, queueArguments);
             }
         }
         catch (AMQException e)
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java b/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
index f08a15a8a7..a5b65b527c 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
@@ -29,6 +29,8 @@ import org.apache.qpid.server.queue.MessageMetaData;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.transactionlog.TransactionLog;
+import org.apache.qpid.server.routing.RoutingTable;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
@@ -37,7 +39,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * A message store that does nothing. Designed to be used in tests that do not want to use any message store
  * functionality.
  */
-public class SkeletonMessageStore implements MessageStore
+public class SkeletonMessageStore implements TransactionLog , RoutingTable
 {
     private final AtomicLong _messageId = new AtomicLong(1);
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java b/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
index 84d3d313d1..ca6644d141 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
@@ -22,9 +22,9 @@ package org.apache.qpid.server.txn;
 
 import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestMemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
@@ -283,13 +283,13 @@ public class TxnBufferTest extends TestCase
 
     class TxnTester extends NullOp
     {
-        private final MessageStore store;
+        private final TransactionLog store;
 
         private final StoreContext context = new StoreContext();
 
-        TxnTester(MessageStore store)
+        TxnTester(TransactionLog transactionLog)
         {
-            this.store = store;
+            this.store = transactionLog;
         }
 
         public void prepare() throws AMQException
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index 9e24f13127..d150faf94a 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -30,8 +30,8 @@ import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.ConsumerTagNotUniqueException;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.framing.AMQShortString;
@@ -47,7 +47,7 @@ import org.apache.qpid.exchange.ExchangeDefaults;
 public class InternalBrokerBaseCase extends TestCase
 {
     protected IApplicationRegistry _registry;
-    protected MessageStore _messageStore;
+    protected TransactionLog _transactionLog;
     protected MockChannel _channel;
     protected InternalTestProtocolSession _session;
     protected VirtualHost _virtualHost;
@@ -62,7 +62,7 @@ public class InternalBrokerBaseCase extends TestCase
         ApplicationRegistry.initialise(_registry);
         _virtualHost = _registry.getVirtualHostRegistry().getVirtualHost("test");        
 
-        _messageStore = _virtualHost.getMessageStore();
+        _transactionLog = _virtualHost.getTransactionLog();
 
         QUEUE_NAME = new AMQShortString("test");
         _queue = AMQQueueFactory.createAMQQueueImpl(QUEUE_NAME, false, new AMQShortString("testowner"),
@@ -78,7 +78,7 @@ public class InternalBrokerBaseCase extends TestCase
 
         _session.setVirtualHost(_virtualHost);
 
-        _channel = new MockChannel(_session, 1, _messageStore);
+        _channel = new MockChannel(_session, 1, _transactionLog);
 
         _session.addChannel(_channel);
     }
@@ -91,7 +91,7 @@ public class InternalBrokerBaseCase extends TestCase
 
     protected void checkStoreContents(int messageCount)
     {
-        assertEquals("Message header count incorrect in the MetaDataMap", messageCount, ((TestableMemoryMessageStore) _messageStore).getMessageMetaDataMap().size());
+        assertEquals("Message header count incorrect in the MetaDataMap", messageCount, ((TestableMemoryMessageStore) _transactionLog).getMessageMetaDataMap().size());
 
         //The above publish message is sufficiently small not to fit in the header so no Body is required.
         //assertEquals("Message body count incorrect in the ContentBodyMap", messageCount, ((TestableMemoryMessageStore) _messageStore).getContentBodyMap().size());
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index b6d42e6068..2605ed0d11 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
@@ -27,14 +27,13 @@ import org.apache.qpid.server.management.NoopManagedObjectRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.security.access.ACLManager;
-import org.apache.qpid.server.security.access.ACLPlugin;
 import org.apache.qpid.server.security.access.plugins.AllowAll;
 import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
 import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -49,11 +48,10 @@ public class TestApplicationRegistry extends ApplicationRegistry
 
     private ExchangeFactory _exchangeFactory;
 
-    private MessageStore _messageStore;
+    private TransactionLog _transactionLog;
 
     private VirtualHost _vHost;
 
-
     public TestApplicationRegistry()
     {
         super(new MapConfiguration(new HashMap()));
@@ -73,11 +71,11 @@ public class TestApplicationRegistry extends ApplicationRegistry
 
         _managedObjectRegistry = new NoopManagedObjectRegistry();
 
-        _messageStore = new TestableMemoryMessageStore();
+        _transactionLog = new TestableMemoryMessageStore();
 
         _virtualHostRegistry = new VirtualHostRegistry();
 
-        _vHost = new VirtualHost("test", _messageStore);
+        _vHost = new VirtualHost("test", _transactionLog);
 
         _virtualHostRegistry.registerVirtualHost(_vHost);
 
@@ -114,9 +112,9 @@ public class TestApplicationRegistry extends ApplicationRegistry
         _accessManager = newManager;
     }
 
-    public MessageStore getMessageStore()
+    public TransactionLog getTransactionLog()
     {
-        return _messageStore;
+        return _transactionLog;
     }
 
 }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualhostInitRoutingTableFromTransactionLogTest.java b/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualhostInitRoutingTableFromTransactionLogTest.java
new file mode 100644
index 0000000000..ba19fd5d5e
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualhostInitRoutingTableFromTransactionLogTest.java
@@ -0,0 +1,52 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.virtualhost;
+
+import junit.framework.TestCase;
+import org.apache.commons.configuration.PropertiesConfiguration;
+
+public class VirtualhostInitRoutingTableFromTransactionLogTest extends TestCase
+{
+    public void test()
+    {
+        PropertiesConfiguration env = new PropertiesConfiguration();
+
+
+        env.addProperty("store.class", "org.apache.qpid.server.store.MemoryMessageStore");
+
+        VirtualHost _virtualHost = null;
+        try
+        {
+            _virtualHost = new VirtualHost("test", env);
+
+            assertNotNull(_virtualHost.getTransactionLog());
+            assertNotNull(_virtualHost.getRoutingTable());
+            assertEquals(_virtualHost.getTransactionLog(),_virtualHost.getRoutingTable());
+        }
+        catch (Exception e)
+        {
+            fail(e.getMessage());
+        }
+
+
+    }
+
+}
diff --git a/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java b/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
index 447d09429d..77767463ea 100644
--- a/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
+++ b/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
@@ -21,18 +21,18 @@
 package org.apache.qpid.util;
 
 import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 
 public class MockChannel extends AMQChannel
 {
-    public MockChannel(AMQProtocolSession session, int channelId, MessageStore messageStore)
+    public MockChannel(AMQProtocolSession session, int channelId, TransactionLog transactionLog)
             throws AMQException
     {
-        super(session, channelId, messageStore);
+        super(session, channelId, transactionLog);
     }
 
     public Subscription getSubscription(AMQShortString subscription)