QPID-5624: Remove virtualhost xml configuration. Move virtual host configuration into broker configuration store"

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1576732 13f79535-47bb-0310-9956-ffa450edef68

43 files changed, 370 insertions, 417 deletions

diff --git a/qpid/java/systests/etc/config-systests.json b/qpid/java/systests/etc/config-systests.json
index 12a8a5c5a6..60f3f7f174 100644
--- a/qpid/java/systests/etc/config-systests.json
+++ b/qpid/java/systests/etc/config-systests.json
@@ -22,7 +22,7 @@
   "name": "Broker",
   "defaultVirtualHost" : "test",
   "storeVersion": 1,
-  "modelVersion": "1.0",
+  "modelVersion": "1.3",
   "authenticationproviders" : [ {
     "name" : "plain",
     "type" : "PlainPasswordFile",
@@ -59,6 +59,8 @@
   }],
   "virtualhosts" : [ {
     "name" : "test",
-    "configPath" : "${broker.virtualhosts-config}"
+    "type" : "STANDARD",
+    "storeType": "${messagestore.type}",
+    "storePath" : "${QPID_WORK}/test"
   } ]
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
index a19ba21c5c..7d5690b1bd 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
@@ -25,9 +25,17 @@ import static org.apache.qpid.test.utils.TestSSLConstants.KEYSTORE_PASSWORD;
 import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE;
 import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE_PASSWORD;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.util.Arrays;
-import javax.net.ssl.SSLSocket;
-import org.apache.commons.configuration.ConfigurationException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Session;
+
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.client.AMQTestConnection_0_10;
 import org.apache.qpid.jms.ConnectionURL;
@@ -36,15 +44,6 @@ import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.Session;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 public class SSLTest extends QpidBrokerTestCase
 {
     private static final String CERT_ALIAS_APP1 = "app1";
@@ -402,7 +401,7 @@ public class SSLTest extends QpidBrokerTestCase
                                                 boolean sslOnly,
                                                 boolean needClientAuth,
                                                 boolean wantClientAuth,
-                                                boolean samePort) throws ConfigurationException
+                                                boolean samePort) throws Exception
     {
         if(isJavaBroker())
         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
index 68ec101245..d3d952ea8c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
@@ -20,8 +20,19 @@
 */
 package org.apache.qpid.server.logging;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.server.management.plugin.HttpManagement;
+import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
+import org.apache.qpid.systest.rest.RestTestHelper;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 import javax.jms.Connection;
 import javax.jms.Queue;
@@ -29,7 +40,7 @@ import javax.jms.Session;
 
 public class AlertingTest extends AbstractTestLogging
 {
-    private String VIRTUALHOST = "test";
+
     private Session _session;
     private Connection _connection;
     private Queue _destination;
@@ -41,9 +52,9 @@ public class AlertingTest extends AbstractTestLogging
     public void setUp() throws Exception
     {
         _numMessages = 50;
-
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".housekeeping.checkPeriod", String.valueOf(ALERT_LOG_WAIT_PERIOD));
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".queues.maximumMessageCount", String.valueOf(_numMessages));
+        TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration();
+        brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, String.valueOf(ALERT_LOG_WAIT_PERIOD));
+        brokerConfiguration.setBrokerAttribute(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, _numMessages);
 
         // Then we do the normal setup stuff like starting the broker, getting a connection etc.
         super.setUp();
@@ -140,8 +151,24 @@ public class AlertingTest extends AbstractTestLogging
 
         _monitor.markDiscardPoint();
 
-        // Change max message count to 5, start broker and make sure that that's triggered at the right time
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".queues.maximumMessageCount", "5");
+        RestTestHelper restTestHelper = new RestTestHelper(findFreePort());
+        TestBrokerConfiguration config = getBrokerConfiguration();
+        config.addHttpManagementConfiguration();
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.PORT, restTestHelper.getHttpPort());
+        config.removeObjectConfiguration(TestBrokerConfiguration.ENTRY_NAME_JMX_PORT);
+        config.removeObjectConfiguration(TestBrokerConfiguration.ENTRY_NAME_RMI_PORT);
+
+        Map<String, Object> anonymousProviderAttributes = new HashMap<String, Object>();
+        anonymousProviderAttributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManagerFactory.PROVIDER_TYPE);
+        anonymousProviderAttributes.put(AuthenticationProvider.NAME, "testAnonymous");
+        config.addAuthenticationProviderConfiguration(anonymousProviderAttributes);
+
+        // set password authentication provider on http port for the tests
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER,
+                TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
+        config.setSaved(false);
+        restTestHelper.setUsernameAndPassword("webadmin", "webadmin");
 
         startBroker();
 
@@ -154,6 +181,12 @@ public class AlertingTest extends AbstractTestLogging
         // Ensure the alert has not occurred yet
         assertLoggingNotYetOccured(MESSAGE_COUNT_ALERT);
 
+        // Change max message count to 5, start broker and make sure that that's triggered at the right time
+        TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration();
+        brokerConfiguration.setBrokerAttribute(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 5);
+        brokerConfiguration.setSaved(false);
+
+        restTestHelper.submitRequest("/rest/queue/test/" + getTestQueueName(), "PUT", Collections.<String, Object>singletonMap(org.apache.qpid.server.model.Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 5));
         // Trigger the new value
         sendMessage(_session, _destination, 3);
         _session.commit();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
index 7a3edd316f..72626e5089 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
@@ -18,22 +18,22 @@
  */
 package org.apache.qpid.server.security.acl;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.lang.StringUtils;
-
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.jms.ConnectionListener;
 import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
 import org.apache.qpid.url.URLSyntaxException;
 
 import javax.jms.Connection;
 import javax.jms.ExceptionListener;
 import javax.jms.JMSException;
 import javax.naming.NamingException;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -98,23 +98,24 @@ public abstract class AbstractACLTestCase extends QpidBrokerTestCase implements
         }
     }
     
-    public void writeACLFile(final String vhost, final String...rules) throws ConfigurationException, IOException
+    public void writeACLFile(final String vhost, final String...rules) throws IOException
     {
         writeACLFileUtil(this, vhost, rules);
     }
 
-    public static void writeACLFileUtil(QpidBrokerTestCase testcase, String vhost, String...rules) throws ConfigurationException, IOException
+    public static void writeACLFileUtil(QpidBrokerTestCase testcase, String vhost, String...rules) throws IOException
     {
         File aclFile = File.createTempFile(testcase.getClass().getSimpleName(), testcase.getName());
         aclFile.deleteOnExit();
 
+        TestBrokerConfiguration config = testcase.getBrokerConfiguration();
         if (vhost == null)
         {
-            testcase.getBrokerConfiguration().addAclFileConfiguration(aclFile.getAbsolutePath());
+            config.addAclFileConfiguration(aclFile.getAbsolutePath());
         }
         else
         {
-            testcase.setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + vhost + ".security.acl", aclFile.getAbsolutePath());
+            config.setObjectAttribute(vhost, VirtualHost.SECURITY_ACL, aclFile.getAbsolutePath());
         }
 
         PrintWriter out = new PrintWriter(new FileWriter(aclFile));
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
index e076415146..85d3fc0cdc 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
@@ -38,7 +38,6 @@ import java.util.Map;
 import javax.jms.Connection;
 import javax.jms.JMSException;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.management.common.mbeans.ManagedConnection;
 import org.apache.qpid.server.model.AuthenticationProvider;
@@ -328,12 +327,12 @@ public class ExternalAuthenticationTest extends QpidBrokerTestCase
         return getConnection(new AMQConnectionURL(url));
     }
 
