qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1494667 [2/2] - in /qpid/trunk/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/main/java/resources/ bdbstore/src/main/java/resources/js/ bdbs...
Date Wed, 19 Jun 2013 15:51:32 GMT
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Wed Jun 19 15:51:30 2013
@@ -23,7 +23,6 @@ package org.apache.qpid.server.model;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -39,14 +38,10 @@ import org.apache.qpid.server.logging.Sy
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.TestLogActor;
 import org.apache.qpid.server.stats.StatisticsGatherer;
-import org.apache.qpid.server.store.Event;
-import org.apache.qpid.server.store.EventListener;
-import org.apache.qpid.server.store.EventManager;
 import org.apache.qpid.server.store.MemoryMessageStore;
-import org.apache.qpid.server.store.NullMessageStore;
-import org.apache.qpid.server.store.StateManager;
 import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.server.virtualhost.StandardVirtualHost;
+import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 
 public class VirtualHostTest extends TestCase
 {
@@ -96,6 +91,7 @@ public class VirtualHostTest extends Tes
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(VirtualHost.NAME, getName());
+        attributes.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
         attributes.put(VirtualHost.STORE_TYPE, MemoryMessageStore.TYPE);
         attributes.put(VirtualHost.STATE, State.QUIESCED);
 
@@ -130,36 +126,11 @@ public class VirtualHostTest extends Tes
         assertEquals("Unexpected state", State.DELETED, host.getAttribute(VirtualHost.STATE));
     }
 
-    public void testReplicaState()
-    {
-        String hostName = getName();
-        File configPath = TestFileUtils.createTempFile(this, ".xml", "<virtualhosts><virtualhost><" + hostName
-                + "><store><class>" + ReplicaMessageStore.class.getName() + "</class></store></" + hostName
-                + "></virtualhost></virtualhosts>");
-        try
-        {
-            Map<String, Object> attributes = new HashMap<String, Object>();
-            attributes.put(VirtualHost.NAME, hostName);
-            attributes.put(VirtualHost.CONFIG_PATH, configPath.getAbsolutePath());
-
-            VirtualHost host = createHost(attributes);
-
-            assertEquals("Unexpected state", State.INITIALISING, host.getAttribute(VirtualHost.STATE));
-
-            host.setDesiredState(State.INITIALISING, State.ACTIVE);
-
-            assertEquals("Unexpected state", State.REPLICA, host.getAttribute(VirtualHost.STATE));
-        }
-        finally
-        {
-            configPath.delete();
-        }
-    }
-
     private VirtualHost createHost()
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(VirtualHost.NAME, getName());
+        attributes.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
         attributes.put(VirtualHost.STORE_TYPE, MemoryMessageStore.TYPE);
 
         VirtualHost host = createHost(attributes);
@@ -174,34 +145,4 @@ public class VirtualHostTest extends Tes
         return new VirtualHostRecoverer(_statisticsGatherer).create(_recovererProvider, entry, _broker);
     }
 
-    public static final class ReplicaMessageStore extends NullMessageStore
-    {
-        private final EventManager _eventManager = new EventManager();
-        private final StateManager _stateManager = new StateManager(_eventManager);
-
-        @Override
-        public void activate() throws Exception
-        {
-            _stateManager.attainState(org.apache.qpid.server.store.State.INITIALISING);
-            _stateManager.attainState(org.apache.qpid.server.store.State.INITIALISED);
-            _stateManager.attainState(org.apache.qpid.server.store.State.ACTIVATING);
-            _stateManager.attainState(org.apache.qpid.server.store.State.ACTIVE);
-
-            // this should change the virtual host state to PASSIVE
-            _stateManager.attainState(org.apache.qpid.server.store.State.INITIALISED);
-        }
-
-        @Override
-        public void addEventListener(EventListener eventListener, Event... events)
-        {
-            _eventManager.addEventListener(eventListener, events);
-        }
-
-        @Override
-        public String getStoreType()
-        {
-            return ReplicaMessageStore.class.getSimpleName();
-        }
-    }
-
 }

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java Wed Jun 19 15:51:30 2013
@@ -65,7 +65,7 @@ public class DurableConfigurationStoreTe
     private static final String EXCHANGE_NAME = "exchangeName";
     private String _storePath;
     private String _storeName;
-    private MessageStore _store;
+    private MessageStore _messageStore;
     private Configuration _configuration;
 
     private ConfigurationRecoveryHandler _recoveryHandler;
@@ -84,6 +84,7 @@ public class DurableConfigurationStoreTe
     private FieldTable _bindingArgs;
     private UUID _queueId;
     private UUID _exchangeId;
+    private DurableConfigurationStore _configStore;
 
     public void setUp() throws Exception
     {
@@ -135,7 +136,7 @@ public class DurableConfigurationStoreTe
     public void testCreateExchange() throws Exception
     {
         Exchange exchange = createTestExchange();
-        _store.createExchange(exchange);
+        _configStore.createExchange(exchange);
 
         reopenStore();
         verify(_exchangeRecoveryHandler).exchange(_exchangeId, getName(), getName() + "Type", true);
@@ -144,9 +145,9 @@ public class DurableConfigurationStoreTe
     public void testRemoveExchange() throws Exception
     {
         Exchange exchange = createTestExchange();
-        _store.createExchange(exchange);
+        _configStore.createExchange(exchange);
 
-        _store.removeExchange(exchange);
+        _configStore.removeExchange(exchange);
 
         reopenStore();
         verify(_exchangeRecoveryHandler, never()).exchange(any(UUID.class), anyString(), anyString(), anyBoolean());
@@ -157,7 +158,7 @@ public class DurableConfigurationStoreTe
         AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false);
         Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
                 _exchange, FieldTable.convertToMap(_bindingArgs));
-        _store.bindQueue(binding);
+        _configStore.bindQueue(binding);
 
         reopenStore();
 
@@ -171,9 +172,9 @@ public class DurableConfigurationStoreTe
         AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false);
         Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
                 _exchange, FieldTable.convertToMap(_bindingArgs));
-        _store.bindQueue(binding);
+        _configStore.bindQueue(binding);
 
-        _store.unbindQueue(binding);
+        _configStore.unbindQueue(binding);
         reopenStore();
 
         verify(_bindingRecoveryHandler, never()).binding(any(UUID.class), any(UUID.class), any(UUID.class), anyString(),
@@ -183,7 +184,7 @@ public class DurableConfigurationStoreTe
     public void testCreateQueueAMQQueue() throws Exception
     {
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true);
-        _store.createQueue(queue);
+        _configStore.createQueue(queue);
 
         reopenStore();
         verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, null, null);
@@ -197,7 +198,7 @@ public class DurableConfigurationStoreTe
         attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
 
         FieldTable arguments = FieldTable.convertToFieldTable(attributes);
-        _store.createQueue(queue, arguments);
+        _configStore.createQueue(queue, arguments);
 
         reopenStore();
         verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, arguments, null);
@@ -208,7 +209,7 @@ public class DurableConfigurationStoreTe
         Exchange alternateExchange = createTestAlternateExchange();
 
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, alternateExchange);
-        _store.createQueue(queue);
+        _configStore.createQueue(queue);
 
         reopenStore();
         verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, null, alternateExchange.getId());
@@ -230,11 +231,11 @@ public class DurableConfigurationStoreTe
         attributes.put("x-qpid-dlq-enabled", Boolean.TRUE);
         attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
         FieldTable arguments = FieldTable.convertToFieldTable(attributes);
-        _store.createQueue(queue, arguments);
+        _configStore.createQueue(queue, arguments);
 
         // update the queue to have exclusive=false
         queue = createTestQueue(getName(), getName() + "Owner", false);
-        _store.updateQueue(queue);
+        _configStore.updateQueue(queue);
 
         reopenStore();
         verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", false, arguments, null);
@@ -248,12 +249,12 @@ public class DurableConfigurationStoreTe
         attributes.put("x-qpid-dlq-enabled", Boolean.TRUE);
         attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
         FieldTable arguments = FieldTable.convertToFieldTable(attributes);
-        _store.createQueue(queue, arguments);
+        _configStore.createQueue(queue, arguments);
 
         // update the queue to have exclusive=false
         Exchange alternateExchange = createTestAlternateExchange();
         queue = createTestQueue(getName(), getName() + "Owner", false, alternateExchange);