-    private void setCommonBrokerSSLProperties(boolean needClientAuth) throws ConfigurationException
+    private void setCommonBrokerSSLProperties(boolean needClientAuth)
     {
         setCommonBrokerSSLProperties(needClientAuth, Collections.singleton(TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE));
     }
 
-    private void setCommonBrokerSSLProperties(boolean needClientAuth, Collection<String> trustStoreNames) throws ConfigurationException
+    private void setCommonBrokerSSLProperties(boolean needClientAuth, Collection<String> trustStoreNames)
     {
         TestBrokerConfiguration config = getBrokerConfiguration();
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
index 1d7c2ffa46..9dc981a358 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -21,10 +21,15 @@
 package org.apache.qpid.server.store;
 
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
-
-import org.apache.commons.configuration.PropertiesConfiguration;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.common.AMQPFilterTypes;
@@ -34,41 +39,34 @@ import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.DirectExchange;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.exchange.TopicExchange;
+import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageSource;
 import org.apache.qpid.server.model.Binding;
+import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ExclusivityPolicy;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.protocol.v0_8.AMQMessage;
-import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
-import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.plugin.ExchangeType;
-import org.apache.qpid.server.queue.PriorityQueue;
+import org.apache.qpid.server.protocol.v0_8.AMQMessage;
+import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.ConflationQueue;
+import org.apache.qpid.server.queue.PriorityQueue;
 import org.apache.qpid.server.queue.StandardQueue;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.BrokerTestHelper;
+import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.util.FileUtils;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 /**
  * This tests the MessageStores by using the available interfaces.
  *
@@ -104,8 +102,6 @@ public class MessageStoreTest extends QpidTestCase
 
     private String queueOwner = "MST";
 
-    private PropertiesConfiguration _config;
-
     private VirtualHost _virtualHost;
     private org.apache.qpid.server.model.VirtualHost _virtualHostModel;
     private Broker _broker;
@@ -116,15 +112,16 @@ public class MessageStoreTest extends QpidTestCase
         super.setUp();
         BrokerTestHelper.setUp();
 
-        _storePath = System.getProperty("QPID_WORK") + File.separator + getName();
+        String hostName = getName();
+        _storePath = System.getProperty("QPID_WORK", TMP_FOLDER + File.separator + getTestName()) + File.separator + hostName;
 
-        _config = new PropertiesConfiguration();
-        _config.addProperty("store.class", getTestProfileMessageStoreClassName());
-        _config.addProperty("store.environment-path", _storePath);
         _virtualHostModel = mock(org.apache.qpid.server.model.VirtualHost.class);
         when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.STORE_PATH))).thenReturn(_storePath);
-
-
+        when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.STORE_TYPE))).thenReturn(getTestProfileMessageStoreType());
+        when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.TYPE))).thenReturn(StandardVirtualHostFactory.TYPE);
+        when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.NAME))).thenReturn(hostName);
+        when(_virtualHostModel.getType()).thenReturn(StandardVirtualHostFactory.TYPE);
+        when(_virtualHostModel.getName()).thenReturn(hostName);
 
         cleanup(new File(_storePath));
 
@@ -138,7 +135,7 @@ public class MessageStoreTest extends QpidTestCase
         return _storePath;
     }
 
-    protected org.apache.qpid.server.model.VirtualHost getVirtualHostModel()
+    protected org.apache.qpid.server.model.VirtualHost<?> getVirtualHostModel()
     {
         return _virtualHostModel;
     }
@@ -165,11 +162,6 @@ public class MessageStoreTest extends QpidTestCase
         return _virtualHost;
     }
 
-    public PropertiesConfiguration getConfig()
-    {
-        return _config;
-    }
-
     protected void reloadVirtualHost()
     {
         VirtualHost original = getVirtualHost();
@@ -189,7 +181,7 @@ public class MessageStoreTest extends QpidTestCase
 
         try
         {
-            _virtualHost = BrokerTestHelper.createVirtualHost(new VirtualHostConfiguration(getClass().getName(), _config, _broker),new VirtualHostRegistry(_broker.getEventLogger()),getVirtualHostModel());
+            _virtualHost = BrokerTestHelper.createVirtualHost(new VirtualHostRegistry(new EventLogger()), getVirtualHostModel());
         }
         catch (Exception e)
         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
index 19e258d060..9bc1a57261 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
@@ -30,6 +30,7 @@ import org.apache.qpid.server.model.VirtualHost;
 public class
         QuotaMessageStore extends NullMessageStore
 {
+    public static final String TYPE = "QuotaMessageStore";
     private final AtomicLong _messageId = new AtomicLong(1);
     private final AtomicBoolean _closed = new AtomicBoolean(false);
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStoreFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStoreFactory.java
new file mode 100644
index 0000000000..b4f81e2ad6
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStoreFactory.java
@@ -0,0 +1,48 @@
+/*
+ *
+ * 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.store;
+
+import java.util.Map;
+
+import org.apache.qpid.server.plugin.MessageStoreFactory;
+
+public class QuotaMessageStoreFactory implements MessageStoreFactory
+{
+
+    @Override
+    public String getType()
+    {
+        return QuotaMessageStore.TYPE;
+    }
+
+    @Override
+    public MessageStore createMessageStore()
+    {
+        return new QuotaMessageStore();
+    }
+
+    @Override
+    public void validateAttributes(Map<String, Object> attributes)
+    {
+    }
+
+}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
index db1d5d9327..8d375508bc 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
@@ -23,8 +23,8 @@ package org.apache.qpid.server.store;
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
-import org.apache.log4j.Logger;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.VirtualHost;
@@ -44,6 +44,7 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore
     private DurableConfigurationStore _durableConfigurationStore = (DurableConfigurationStore) _realStore;
     private static final String PRE = "pre";
     private static final String POST = "post";
+    public static final String TYPE = "SLOW";
     private String DEFAULT_DELAY = "default";
 
     // ***** MessageStore Interface.
@@ -340,7 +341,7 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore
     @Override
     public String getStoreType()
     {
-        return "SLOW";
+        return TYPE;
     }
 
     @Override
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java
index 80ef79ae71..62714a75fe 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java
@@ -19,10 +19,8 @@ package org.apache.qpid.server.store;/*
  *
  */
 
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import org.apache.commons.configuration.Configuration;
+
 import org.apache.qpid.server.plugin.MessageStoreFactory;
 
 public class SlowMessageStoreFactory implements MessageStoreFactory
@@ -30,7 +28,7 @@ public class SlowMessageStoreFactory implements MessageStoreFactory
     @Override
     public String getType()
     {
-        return "SLOW";
+        return SlowMessageStore.TYPE;
     }
 
     @Override
@@ -40,43 +38,6 @@ public class SlowMessageStoreFactory implements MessageStoreFactory
     }
 
     @Override
-    public Map<String, Object> convertStoreConfiguration(Configuration storeConfiguration)
-    {
-        Map<String, Object> convertedMap = new HashMap<String, Object>();
-        Configuration delaysConfig = storeConfiguration.subset("delays");
-
-        @SuppressWarnings("unchecked")
-        Iterator<String> delays = delaysConfig.getKeys();
-
-        Map<String,Long> delaysMap = new HashMap<String, Long>();
-
-        while (delays.hasNext())
-        {
-            String key = delays.next();
-
-            if (key.endsWith("pre"))
-            {
-                delaysMap.put("pre"+key.substring(0, key.length() - 4), delaysConfig.getLong(key));
-            }
-            else if (key.endsWith("post"))
-            {
-                delaysMap.put("post"+key.substring(0, key.length() - 5), delaysConfig.getLong(key));
-            }
-        }
-
-        if(!delaysMap.isEmpty())
-        {
-            convertedMap.put("slowMessageStoreDelays",delaysMap);
-        }
-
-
-        convertedMap.put("realStore", storeConfiguration.getString("realStore", null));
-
-
-        return convertedMap;
-    }
-
-    @Override
     public void validateAttributes(Map<String, Object> attributes)
     {
     }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