-        _store.updateQueue(queue);
+        _configStore.updateQueue(queue);
 
         reopenStore();
         verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", false, arguments, alternateExchange.getId());
@@ -267,10 +268,10 @@ public class DurableConfigurationStoreTe
         attributes.put("x-qpid-dlq-enabled", Boolean.TRUE);
         attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
         FieldTable arguments = FieldTable.convertToFieldTable(attributes);
-        _store.createQueue(queue, arguments);
+        _configStore.createQueue(queue, arguments);
 
         // remove queue
-        _store.removeQueue(queue);
+        _configStore.removeQueue(queue);
         reopenStore();
         verify(_queueRecoveryHandler, never()).queue(any(UUID.class), anyString(), anyString(), anyBoolean(),
                 any(FieldTable.class), any(UUID.class));
@@ -306,18 +307,19 @@ public class DurableConfigurationStoreTe
 
     private void reopenStore() throws Exception
     {
-        if (_store != null)
+        if (_messageStore != null)
         {
-            _store.close();
+            _messageStore.close();
         }
-        _store = createStore();
+        _messageStore = createMessageStore();
+        _configStore = createConfigStore();
 
-        _store.configureConfigStore(_storeName, _recoveryHandler, _configuration);
-        _store.configureMessageStore(_storeName, _messageStoreRecoveryHandler, _logRecoveryHandler, _configuration);
-        _store.activate();
+        _configStore.configureConfigStore(_storeName, _recoveryHandler, _configuration);
+        _messageStore.configureMessageStore(_storeName, _messageStoreRecoveryHandler, _logRecoveryHandler, _configuration);
+        _messageStore.activate();
     }
 
-    protected MessageStore createStore() throws Exception
+    protected MessageStore createMessageStore() throws Exception
     {
         String storeClass = System.getProperty(MESSAGE_STORE_CLASS_NAME_KEY);
         if (storeClass == null)
@@ -329,6 +331,26 @@ public class DurableConfigurationStoreTe
         return messageStore;
     }
 
+    protected DurableConfigurationStore createConfigStore() throws Exception
+    {
+        String storeClass = System.getProperty(CONFIGURATION_STORE_CLASS_NAME_KEY);
+        if (storeClass == null)
+        {
+            storeClass = DerbyMessageStore.class.getName();
+        }
+        Class<DurableConfigurationStore> clazz = (Class<DurableConfigurationStore>) Class.forName(storeClass);
+        DurableConfigurationStore configurationStore ;
+        if(clazz.isInstance(_messageStore))
+        {
+            configurationStore = (DurableConfigurationStore) _messageStore;
+        }
+        else
+        {
+            configurationStore = (DurableConfigurationStore) Class.forName(storeClass).newInstance();
+        }
+        return configurationStore;
+    }
+
     public void testRecordXid() throws Exception
     {
         Record enqueueRecord = getTestRecord(1);
@@ -338,13 +360,13 @@ public class DurableConfigurationStoreTe
         byte[] globalId = new byte[] { 1 };
         byte[] branchId = new byte[] { 2 };
 
-        Transaction transaction = _store.newTransaction();
+        Transaction transaction = _messageStore.newTransaction();
         transaction.recordXid(1l, globalId, branchId, enqueues, dequeues);
         transaction.commitTran();
         reopenStore();
         verify(_dtxRecordRecoveryHandler).dtxRecord(1l, globalId, branchId, enqueues, dequeues);
 
-        transaction = _store.newTransaction();
+        transaction = _messageStore.newTransaction();
         transaction.removeXid(1l, globalId, branchId);
         transaction.commitTran();
 

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java Wed Jun 19 15:51:30 2013
@@ -71,7 +71,7 @@ public abstract class MessageStoreQuotaE
         applyStoreSpecificConfiguration(config);
 
         _store = createStore();
-        _store.configureConfigStore("test", null, config);
+        ((DurableConfigurationStore)_store).configureConfigStore("test", null, config);
 
         _transactionResource = UUID.randomUUID();
         _events = new ArrayList<Event>();

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java Wed Jun 19 15:51:30 2013
@@ -65,7 +65,7 @@ import java.util.Map;
 /**
  * This tests the MessageStores by using the available interfaces.
  *
- * For persistent stores, it validates that Exchanges, Queues, Bindings and 
+ * For persistent stores, it validates that Exchanges, Queues, Bindings and
  * Messages are persisted and recovered correctly.
  */
 public class MessageStoreTest extends QpidTestCase
@@ -106,7 +106,7 @@ public class MessageStoreTest extends Qp
         BrokerTestHelper.setUp();
 
         String storePath = System.getProperty("QPID_WORK") + File.separator + getName();
-        
+
         _config = new PropertiesConfiguration();
         _config.addProperty("store.class", getTestProfileMessageStoreClassName());
         _config.addProperty("store.environment-path", storePath);
@@ -224,8 +224,8 @@ public class MessageStoreTest extends Qp
 
     /**
      * Tests message persistence by running the testQueueExchangeAndBindingCreation() method above
-     * before reloading the virtual host and ensuring that the persistent messages were restored. 
-     * 
+     * before reloading the virtual host and ensuring that the persistent messages were restored.
+     *
      * More specific testing of message persistence is left to store-specific unit testing.
      */
     public void testMessagePersistence() throws Exception
@@ -238,7 +238,7 @@ public class MessageStoreTest extends Qp
         validateMessageOnQueues(2, false);
         validateMessageOnTopics(1, false);
     }
-    
+
     /**
      * Tests message removal by running the testMessagePersistence() method above before
      * clearing the queues, reloading the virtual host, and ensuring that the persistent
@@ -250,15 +250,15 @@ public class MessageStoreTest extends Qp
 
         QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
-        assertEquals("Incorrect number of queues registered after recovery", 
+        assertEquals("Incorrect number of queues registered after recovery",
                 6,  queueRegistry.getQueues().size());
 
         //clear the queue
         queueRegistry.getQueue(durableQueueName).clearQueue();
-        
+
         //check the messages are gone
         validateMessageOnQueue(durableQueueName, 0);
-        
+
         //reload and verify messages arent restored
         reloadVirtualHost();
 
@@ -284,17 +284,17 @@ public class MessageStoreTest extends Qp
 
         QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
-        assertEquals("Incorrect number of queues registered after recovery", 
+        assertEquals("Incorrect number of queues registered after recovery",
                 6,  queueRegistry.getQueues().size());
 
         //Validate the non-Durable Queues were not recovered.
-        assertNull("Non-Durable queue still registered:" + priorityQueueName, 
+        assertNull("Non-Durable queue still registered:" + priorityQueueName,
                 queueRegistry.getQueue(priorityQueueName));
-        assertNull("Non-Durable queue still registered:" + queueName, 
+        assertNull("Non-Durable queue still registered:" + queueName,
                 queueRegistry.getQueue(queueName));
-        assertNull("Non-Durable queue still registered:" + priorityTopicQueueName, 
+        assertNull("Non-Durable queue still registered:" + priorityTopicQueueName,
                 queueRegistry.getQueue(priorityTopicQueueName));
-        assertNull("Non-Durable queue still registered:" + topicQueueName, 
+        assertNull("Non-Durable queue still registered:" + topicQueueName,
                 queueRegistry.getQueue(topicQueueName));
 
         //Validate normally expected properties of Queues/Topics
@@ -320,26 +320,26 @@ public class MessageStoreTest extends Qp
                 1,  queueRegistry.getQueues().size());
 
         reloadVirtualHost();
-        
+
         queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of queues registered after first recovery",
                 1,  queueRegistry.getQueues().size());
-        
+
         //test that removing the queue means it is not recovered next time
-        getVirtualHost().getMessageStore().removeQueue(queueRegistry.getQueue(durableQueueName));
+        getVirtualHost().getDurableConfigurationStore().removeQueue(queueRegistry.getQueue(durableQueueName));
 
         reloadVirtualHost();
-        
+
         queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of queues registered after second recovery",
                 0,  queueRegistry.getQueues().size());
-        assertNull("Durable queue was not removed:" + durableQueueName, 
+        assertNull("Durable queue was not removed:" + durableQueueName,
                 queueRegistry.getQueue(durableQueueName));
     }
 
     /**
      * Tests exchange persistence by creating a selection of exchanges, both durable
-     * and non durable, and ensuring that following the recovery process the correct 
+     * and non durable, and ensuring that following the recovery process the correct
      * durable exchanges are still present.
      */
     public void testExchangePersistence() throws Exception