index 31e6a5613f..eca91c2b5e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
@@ -37,7 +37,9 @@ import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 public class StoreOverfullTest extends QpidBrokerTestCase
 {
@@ -60,9 +62,10 @@ public class StoreOverfullTest extends QpidBrokerTestCase
 
     public void setUp() throws Exception
     {
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost.test.store.class", QuotaMessageStore.class.getName());
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost.test.store.overfull-size", String.valueOf(OVERFULL_SIZE));
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost.test.store.underfull-size", String.valueOf(UNDERFULL_SIZE));
+        TestBrokerConfiguration config = getBrokerConfiguration();
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHost.STORE_TYPE, QuotaMessageStore.TYPE);
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, MessageStoreConstants.OVERFULL_SIZE_ATTRIBUTE, OVERFULL_SIZE);
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, MessageStoreConstants.UNDERFULL_SIZE_ATTRIBUTE, UNDERFULL_SIZE);
 
         super.setUp();
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
index 312443cfa7..f87113465c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.model.AccessControlProvider;
@@ -54,7 +53,7 @@ public class AccessControlProviderRestTest extends QpidRestTestCase
                           "ACL DENY-LOG ALL ALL";
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER, OTHER_USER);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
index d227460e6a..9bf815adf7 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
@@ -46,7 +45,7 @@ public class AnonymousAccessRestTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         TestBrokerConfiguration config = getBrokerConfiguration();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index c749318595..18774941e8 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -51,10 +51,10 @@ public class Asserts
                                 ConfiguredObject.DESCRIPTION,
                                 VirtualHost.SUPPORTED_QUEUE_TYPES,
                                 VirtualHost.STORE_PATH,
-                                VirtualHost.CONFIG_PATH,
                                 VirtualHost.TYPE,
                                 VirtualHost.CONFIG_STORE_PATH,
-                                VirtualHost.CONFIG_STORE_TYPE);
+                                VirtualHost.CONFIG_STORE_TYPE,
+                                VirtualHost.SECURITY_ACL);
 
         assertEquals("Unexpected value of attribute " + VirtualHost.NAME,
                      virtualHostName,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
index c8320a6d82..81177b8c08 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
@@ -29,10 +29,8 @@ import java.util.Collections;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
@@ -49,12 +47,12 @@ public class BasicAuthRestTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         //do nothing, we will configure this locally
     }
 