@@ -348,7 +348,7 @@ public class MessageStoreTest extends Qp
 
         Map<AMQShortString, Exchange> oldExchanges = createExchanges();
 
-        assertEquals("Incorrect number of exchanges registered before recovery", 
+        assertEquals("Incorrect number of exchanges registered before recovery",
                 origExchangeCount + 3, getVirtualHost().getExchangeRegistry().getExchangeNames().size());
 
         reloadVirtualHost();
@@ -367,33 +367,33 @@ public class MessageStoreTest extends Qp
         int origExchangeCount = getVirtualHost().getExchangeRegistry().getExchangeNames().size();
 
         createExchange(DirectExchange.TYPE, directExchangeName, true);
-       
+
         ExchangeRegistry exchangeRegistry = getVirtualHost().getExchangeRegistry();
-        assertEquals("Incorrect number of exchanges registered before recovery", 
+        assertEquals("Incorrect number of exchanges registered before recovery",
                 origExchangeCount + 1,  exchangeRegistry.getExchangeNames().size());
 
         reloadVirtualHost();
-        
+
         exchangeRegistry = getVirtualHost().getExchangeRegistry();
-        assertEquals("Incorrect number of exchanges registered after first recovery", 
+        assertEquals("Incorrect number of exchanges registered after first recovery",
                 origExchangeCount + 1,  exchangeRegistry.getExchangeNames().size());
-        
+
         //test that removing the exchange means it is not recovered next time
-        getVirtualHost().getMessageStore().removeExchange(exchangeRegistry.getExchange(directExchangeName));
+        getVirtualHost().getDurableConfigurationStore().removeExchange(exchangeRegistry.getExchange(directExchangeName));
 
         reloadVirtualHost();
-        
+
         exchangeRegistry = getVirtualHost().getExchangeRegistry();
-        assertEquals("Incorrect number of exchanges registered after second recovery", 
+        assertEquals("Incorrect number of exchanges registered after second recovery",
                 origExchangeCount,  exchangeRegistry.getExchangeNames().size());
-        assertNull("Durable exchange was not removed:" + directExchangeName, 
+        assertNull("Durable exchange was not removed:" + directExchangeName,
                 exchangeRegistry.getExchange(directExchangeName));
     }
-    
+
     /**
      * Tests binding persistence by creating a selection of queues and exchanges, both durable
      * and non durable, then adding bindings with and without selectors before reloading the
-     * virtual host and verifying that following the recovery process the correct durable 
+     * virtual host and verifying that following the recovery process the correct durable
      * bindings (those for durable queues to durable exchanges) are still present.
      */
     public void testBindingPersistence() throws Exception
@@ -413,7 +413,7 @@ public class MessageStoreTest extends Qp
         bindAllQueuesToExchange(directExchange, directRouting);
         bindAllTopicQueuesToExchange(topicExchange, topicRouting);
 
-        assertEquals("Incorrect number of exchanges registered before recovery", 
+        assertEquals("Incorrect number of exchanges registered before recovery",
                 origExchangeCount + 3, getVirtualHost().getExchangeRegistry().getExchangeNames().size());
 
         reloadVirtualHost();
@@ -422,10 +422,10 @@ public class MessageStoreTest extends Qp
 
         validateBindingProperties();
     }
-    
+
     /**
      * Tests binding removal by creating a durable exchange, and queue, binding them together,
-     * recovering to verify the persistence, then removing it from the store, and ensuring 
+     * recovering to verify the persistence, then removing it from the store, and ensuring
      * that following the second reload process it is not recovered.
      */
     public void testDurableBindingRemoval() throws Exception
@@ -437,14 +437,14 @@ public class MessageStoreTest extends Qp
         createQueue(durableQueueName, false, true, false, false);
         bindQueueToExchange(exch, directRouting, queueRegistry.getQueue(durableQueueName), false, null);
 
-        assertEquals("Incorrect number of bindings registered before recovery", 
+        assertEquals("Incorrect number of bindings registered before recovery",
                 1, queueRegistry.getQueue(durableQueueName).getBindings().size());
 
         //verify binding is actually normally recovered
         reloadVirtualHost();
 
         queueRegistry = getVirtualHost().getQueueRegistry();
-        assertEquals("Incorrect number of bindings registered after first recovery", 
+        assertEquals("Incorrect number of bindings registered after first recovery",
                 1, queueRegistry.getQueue(durableQueueName).getBindings().size());
 
         ExchangeRegistry exchangeRegistry = getVirtualHost().getExchangeRegistry();
@@ -457,13 +457,13 @@ public class MessageStoreTest extends Qp
         reloadVirtualHost();
 
         queueRegistry = getVirtualHost().getQueueRegistry();
-        assertEquals("Incorrect number of bindings registered after second recovery", 
+        assertEquals("Incorrect number of bindings registered after second recovery",
                 0, queueRegistry.getQueue(durableQueueName).getBindings().size());
     }
 
     /**
      * Validates that the durable exchanges are still present, the non durable exchange is not,
-     * and that the new exchanges are not the same objects as the provided list (i.e. that the 
+     * and that the new exchanges are not the same objects as the provided list (i.e. that the
      * reload actually generated new exchange objects)
      */
     private void validateExchanges(int originalNumExchanges, Map<AMQShortString, Exchange> oldExchanges)
@@ -484,7 +484,7 @@ public class MessageStoreTest extends Qp
                 registry.getExchange(topicExchangeName) != oldExchanges.get(topicExchangeName));
 
         // There should only be the original exchanges + our 2 recovered durable exchanges
-        assertEquals("Incorrect number of exchanges available", 
+        assertEquals("Incorrect number of exchanges available",
                 originalNumExchanges + 2, registry.getExchangeNames().size());
     }
 
@@ -562,7 +562,7 @@ public class MessageStoreTest extends Qp
         {
             assertNotSame("Queues cant be both Priority and LastValue based", usePriority, lastValueQueue);
         }
-        
+
         if (usePriority)
         {
             assertEquals("Queue is no longer a Priority Queue", AMQPriorityQueue.class, queue.getClass());
@@ -705,7 +705,7 @@ public class MessageStoreTest extends Qp
     {
 
         FieldTable queueArguments = null;
-        
+
         if(usePriority || lastValueQueue)
         {
             assertNotSame("Queues cant be both Priority and LastValue based", usePriority, lastValueQueue);
@@ -716,7 +716,7 @@ public class MessageStoreTest extends Qp
             queueArguments = new FieldTable();
             queueArguments.put(new AMQShortString(AMQQueueFactory.X_QPID_PRIORITIES), DEFAULT_PRIORTY_LEVEL);
         }
-        
+
         if (lastValueQueue)
         {
             queueArguments = new FieldTable();
@@ -735,7 +735,7 @@ public class MessageStoreTest extends Qp
 
             if (queue.isDurable() && !queue.isAutoDelete())
             {
-                getVirtualHost().getMessageStore().createQueue(queue, queueArguments);
+                getVirtualHost().getDurableConfigurationStore().createQueue(queue, queueArguments);
             }
         }
         catch (AMQException e)
@@ -779,7 +779,7 @@ public class MessageStoreTest extends Qp
             getVirtualHost().getExchangeRegistry().registerExchange(exchange);
             if (durable)
             {
-                getVirtualHost().getMessageStore().createExchange(exchange);
+                getVirtualHost().getDurableConfigurationStore().createExchange(exchange);
             }
         }
         catch (AMQException e)
@@ -836,7 +836,7 @@ public class MessageStoreTest extends Qp
             fail(e.getMessage());
         }
     }
-    
+
     protected void unbindQueueFromExchange(Exchange exchange, AMQShortString routingKey, AMQQueue queue, boolean useSelector, FieldTable queueArguments)
     {
         FieldTable bindArguments = null;
@@ -931,4 +931,4 @@ public class MessageStoreTest extends Qp
             return _routingKey;
         }
     }
-}
\ No newline at end of file
+}

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java Wed Jun 19 15:51:30 2013
@@ -73,7 +73,7 @@ public abstract class MessageStoreTestCa
         setUpStoreConfiguration(_storeConfiguration);
 
         _store = createMessageStore();
-        _store.configureConfigStore(getTestName(), _recoveryHandler, _storeConfiguration);
+        ((DurableConfigurationStore)_store).configureConfigStore(getTestName(), _recoveryHandler, _storeConfiguration);
         _store.configureMessageStore(getTestName(), _messageStoreRecoveryHandler, _logRecoveryHandler, _storeConfiguration);
     }
 

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Wed Jun 19 15:51:30 2013
@@ -55,8 +55,10 @@ import org.apache.qpid.server.security.S
 import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.stats.StatisticsGatherer;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