-    private void configure(boolean useSsl) throws ConfigurationException, IOException
+    private void configure(boolean useSsl) throws IOException
     {
         getRestTestHelper().setUseSsl(useSsl);
         if (useSsl)
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
index 666c78f070..6ba8df075b 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
@@ -30,12 +30,18 @@ import org.apache.qpid.server.model.Binding;
 public class BindingRestTest extends QpidRestTestCase
 {
 
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        getRestTestHelper().createTestQueues();
+    }
+
     public void testGetAllBindings() throws Exception
     {
-        List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding");
+        List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test");
         assertNotNull("Bindings cannot be null", bindings);
-        assertTrue("Unexpected number of bindings: " + bindings.size(),
-                bindings.size() >= EXPECTED_VIRTUALHOSTS.length * EXPECTED_QUEUES.length);
+        assertEquals("Unexpected number of bindings", RestTestHelper.EXPECTED_QUEUES.length, bindings.size());
         for (Map<String, Object> binding : bindings)
         {
             Asserts.assertBinding((String) binding.get(Binding.NAME), (String) binding.get(Binding.EXCHANGE), binding);
@@ -46,8 +52,8 @@ public class BindingRestTest extends QpidRestTestCase
     {
         List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test");
         assertNotNull("Bindings cannot be null", bindings);
-        assertEquals("Unexpected number of bindings", EXPECTED_QUEUES.length, bindings.size());
-        for (String queueName : EXPECTED_QUEUES)
+        assertEquals("Unexpected number of bindings", RestTestHelper.EXPECTED_QUEUES.length, bindings.size());
+        for (String queueName : RestTestHelper.EXPECTED_QUEUES)
         {
             Map<String, Object> searchAttributes = new HashMap<String, Object>();
             searchAttributes.put(Binding.NAME, queueName);
@@ -62,8 +68,8 @@ public class BindingRestTest extends QpidRestTestCase
     {
         List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct");
         assertNotNull("Bindings cannot be null", bindings);
-        assertEquals("Unexpected number of bindings", EXPECTED_QUEUES.length, bindings.size());
-        for (String queueName : EXPECTED_QUEUES)
+        assertEquals("Unexpected number of bindings", RestTestHelper.EXPECTED_QUEUES.length, bindings.size());
+        for (String queueName : RestTestHelper.EXPECTED_QUEUES)
         {
             Map<String, Object> binding = getRestTestHelper().find(Binding.NAME, queueName, bindings);
             Asserts.assertBinding(queueName, "amq.direct", binding);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java
index e92b38b4e0..3a85ad5431 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java
@@ -20,25 +20,22 @@
  */
 package org.apache.qpid.systest.rest;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Protocol;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
-import org.apache.qpid.server.security.auth.manager.ExternalAuthenticationManagerFactory;
-import org.apache.qpid.test.utils.TestBrokerConfiguration;
+import static org.apache.qpid.test.utils.TestSSLConstants.KEYSTORE;
+import static org.apache.qpid.test.utils.TestSSLConstants.KEYSTORE_PASSWORD;
+import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE;
+import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE_PASSWORD;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.apache.qpid.test.utils.TestSSLConstants.KEYSTORE;
-import static org.apache.qpid.test.utils.TestSSLConstants.KEYSTORE_PASSWORD;
-import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE;
-import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE_PASSWORD;
+import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Protocol;
+import org.apache.qpid.server.model.Transport;
+import org.apache.qpid.server.security.auth.manager.ExternalAuthenticationManagerFactory;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 public class BrokerRestHttpsClientCertAuthTest extends QpidRestTestCase
 {
@@ -56,7 +53,7 @@ public class BrokerRestHttpsClientCertAuthTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().setUseSslAuth(true);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
index ad789e6fa1..b7846bb09c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
@@ -28,7 +28,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Port;
@@ -49,7 +48,7 @@ public class BrokerRestHttpsTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().setUseSsl(true);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
index 1da1c6394e..962c71583c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
@@ -30,6 +30,13 @@ import org.apache.qpid.server.model.Exchange;
 
 public class ExchangeRestTest extends QpidRestTestCase
 {
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        getRestTestHelper().createTestQueues();
+    }
+
     public void testGet() throws Exception
     {
         List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList("/rest/exchange");
@@ -98,7 +105,7 @@ public class ExchangeRestTest extends QpidRestTestCase
     {
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> bindings = (List<Map<String, Object>>) exchange.get("bindings");
-        for (String queueName : EXPECTED_QUEUES)
+        for (String queueName : RestTestHelper.EXPECTED_QUEUES)
         {
             Map<String, Object> binding = getRestTestHelper().find(Binding.NAME, queueName, bindings);
             Asserts.assertBinding(queueName, (String) exchange.get(Exchange.NAME), binding);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
index 85a50c4ce8..80dd7e11a4 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.LifetimePolicy;
@@ -71,7 +70,7 @@ public class PreferencesProviderRestTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         Map<String, Object> anonymousAuthProviderAttributes = new HashMap<String, Object>();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
index 46acd9e77b..c4b182da1a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.model.PreferencesProvider;
 import org.apache.qpid.server.model.adapter.FileSystemPreferencesProvider;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -58,7 +57,7 @@ public class PreferencesRestTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
index ce501adeb6..de5c2f561f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Port;
@@ -42,7 +41,6 @@ public class QpidRestTestCase extends QpidBrokerTestCase
     public static final String TEST3_VIRTUALHOST = "test3";
 
     public static final String[] EXPECTED_VIRTUALHOSTS = { TEST1_VIRTUALHOST, TEST2_VIRTUALHOST, TEST3_VIRTUALHOST};
-    public static final String[] EXPECTED_QUEUES = { "queue", "ping" };
     public static final String[] EXPECTED_EXCHANGES = { "amq.fanout", "amq.match", "amq.direct","amq.topic" };
 
     private RestTestHelper _restTestHelper = new RestTestHelper(findFreePort());
@@ -60,12 +58,6 @@ public class QpidRestTestCase extends QpidBrokerTestCase
         for (String virtualhost : EXPECTED_VIRTUALHOSTS)
         {
             createTestVirtualHost(0, virtualhost);
-
-            for (String queue : EXPECTED_QUEUES)
-            {
-                setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + virtualhost + ".queues.exchange", "amq.direct");
-                setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + virtualhost + ".queues.queue(-1).name", queue);
-            }
         }
 
         customizeConfiguration();
@@ -85,7 +77,7 @@ public class QpidRestTestCase extends QpidBrokerTestCase
         }
     }
 
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         TestBrokerConfiguration config = getBrokerConfiguration();
         config.addHttpManagementConfiguration();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
index faccca9e9d..297d15db13 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
@@ -83,10 +83,8 @@ public class QueueRestTest extends QpidRestTestCase
     {
         String queueName = getTestQueueName();
         List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/queue/test");
-        assertEquals("Unexpected number of queues", EXPECTED_QUEUES.length + 1, queues.size());
-        String[] expectedQueues = new String[EXPECTED_QUEUES.length + 1];
-        System.arraycopy(EXPECTED_QUEUES, 0, expectedQueues, 0, EXPECTED_QUEUES.length);
-        expectedQueues[EXPECTED_QUEUES.length] = queueName;
+        assertEquals("Unexpected number of queues", 1, queues.size());
+        String[] expectedQueues = new String[]{queueName};
 
         for (String name : expectedQueues)
         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
index ef87457925..49e07e92e8 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
@@ -52,9 +52,10 @@ import javax.servlet.http.HttpServletResponse;
 import junit.framework.Assert;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.BrokerOptions;
+import org.apache.qpid.server.model.Binding;
+import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.ssl.SSLContextFactory;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -80,6 +81,7 @@ public class RestTestHelper
 
     private File _passwdFile;
     private boolean _useSslAuth;
+    static final String[] EXPECTED_QUEUES = { "queue", "ping" };
 
     public RestTestHelper(int httpPort)
     {
@@ -226,6 +228,11 @@ public class RestTestHelper
 
     public Map<String, Object> find(String name, Object value, List<Map<String, Object>> data)
     {
+        if (data == null)
+        {
+            return null;
+        }
+
         for (Map<String, Object> map : data)
         {
             Object mapValue = map.get(name);
@@ -437,7 +444,7 @@ public class RestTestHelper
     /**
      * Create password file that follows the convention username=password, which is deleted by {@link #tearDown()}
      */
-    public void configureTemporaryPasswordFile(QpidBrokerTestCase testCase, String... users) throws ConfigurationException, IOException
+    public void configureTemporaryPasswordFile(QpidBrokerTestCase testCase, String... users) throws IOException
     {
         _passwdFile = createTemporaryPasswdFile(users);
 
@@ -509,4 +516,22 @@ public class RestTestHelper
         _useSslAuth = useSslAuth;
         _useSsl = true;
     }
+
+    public void createTestQueues() throws IOException, JsonGenerationException, JsonMappingException
+    {
+        for (int i = 0; i < EXPECTED_QUEUES.length; i++)
+        {
+            String queueName = EXPECTED_QUEUES[i];
+            Map<String, Object> queueData = new HashMap<String, Object>();
+            queueData.put(Queue.NAME, queueName);
+            queueData.put(Queue.DURABLE, Boolean.TRUE);
+            submitRequest("/rest/queue/test/" + queueName, "PUT", queueData);
+
+            Map<String, Object> bindingData = new HashMap<String, Object>();
+            bindingData.put(Binding.NAME, queueName);
+            bindingData.put(Binding.QUEUE, queueName);
+            bindingData.put(Binding.EXCHANGE, "amq.direct");
+            submitRequest("/rest/binding/test/amq.direct/" + queueName + "/" + queueName, "PUT", queueData);
+        }
+    }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java
index 590858fbf5..6ec2a02ba1 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java
@@ -35,7 +35,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.security.auth.manager.Base64MD5PasswordFileAuthenticationManagerFactory;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -347,7 +346,7 @@ public class SaslRestTest extends QpidRestTestCase
         }
     }
 
-    private void configureBase64MD5FilePrincipalDatabase() throws IOException, ConfigurationException
+    private void configureBase64MD5FilePrincipalDatabase() throws IOException
     {
         // generate user password entry
         String passwordFileEntry;
@@ -357,7 +356,7 @@ public class SaslRestTest extends QpidRestTestCase
         }
         catch (NoSuchAlgorithmException e)
         {
-            throw new ConfigurationException(e);
+            throw new RuntimeException(e);
         }
 
         // store the entry in the file
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
index da72dd6f05..cf551ae315 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
@@ -30,6 +30,13 @@ import org.apache.qpid.test.utils.TestBrokerConfiguration;
 public class StructureRestTest extends QpidRestTestCase
 {
 
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        getRestTestHelper().createTestQueues();
+    }
+
     public void testGet() throws Exception
     {
         Map<String, Object> structure = getRestTestHelper().getJsonAsMap("/rest/structure");
@@ -53,50 +60,52 @@ public class StructureRestTest extends QpidRestTestCase
             Map<String, Object> host = getRestTestHelper().find("name", hostName, virtualhosts);
             assertNotNull("Host " + hostName + " is not found ", host);
             assertNode(host, hostName);
+        }
+
+        String hostName = "test";
+        Map<String, Object> host = getRestTestHelper().find("name", hostName, virtualhosts);
+
+        @SuppressWarnings("unchecked")
+        List<Map<String, Object>> queues = (List<Map<String, Object>>) host.get("queues");
+        assertNotNull("Host " + hostName + " queues are not found ", queues);
+        for (String queueName : RestTestHelper.EXPECTED_QUEUES)
+        {
+            Map<String, Object> queue = getRestTestHelper().find("name", queueName, queues);
+            assertNotNull(hostName + " queue " + queueName + " is not found ", queue);
+            assertNode(queue, queueName);
 
             @SuppressWarnings("unchecked")
-            List<Map<String, Object>> queues = (List<Map<String, Object>>) host.get("queues");
-            assertNotNull("Host " + hostName + " queues are not found ", queues);
-            for (String queueName : EXPECTED_QUEUES)
+            List<Map<String, Object>> bindings = (List<Map<String, Object>>) queue.get("bindings");
+            assertNotNull(hostName + " queue " + queueName + " bindings are not found ", queues);
+            for (Map<String, Object> binding : bindings)
             {
-                Map<String, Object> queue = getRestTestHelper().find("name", queueName, queues);
-                assertNotNull(hostName + " queue " + queueName + " is not found ", queue);
-                assertNode(queue, queueName);
-
-                @SuppressWarnings("unchecked")
-                List<Map<String, Object>> bindings = (List<Map<String, Object>>) queue.get("bindings");
-                assertNotNull(hostName + " queue " + queueName + " bindings are not found ", queues);
-                for (Map<String, Object> binding : bindings)
-                {
-                    assertNode(binding, queueName);
-                }
+                assertNode(binding, queueName);
             }
+        }
 
-            @SuppressWarnings("unchecked")
-            List<Map<String, Object>> exchanges = (List<Map<String, Object>>) host.get("exchanges");
-            assertNotNull("Host " + hostName + " exchanges are not found ", exchanges);
-            for (String exchangeName : EXPECTED_EXCHANGES)
+        @SuppressWarnings("unchecked")
+        List<Map<String, Object>> exchanges = (List<Map<String, Object>>) host.get("exchanges");
+        assertNotNull("Host " + hostName + " exchanges are not found ", exchanges);
+        for (String exchangeName : EXPECTED_EXCHANGES)
+        {
+            Map<String, Object> exchange = getRestTestHelper().find("name", exchangeName, exchanges);
+            assertNotNull("Exchange " + exchangeName + " is not found ", exchange);
+            assertNode(exchange, exchangeName);
+            if (ExchangeDefaults.DIRECT_EXCHANGE_NAME.equalsIgnoreCase(exchangeName) ||
+                ExchangeDefaults.DEFAULT_EXCHANGE_NAME.equalsIgnoreCase(exchangeName))
             {
-                Map<String, Object> exchange = getRestTestHelper().find("name", exchangeName, exchanges);
-                assertNotNull("Exchange " + exchangeName + " is not found ", exchange);
-                assertNode(exchange, exchangeName);
-                if (ExchangeDefaults.DIRECT_EXCHANGE_NAME.equalsIgnoreCase(exchangeName) ||
-                    ExchangeDefaults.DEFAULT_EXCHANGE_NAME.equalsIgnoreCase(exchangeName))
+                @SuppressWarnings("unchecked")
+                List<Map<String, Object>> bindings = (List<Map<String, Object>>) exchange.get("bindings");
+                assertNotNull(hostName + " exchange " + exchangeName + " bindings are not found ", bindings);
+                for (String queueName : RestTestHelper.EXPECTED_QUEUES)
                 {
-                    @SuppressWarnings("unchecked")
-                    List<Map<String, Object>> bindings = (List<Map<String, Object>>) exchange.get("bindings");
-                    assertNotNull(hostName + " exchange " + exchangeName + " bindings are not found ", bindings);
-                    for (String queueName : EXPECTED_QUEUES)
-                    {
-                        Map<String, Object> binding = getRestTestHelper().find("name", queueName, bindings);
-                        assertNotNull(hostName + " exchange " + exchangeName + " binding  " + queueName + " is not found", binding);
-                        assertNode(binding, queueName);
-                    }
+                    Map<String, Object> binding = getRestTestHelper().find("name", queueName, bindings);
+                    assertNotNull(hostName + " exchange " + exchangeName + " binding  " + queueName + " is not found", binding);
+                    assertNode(binding, queueName);
                 }
             }
         }
 
-
         String httpPortName = TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT;
         Map<String, Object> portData = getRestTestHelper().find(Port.NAME, httpPortName, ports);
         assertNotNull("Http Port " + httpPortName + " is not found", portData);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
index 9965587343..296ccf9221 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
@@ -28,7 +28,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.model.PreferencesProvider;
 import org.apache.qpid.server.model.User;
 import org.apache.qpid.server.model.adapter.FileSystemPreferencesProvider;
@@ -63,7 +62,7 @@ public class UserPreferencesRestTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
index eac43e70a4..6bc515dcef 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
@@ -30,15 +30,12 @@ import java.util.Map;
 import javax.jms.Session;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.ConflationQueue;
 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;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -67,16 +64,18 @@ public class VirtualHostRestTest extends QpidRestTestCase
     {
         // create AMQP connection to get connection JSON details
         _connection = (AMQConnection) getConnection();
-        _connection.createSession(true, Session.SESSION_TRANSACTED);
+        Session session = _connection.createSession(true, Session.SESSION_TRANSACTED);
+        session.createConsumer(getTestQueue());
 
         Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test");
         Asserts.assertVirtualHost("test", hostDetails);
 
         @SuppressWarnings("unchecked")
         Map<String, Object> statistics = (Map<String, Object>) hostDetails.get(Asserts.STATISTICS_ATTRIBUTE);
+
         assertEquals("Unexpected number of exchanges in statistics", EXPECTED_EXCHANGES.length, statistics.get(
                 "exchangeCount"));
-        assertEquals("Unexpected number of queues in statistics", EXPECTED_QUEUES.length, statistics.get("queueCount"));
+        assertEquals("Unexpected number of queues in statistics", 1, statistics.get("queueCount"));
         assertEquals("Unexpected number of connections in statistics", 1, statistics.get("connectionCount"));
 
         @SuppressWarnings("unchecked")
@@ -89,13 +88,10 @@ public class VirtualHostRestTest extends QpidRestTestCase
 
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VIRTUALHOST_QUEUES_ATTRIBUTE);
-        assertEquals("Unexpected number of queues", EXPECTED_QUEUES.length, queues.size());
-        Map<String, Object> queue = getRestTestHelper().find(Queue.NAME,  "queue", queues);
-        Map<String, Object> ping = getRestTestHelper().find(Queue.NAME, "ping", queues);
-        Asserts.assertQueue("queue", "standard", queue);
-        Asserts.assertQueue("ping", "standard", ping);
-        assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.FALSE, queue.get(Queue.DURABLE));
-        assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.FALSE, ping.get(Queue.DURABLE));
+        assertEquals("Unexpected number of queues", 1, queues.size());
+        Map<String, Object> queue = getRestTestHelper().find(Queue.NAME,  getTestQueueName(), queues);
+        Asserts.assertQueue(getTestQueueName(), "standard", queue);
+        assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, queue.get(Queue.DURABLE));
 
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> connections = (List<Map<String, Object>>) hostDetails
@@ -128,34 +124,6 @@ public class VirtualHostRestTest extends QpidRestTestCase
         }
     }
 
-    public void testPutCreateVirtualHostUsingConfigPath() throws Exception
-    {
-        String hostName = getName();
-        File configFile = TestFileUtils.createTempFile(this, hostName + "-config.xml");
-        String configPath = configFile.getAbsolutePath();
-        String storeLocation = getStoreLocation(hostName);
-        createAndSaveVirtualHostConfiguration(hostName, configFile, storeLocation);
-        createHost(hostName, null, configPath);
-        try
-        {
-            // make sure that the host is saved in the broker store
-            restartBroker();
-            Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/" + hostName);
-            Asserts.assertVirtualHost(hostName, hostDetails);
-            assertEquals("Unexpected config path", configPath, hostDetails.get(VirtualHost.CONFIG_PATH));
-
-            assertNewVirtualHost(hostDetails);
-        }
-        finally
-        {
-            if (storeLocation != null)
-            {
-                FileUtils.delete(new File(storeLocation), true);
-            }
-            configFile.delete();
-        }
-    }
-
     public void testDeleteHost() throws Exception
     {
         String hostToDelete = TEST3_VIRTUALHOST;
@@ -187,8 +155,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
         String hostToUpdate = TEST3_VIRTUALHOST;
         Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/" + hostToUpdate);
         Asserts.assertVirtualHost(hostToUpdate, hostDetails);
-        String configPath = (String)hostDetails.get(VirtualHost.CONFIG_PATH);
-        assertNotNull("Unexpected host configuration", configPath);
+        String configPath = (String)hostDetails.get(VirtualHost.STORE_PATH);
 
         String storeType = getTestProfileMessageStoreType();
         String storeLocation = getStoreLocation(hostToUpdate);
@@ -204,7 +171,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
 
         hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/" + hostToUpdate);
         Asserts.assertVirtualHost(hostToUpdate, hostDetails);
-        assertEquals("Unexpected config path", configPath, hostDetails.get(VirtualHost.CONFIG_PATH));
+        assertEquals("Unexpected config path", configPath, hostDetails.get(VirtualHost.STORE_PATH));
     }
 
     public void testPutCreateQueue() throws Exception
@@ -560,31 +527,13 @@ public class VirtualHostRestTest extends QpidRestTestCase
 
         Map<String, Object> hostData = new HashMap<String, Object>();
         hostData.put(VirtualHost.NAME, hostName);
-        if (storeType == null)
-        {
-            hostData.put(VirtualHost.CONFIG_PATH, configPath);
-        }
-        else
-        {
-            hostData.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
-            hostData.put(VirtualHost.STORE_PATH, storePath);
-            hostData.put(VirtualHost.STORE_TYPE, storeType);
-        }
+        hostData.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
+        hostData.put(VirtualHost.STORE_PATH, storePath);
+        hostData.put(VirtualHost.STORE_TYPE, storeType);
 
         return getRestTestHelper().submitRequest("/rest/virtualhost/" + hostName, "PUT", hostData);
     }
 
-    private XMLConfiguration createAndSaveVirtualHostConfiguration(String hostName, File configFile, String storeLocation)
-            throws ConfigurationException
-    {
-        XMLConfiguration testConfiguration = new XMLConfiguration();
-        testConfiguration.setProperty("virtualhost." + hostName + ".store.class",
-                getTestProfileMessageStoreClassName());
-        testConfiguration.setProperty("virtualhost." + hostName + ".store.environment-path", storeLocation);
-        testConfiguration.save(configFile);
-        return testConfiguration;
-    }
-
     private void assertNewVirtualHost(Map<String, Object> hostDetails)
     {
         @SuppressWarnings("unchecked")
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
index 7f41a8eb2e..b2119ff79f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.model.AccessControlProvider;
 import org.apache.qpid.server.model.AuthenticationProvider;
@@ -58,7 +57,7 @@ public class BrokerACLTest extends QpidRestTestCase
     private String _secondaryAclFileContent = "";
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
index b39d994198..b63df34b98 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
@@ -25,10 +25,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.model.Binding;
 import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.security.acl.AbstractACLTestCase;
 import org.apache.qpid.systest.rest.QpidRestTestCase;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -39,15 +39,17 @@ public class ExchangeRestACLTest extends QpidRestTestCase
 {
     private static final String ALLOWED_USER = "user1";
     private static final String DENIED_USER = "user2";
+    private String _queueName;
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER);
 
         AbstractACLTestCase.writeACLFileUtil(this, null,
                 "ACL ALLOW-LOG ALL ACCESS MANAGEMENT",
+                "ACL ALLOW-LOG " + ALLOWED_USER + " CREATE QUEUE",
                 "ACL ALLOW-LOG " + ALLOWED_USER + " CREATE EXCHANGE",
                 "ACL DENY-LOG " + DENIED_USER + " CREATE EXCHANGE",
                 "ACL ALLOW-LOG " + ALLOWED_USER + " UPDATE EXCHANGE",
@@ -64,6 +66,20 @@ public class ExchangeRestACLTest extends QpidRestTestCase
                 HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
     }
 
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        _queueName = getTestQueueName();
+        getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
+        Map<String, Object> queueData = new HashMap<String, Object>();
+        queueData.put(Queue.NAME, _queueName);
+        queueData.put(Queue.DURABLE, Boolean.TRUE);
+        int status = getRestTestHelper().submitRequest("/rest/queue/test/" + _queueName, "PUT", queueData);
+        assertEquals("Unexpected status", 201, status);
+
+    }
+
     public void testCreateExchangeAllowed() throws Exception
     {
         getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
@@ -210,10 +226,10 @@ public class ExchangeRestACLTest extends QpidRestTestCase
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(Binding.NAME, bindingName);
-        attributes.put(Binding.QUEUE, "queue");
+        attributes.put(Binding.QUEUE, _queueName);
         attributes.put(Binding.EXCHANGE, "amq.direct");
 
-        int responseCode = getRestTestHelper().submitRequest("/rest/binding/test/amq.direct/queue/" + bindingName, "PUT", attributes);
+        int responseCode = getRestTestHelper().submitRequest("/rest/binding/test/amq.direct/" + _queueName + "/" + bindingName, "PUT", attributes);
         return responseCode;
     }
 
@@ -229,7 +245,7 @@ public class ExchangeRestACLTest extends QpidRestTestCase
 
     private void assertBindingExistence(String bindingName, boolean exists) throws Exception
     {
-        List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct/queue/" + bindingName);
+        List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct/" + _queueName + "/" + bindingName);
         assertEquals("Unexpected result", exists, !bindings.isEmpty());
     }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
index 9a578d01fb..aff1eac9cf 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
@@ -28,7 +28,6 @@ import java.util.Properties;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.security.acl.AbstractACLTestCase;
 import org.apache.qpid.systest.rest.QpidRestTestCase;
@@ -58,7 +57,7 @@ public class GroupRestACLTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getBrokerConfiguration().setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
index 96ea5c92b3..7d94ee27ad 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
@@ -22,7 +22,6 @@ package org.apache.qpid.systest.rest.acl;
 
 import java.io.IOException;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.security.acl.AbstractACLTestCase;
 import org.apache.qpid.systest.rest.QpidRestTestCase;
@@ -34,7 +33,7 @@ public class LogViewerACLTest extends QpidRestTestCase
     private static final String DENIED_USER = "user2";
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
index b187ca955a..52f70a5dd2 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.security.acl.AbstractACLTestCase;
@@ -38,7 +37,7 @@ public class QueueRestACLTest extends QpidRestTestCase
     private static final String DENIED_USER = "user2";
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java
index 6ed84ac95a..b23e44a4d3 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java
@@ -28,7 +28,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.model.PreferencesProvider;
 import org.apache.qpid.server.model.adapter.FileSystemPreferencesProvider;
@@ -72,7 +71,7 @@ public class UserPreferencesRestACLTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().configureTemporaryPasswordFile(this, ALLOWED_USER, DENIED_USER);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
index 4c4e219695..d2f0401db5 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
@@ -28,7 +28,6 @@ import java.util.Properties;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.management.plugin.HttpManagement;
 import org.apache.qpid.server.security.acl.AbstractACLTestCase;
 import org.apache.qpid.systest.rest.QpidRestTestCase;
@@ -60,7 +59,7 @@ public class UserRestACLTest extends QpidRestTestCase
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getBrokerConfiguration().setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
index bd826259bc..ee3a8c7260 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
@@ -22,7 +22,6 @@ package org.apache.qpid.test.client.destination;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.qpid.client.AMQAnyDestination;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQDestination;
@@ -31,13 +30,15 @@ import org.apache.qpid.client.AMQSession_0_10;
 import org.apache.qpid.client.message.QpidMessageProperties;
 import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
 import org.apache.qpid.messaging.Address;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
 import org.apache.qpid.transport.ExecutionErrorCode;
 
 import javax.jms.*;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import java.util.Collections;
+
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -53,6 +54,9 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
     @Override
     public void setUp() throws Exception
     {
+        TestBrokerConfiguration config = getBrokerConfiguration();
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHost.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, 0);
+
         super.setUp();
         _connection = getConnection() ;
         _connection.start();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
index 74afbf7903..85e62f8dae 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
@@ -20,11 +20,15 @@
  */
 package org.apache.qpid.test.client.timeouts;
 
-import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.store.SlowMessageStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -43,7 +47,6 @@ public class SyncWaitDelayTest extends QpidBrokerTestCase
 {
     protected static final Logger _logger = LoggerFactory.getLogger(SyncWaitDelayTest.class);
 
-    private String VIRTUALHOST = "test";
     protected long POST_COMMIT_DELAY = 1000L;
     protected long SYNC_WRITE_TIMEOUT = POST_COMMIT_DELAY + 1000;
 
@@ -54,12 +57,11 @@ public class SyncWaitDelayTest extends QpidBrokerTestCase
 
     public void setUp() throws Exception
     {
-
-        final String prefix = "virtualhosts.virtualhost." + VIRTUALHOST;
-        setVirtualHostConfigurationProperty(prefix + ".type", StandardVirtualHostFactory.TYPE);
-        setVirtualHostConfigurationProperty(prefix + ".store.class", org.apache.qpid.server.store.SlowMessageStore.class.getName());
-        setVirtualHostConfigurationProperty(prefix + ".store.delays.commitTran.post", String.valueOf(POST_COMMIT_DELAY));
-
+        Map<String, Object> slowMessageStoreDelays = new HashMap<String,Object>();
+        slowMessageStoreDelays.put("postcommitTran", POST_COMMIT_DELAY);
+        TestBrokerConfiguration config = getBrokerConfiguration();
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHost.STORE_TYPE, SlowMessageStore.TYPE);
+        config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, "slowMessageStoreDelays", slowMessageStoreDelays);
         super.setUp();
 
         //Set the syncWrite timeout to be just larger than the delay on the commitTran.
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
index 6473a77855..6909a3cbbf 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
@@ -21,15 +21,16 @@
 package org.apache.qpid.test.unit.client;
 
 import org.apache.log4j.Logger;
-
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.RejectBehaviour;
 import org.apache.qpid.configuration.ClientProperties;
+import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
@@ -41,6 +42,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -75,13 +77,13 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
     public void setUp() throws Exception
     {
         //enable DLQ/maximumDeliveryCount support for all queues at the vhost level
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost.test.queues.maximumDeliveryCount",
-                String.valueOf(MAX_DELIVERY_COUNT));
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost.test.queues.deadLetterQueues",
-                                String.valueOf(true));
+
+        TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration();
+        brokerConfiguration.setBrokerAttribute(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED, true);
+        brokerConfiguration.setBrokerAttribute(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, MAX_DELIVERY_COUNT);
 
         //Ensure management is on
-        getBrokerConfiguration().addJmxManagementConfiguration();
+        brokerConfiguration.addJmxManagementConfiguration();
 
         // Set client-side flag to allow the server to determine if messages
         // dead-lettered or requeued.
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
index d93c7a2e71..2b914393f2 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.test.unit.transacted;
 
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
+
 /**
  * This verifies that the default behaviour is not to time out transactions.
  */
@@ -29,7 +32,8 @@ public class TransactionTimeoutDisabledTest extends TransactionTimeoutTestCase
     protected void configure() throws Exception
     {
         // Setup housekeeping every second
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".housekeeping.checkPeriod", "100");
+        TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration();
+        brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, 100);
 
         // No transaction timeout configuration.
     }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