+import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.server.plugin.VirtualHostFactory;
+import org.apache.qpid.server.virtualhost.VirtualHostFactoryRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 
 public class BrokerTestHelper
@@ -96,14 +98,24 @@ public class BrokerTestHelper
             throws Exception
     {
         StatisticsGatherer statisticsGatherer = mock(StatisticsGatherer.class);
-        VirtualHost host = new VirtualHostImpl(virtualHostRegistry, statisticsGatherer, new SecurityManager(mock(Broker.class), false), virtualHostConfiguration);
+        final VirtualHostFactory factory =
+                        virtualHostConfiguration == null ? new StandardVirtualHostFactory()
+                                                         : VirtualHostFactory.FACTORIES.get(virtualHostConfiguration.getType());
+        VirtualHost host = factory.createVirtualHost(virtualHostRegistry,
+                statisticsGatherer,
+                new SecurityManager(mock(Broker.class), false),
+                virtualHostConfiguration);
         virtualHostRegistry.registerVirtualHost(host);
         return host;
     }
 
     public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration) throws Exception
     {
-        return new VirtualHostImpl(null, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), virtualHostConfiguration);
+        final VirtualHostFactory factory =
+                virtualHostConfiguration == null ? new StandardVirtualHostFactory()
+                                                 : VirtualHostFactory.FACTORIES.get(virtualHostConfiguration.getType());
+
+        return factory.createVirtualHost(null, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), virtualHostConfiguration);
     }
 
     public static VirtualHost createVirtualHost(String name, VirtualHostRegistry virtualHostRegistry) throws Exception

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Wed Jun 19 15:51:30 2013
@@ -31,6 +31,7 @@ import org.apache.qpid.server.queue.Queu
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
 import org.apache.qpid.server.stats.StatisticsCounter;