index f5a234163d..366cf11c4e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
@@ -27,6 +27,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 
 import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 /**
  * This tests the behaviour of transactional sessions when the {@code transactionTimeout} configuration
@@ -45,28 +46,29 @@ public class TransactionTimeoutTest extends TransactionTimeoutTestCase
         getBrokerConfiguration().setBrokerAttribute(Broker.CONNECTION_CLOSE_WHEN_NO_ROUTE, false);
 
         // Setup housekeeping every 100ms
-        setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".housekeeping.checkPeriod", "100");
+        TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration();
+        brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, 100);
 
         if (getName().contains("ProducerIdle"))
         {
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.openWarn", "0");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.openClose", "0");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.idleWarn", "500");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.idleClose", "1500");
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN, 0);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE, 0);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, 500);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE, 1500);
         }
         else if (getName().contains("ProducerOpen"))
         {
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.openWarn", "1000");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.openClose", "2000");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.idleWarn", "0");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.idleClose", "0");
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN, 1000);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE, 2000);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, 0);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE, 0);
         }
         else
         {
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.openWarn", "1000");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.openClose", "2000");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.idleWarn", "500");
-            setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".transactionTimeout.idleClose", "1000");
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN, 1000);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE, 2000);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, 500);
+            brokerConfiguration.setBrokerAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE, 1500);
         }
     }
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 91dcf48001..00d34dcd7d 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -48,8 +48,6 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
@@ -68,8 +66,8 @@ import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
 import org.apache.qpid.server.protocol.AmqpProtocolVersion;
-import org.apache.qpid.server.store.MessageStoreConstants;
 import org.apache.qpid.server.store.MessageStoreCreator;
+import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.util.FileUtils;
 import org.apache.qpid.util.SystemUtils;
@@ -101,7 +99,6 @@ public class QpidBrokerTestCase extends QpidTestCase
     private Map<String, String> _propertiesSetForBroker = new HashMap<String, String>();
 
     private Map<Integer, TestBrokerConfiguration> _brokerConfigurations;
-    private XMLConfiguration _testVirtualhosts = new XMLConfiguration();
 
     protected static final String INDEX = "index";
     protected static final String CONTENT = "content";
@@ -128,7 +125,6 @@ public class QpidBrokerTestCase extends QpidTestCase
     }
 
     // system properties
-    private static final String TEST_VIRTUALHOSTS = "test.virtualhosts";
     private static final String BROKER_LANGUAGE = "broker.language";
     protected static final String BROKER_TYPE = "broker.type";
     private static final String BROKER_COMMAND = "broker.command";
@@ -420,7 +416,7 @@ public class QpidBrokerTestCase extends QpidTestCase
     {
         int actualPort = getPort(port);
         TestBrokerConfiguration configuration = getBrokerConfiguration(actualPort);
-        startBroker(actualPort, configuration, _testVirtualhosts, managementMode);
+        startBroker(actualPort, configuration, managementMode);
     }
 
     protected File getBrokerCommandLog4JFile()
@@ -434,16 +430,14 @@ public class QpidBrokerTestCase extends QpidTestCase
         _logger.info("Modified log config file to: " + file);
     }
 
-    public void startBroker(int port, TestBrokerConfiguration testConfiguration, XMLConfiguration virtualHosts) throws Exception
+    public void startBroker(int port, TestBrokerConfiguration testConfiguration) throws Exception
     {
-        startBroker(port, testConfiguration, virtualHosts, false);
+        startBroker(port, testConfiguration, false);
     }
 
-    public void startBroker(int port, TestBrokerConfiguration testConfiguration, XMLConfiguration virtualHosts, boolean managementMode) throws Exception
+    public void startBroker(int port, TestBrokerConfiguration testConfiguration, boolean managementMode) throws Exception
     {
         port = getPort(port);
-        String testConfig = saveTestConfiguration(port, testConfiguration);
-        String virtualHostsConfig = saveTestVirtualhosts(port, virtualHosts);
 
         if(_brokers.get(port) != null)
         {
@@ -454,8 +448,7 @@ public class QpidBrokerTestCase extends QpidTestCase
 
         if (_brokerType.equals(BrokerType.INTERNAL) && !existingInternalBroker())
         {
-            _logger.info("Set test.virtualhosts property to: " + virtualHostsConfig);
-            setSystemProperty(TEST_VIRTUALHOSTS, virtualHostsConfig);
+            String testConfig = saveTestConfiguration(port, testConfiguration);
             setSystemProperty(BrokerProperties.PROPERTY_USE_CUSTOM_RMI_SOCKET_FACTORY, "false");
             BrokerOptions options = new BrokerOptions();
 
@@ -479,6 +472,9 @@ public class QpidBrokerTestCase extends QpidTestCase
         }
         else if (!_brokerType.equals(BrokerType.EXTERNAL))
         {
+            String workDir = System.getProperty("QPID_WORK") + File.separator + "work" + File.separator + port;
+            testConfiguration.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHost.STORE_PATH, workDir);
+            String testConfig = saveTestConfiguration(port, testConfiguration);
             // Add the port to QPID_WORK to ensure unique working dirs for multi broker tests
             final String qpidWork = getQpidWork(_brokerType, port);
 
@@ -549,7 +545,6 @@ public class QpidBrokerTestCase extends QpidTestCase
                 setSystemProperty("root.logging.level");
                 setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES);
                 setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES);
-                setSystemProperty(TEST_VIRTUALHOSTS, virtualHostsConfig);
 
                 // Add all the specified system properties to QPID_OPTS
                 if (!_propertiesSetForBroker.isEmpty())
@@ -656,20 +651,6 @@ public class QpidBrokerTestCase extends QpidTestCase
         return _output + File.separator + getTestQueueName() + "-" + port + "-virtualhosts.xml";
     }
 
-    private String relativeToQpidHome(String file)
-    {
-        _logger.debug("Converting path to be relative to QPID_HOME: " + file);
-
-        final String qpidHome = System.getProperty(QPID_HOME,"QPID_HOME");
-        _logger.debug("QPID_HOME is: " + qpidHome);
-
-        if(!file.startsWith(qpidHome)) {
-            throw new RuntimeException("Provided path is not a child of the QPID_HOME directory: " + qpidHome);
-        }
-
-        return file.replace(qpidHome + File.separator,"");
-    }
-
     protected String getPathRelativeToWorkingDirectory(String file)
     {
         File configLocation = new File(file);
@@ -715,23 +696,6 @@ public class QpidBrokerTestCase extends QpidTestCase
         return relative;
     }
 
-    protected String saveTestVirtualhosts(int port, XMLConfiguration virtualHostConfiguration) throws ConfigurationException
-    {
-        // Specify the test virtualhosts file
-        String testVirtualhosts = getTestVirtualhostsFile(port);
-        String relative = relativeToQpidHome(testVirtualhosts);
-
-        _logger.info("Path to virtualhosts configuration: " + testVirtualhosts);
-
-        // Create the file if configuration does not exist
-        if (virtualHostConfiguration.isEmpty())
-        {
-            virtualHostConfiguration.addProperty("__ignore", "true");
-        }
-        virtualHostConfiguration.save(testVirtualhosts);
-        return relative;
-    }
-
     protected void cleanBrokerWork(final String qpidWork)
     {
         if (qpidWork != null)
@@ -872,68 +836,32 @@ public class QpidBrokerTestCase extends QpidTestCase
      * Creates a new virtual host within the test virtualhost file.
      * @param brokerPort broker port
      * @param virtualHostName virtual host name
-     *
-     * @throws ConfigurationException
      */
-    protected void createTestVirtualHost(int brokerPort, String virtualHostName) throws ConfigurationException
+    protected void createTestVirtualHost(int brokerPort, String virtualHostName)
     {
-        String storeClassName = getTestProfileMessageStoreClassName();
-
-        _testVirtualhosts.setProperty("virtualhost.name(-1)", virtualHostName);
-        _testVirtualhosts.setProperty("virtualhost." + virtualHostName + ".store.class", storeClassName);
-
+        String storeType = getTestProfileMessageStoreType();
         String storeDir = null;
 
         if (System.getProperty("profile", "").startsWith("java-dby-mem"))
         {
             storeDir = ":memory:";
         }
-        else if (!MEMORY_STORE_CLASS_NAME.equals(storeClassName))
+        else if (!"Memory".equals(storeType))
         {
-            storeDir = "${QPID_WORK}" + File.separator + virtualHostName + "-store";
-        }
-
-        if (storeDir != null)
-        {
-            _testVirtualhosts.setProperty("virtualhost." + virtualHostName + ".store." + MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY, storeDir);
+            storeDir = "${QPID_WORK}" + File.separator + virtualHostName + File.separator + brokerPort;
         }
 
         // add new virtual host configuration to the broker store
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(VirtualHost.NAME, virtualHostName);
-        attributes.put(VirtualHost.CONFIG_PATH,  System.getProperty("broker.virtualhosts-config"));
+        attributes.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
+        attributes.put(VirtualHost.STORE_TYPE, storeType);
+        attributes.put(VirtualHost.STORE_PATH, storeDir);
         int port = getPort(brokerPort);
         getBrokerConfiguration(port).addVirtualHostConfiguration(attributes);
     }
 
     /**
-     * Set a configuration Property for this test run.
-     *
-     * This creates a new configuration based on the current configuration
-     * with the specified property change.
-     *
-     * Multiple calls to this method will result in multiple temporary
-     * configuration files being created.
-     *
-     * @param property the configuration property to set
-     * @param value    the new value
-     *
-     * @throws ConfigurationException when loading the current config file
-     */
-    public void setVirtualHostConfigurationProperty(String property, String value) throws ConfigurationException
-    {
-        // Choose which file to write the property to based on prefix.
-        if (property.startsWith("virtualhosts"))
-        {
-            _testVirtualhosts.setProperty(StringUtils.substringAfter(property, "virtualhosts."), value);
-        }
-        else
-        {
-            throw new ConfigurationException("Cannot set broker configuration as property");
-        }
-    }
-
-    /**
      * Set a System property that is to be applied only to the external test
      * broker.
      *
@@ -1468,24 +1396,4 @@ public class QpidBrokerTestCase extends QpidTestCase
         return FAILING_PORT;
     }
 
-    public XMLConfiguration getTestVirtualhosts()
-    {
-        return _testVirtualhosts;
-    }
-
-    public void setTestVirtualhosts(XMLConfiguration testVirtualhosts)
-    {
-        _testVirtualhosts = testVirtualhosts;
-    }
-
-    public String getTestProfileMessageStoreType()
-    {
-        final String storeClass = getTestProfileMessageStoreClassName();
-       /* if (storeClass == null)
-        {
-            return "Memory";
-        }*/
-        return supportedStoresClassToTypeMapping.get(storeClass);
-    }
-
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
index 9e893bb7bb..31a650baad 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.test.utils;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
@@ -45,6 +46,7 @@ import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.plugin.PluginFactory;
 import org.apache.qpid.server.security.access.FileAccessControlProviderConstants;
 import org.apache.qpid.server.security.group.FileGroupManagerFactory;
+import org.apache.qpid.util.FileUtils;
 
 public class TestBrokerConfiguration
 {
@@ -308,4 +310,8 @@ public class TestBrokerConfiguration
         _store.save(newAp, pp);
     }
 
+    public Map<String, Object> getObjectAttributes(String name)
+    {
+        return findObjectByName(name).getAttributes();
+    }
 }
diff --git a/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory b/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
index fdd7a904c3..9e2efc1031 100644
--- a/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
+++ b/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
@@ -17,3 +17,4 @@
 # under the License.
 #
 org.apache.qpid.server.store.SlowMessageStoreFactory
+org.apache.qpid.server.store.QuotaMessageStoreFactory