+import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.txn.DtxRegistry;
 
@@ -111,6 +112,11 @@ public class MockVirtualHost implements 
         return null;
     }
 
+    public DurableConfigurationStore getDurableConfigurationStore()
+    {
+        return null;
+    }
+
     public String getName()
     {
         return _name;
@@ -214,4 +220,4 @@ public class MockVirtualHost implements 
     public void unblock()
     {
     }
-}
\ No newline at end of file
+}

Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java Wed Jun 19 15:51:30 2013
@@ -1,5 +1,5 @@
 /*
- * 
+ *
  * 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
@@ -7,16 +7,16 @@
  * 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.test.utils;
 
@@ -110,10 +110,12 @@ public class QpidTestCase extends TestCa
     }
 
     protected static final String MESSAGE_STORE_CLASS_NAME_KEY = "messagestore.class.name";
+    protected static final String CONFIGURATION_STORE_CLASS_NAME_KEY = "configurationstore.class.name";
+
     protected static final String MEMORY_STORE_CLASS_NAME = "org.apache.qpid.server.store.MemoryMessageStore";
 
     private static List<String> _exclusionList;
-    
+
     public QpidTestCase()
     {
         super();
@@ -138,7 +140,7 @@ public class QpidTestCase extends TestCa
     {
         final String storeClass = System.getProperty(MESSAGE_STORE_CLASS_NAME_KEY);
         _logger.debug("MESSAGE_STORE_CLASS_NAME_KEY " + storeClass);
-        
+
         return storeClass != null ? storeClass : MEMORY_STORE_CLASS_NAME ;
     }
 

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1493674-1494547

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java Wed Jun 19 15:51:30 2013
@@ -26,6 +26,7 @@ import static org.apache.qpid.test.utils
 import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE_PASSWORD;
 
 import java.util.Arrays;
+import javax.net.ssl.SSLSocket;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.client.AMQTestConnection_0_10;

Propchange: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1493674-1494547

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java Wed Jun 19 15:51:30 2013
@@ -35,7 +35,7 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Iterator;
 
-public class SlowMessageStore implements MessageStore
+public class SlowMessageStore implements MessageStore, DurableConfigurationStore
 {
     private static final Logger _logger = Logger.getLogger(SlowMessageStore.class);
     private static final String DELAYS = "delays";

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Wed Jun 19 15:51:30 2013
@@ -50,7 +50,8 @@ public class Asserts
     {
         assertNotNull("Virtualhost " + virtualHostName + " data are not found", virtualHost);
         assertAttributesPresent(virtualHost, VirtualHost.AVAILABLE_ATTRIBUTES, VirtualHost.TIME_TO_LIVE,
-                VirtualHost.CREATED, VirtualHost.UPDATED, VirtualHost.SUPPORTED_QUEUE_TYPES, VirtualHost.STORE_PATH, VirtualHost.CONFIG_PATH);
+                VirtualHost.CREATED, VirtualHost.UPDATED, VirtualHost.SUPPORTED_QUEUE_TYPES, VirtualHost.STORE_PATH,
+                VirtualHost.CONFIG_PATH, VirtualHost.TYPE);
 
         assertEquals("Unexpected value of attribute " + VirtualHost.NAME, virtualHostName, virtualHost.get(VirtualHost.NAME));
         assertNotNull("Unexpected value of attribute " + VirtualHost.ID, virtualHost.get(VirtualHost.ID));

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Wed Jun 19 15:51:30 2013
@@ -37,6 +37,7 @@ import org.apache.qpid.server.model.Exch
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueueFactory;
+import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 import org.apache.qpid.test.utils.TestFileUtils;
 import org.apache.qpid.util.FileUtils;
 import org.codehaus.jackson.JsonGenerationException;
@@ -564,6 +565,7 @@ public class VirtualHostRestTest extends
         }
         else
         {
+            hostData.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
             hostData.put(VirtualHost.STORE_PATH, storePath);
             hostData.put(VirtualHost.STORE_TYPE, storeType);
         }

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Wed Jun 19 15:51:30 2013
@@ -43,6 +43,7 @@ import org.apache.qpid.server.security.a
 import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
 import org.apache.qpid.server.security.auth.manager.PlainPasswordFileAuthenticationManagerFactory;
 import org.apache.qpid.server.security.group.FileGroupManagerFactory;
+import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 import org.apache.qpid.systest.rest.QpidRestTestCase;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 import org.apache.qpid.test.utils.TestFileUtils;
@@ -981,6 +982,7 @@ public class BrokerACLTest extends QpidR
         hostData.put(VirtualHost.NAME, hostName);
         hostData.put(VirtualHost.STORE_PATH, getStoreLocation(hostName));
         hostData.put(VirtualHost.STORE_TYPE, getTestProfileMessageStoreType());
+        hostData.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
 
         return getRestTestHelper().submitRequest("/rest/virtualhost/" + hostName, "PUT", hostData);
     }

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java?rev=1494667&r1=1494666&r2=1494667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java Wed Jun 19 15:51:30 2013
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.test.client.timeouts;
 
+import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,6 +55,8 @@ public class SyncWaitDelayTest extends Q
     public void setUp() throws Exception
     {
 
+        setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".type",
+                StandardVirtualHostFactory.TYPE);
         setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore");
         setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.delays.commitTran.post", String.valueOf(POST_COMMIT_DELAY));
 
@@ -64,7 +67,7 @@ public class SyncWaitDelayTest extends Q
 
         _connection = getConnection();
 
-        //Create Queue        
+        //Create Queue
         _queue = (Queue) getInitialContext().lookup("queue");
 
         //Create Consumer

Propchange: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/CPPExcludes:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/Excludes:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/JavaBDBExcludes:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/JavaExcludes:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/JavaPre010Excludes:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/JavaTransientExcludes:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/XAExcludes:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/cpp.async.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/cpp.cluster.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/cpp.noprefetch.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/cpp.ssl.excludes:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/cpp.ssl.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/cpp.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/java-bdb.0-9-1.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/java-dby.0-9-1.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/java-mms-spawn.0-10.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/java-mms.0-9-1.testprofile:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/log4j-test.xml:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/test-provider.properties:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/test_resources:r1493674-1494547

Propchange: qpid/trunk/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-vhost-refactor/java/test-profiles/testprofile.defaults:r1493674-1494547



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message