You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2014/03/12 14:19:32 UTC

svn commit: r1576732 [3/4] - in /qpid/branches/java-broker-bdb-ha2/qpid/java: ./ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/systests/src/main/java/org/apache/...

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java Wed Mar 12 13:19:29 2014
@@ -20,45 +20,46 @@
  */
 package org.apache.qpid.server.virtualhost;
 
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 import org.apache.qpid.server.binding.BindingImpl;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 
 import org.apache.qpid.server.exchange.AbstractExchange;
 import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.Model;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.stats.StatisticsGatherer;
+import org.apache.qpid.server.store.ConfigurationRecoveryHandler;
+import org.apache.qpid.server.store.JsonFileConfigStore;
 import org.apache.qpid.server.store.TestMemoryMessageStore;
 import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
 import org.apache.qpid.test.utils.QpidTestCase;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.util.FileUtils;
+import org.codehaus.jackson.map.ObjectMapper;
 
 public class StandardVirtualHostTest extends QpidTestCase
 {
     private VirtualHostRegistry _virtualHostRegistry;
+    private File _storeFolder;
 
     @Override
     public void setUp() throws Exception
     {
         super.setUp();
         BrokerTestHelper.setUp();
+        _storeFolder = TestFileUtils.createTestDirectory(".tmp.store", true);
     }
 
     @Override
@@ -75,6 +76,7 @@ public class StandardVirtualHostTest ext
         {
             BrokerTestHelper.tearDown();
             super.tearDown();
+            FileUtils.delete(_storeFolder, false);
         }
 
     }
@@ -106,25 +108,23 @@ public class StandardVirtualHostTest ext
     {
         final String queueName = getName();
         final String customBinding = "custom-binding";
-        File config = writeConfigFile(queueName, queueName, null, false, new String[]{customBinding});
+        writeConfigFile(queueName, queueName, null, false, new String[]{customBinding});
 
         try
         {
-            createVirtualHost(queueName, config);
+            createVirtualHost(queueName);
             fail("virtualhost creation should have failed due to illegal configuration");
         }
-        catch (ServerScopedRuntimeException e)
+        catch (IllegalConfigurationException e)
         {
-            Throwable cause = e.getCause();
-            assertNotNull(cause);
-            assertEquals("Attempt to bind queue '" + queueName + "' with binding key(s) [" + customBinding + "] without specifying an exchange", cause.getMessage());
+            // pass
         }
     }
 
     public void testVirtualHostBecomesActive() throws Exception
     {
-        File config = writeConfigFile(getName(), getName(), getName() +".direct", false, new String[0]);
-        VirtualHost vhost = createVirtualHost(getName(), config);
+        writeConfigFile(getName(), getName(), getName() +".direct", false, new String[0]);
+        VirtualHost vhost = createVirtualHost(getName());
         assertNotNull(vhost);
         assertEquals(State.ACTIVE, vhost.getState());
     }
@@ -132,15 +132,15 @@ public class StandardVirtualHostTest ext
     public void testVirtualHostHavingStoreSetAsTypeBecomesActive() throws Exception
     {
         String virtualHostName = getName();
-        VirtualHost host = createVirtualHostUsingStoreType(virtualHostName);
+        VirtualHost host = createVirtualHost(virtualHostName);
         assertNotNull(host);
         assertEquals(State.ACTIVE, host.getState());
     }
 
     public void testVirtualHostBecomesStoppedOnClose() throws Exception
     {
-        File config = writeConfigFile(getName(), getName(), getName() +".direct", false, new String[0]);
-        VirtualHost vhost = createVirtualHost(getName(), config);
+        writeConfigFile(getName(), getName(), getName() +".direct", false, new String[0]);
+        VirtualHost vhost = createVirtualHost(getName());
         assertNotNull(vhost);
         assertEquals(State.ACTIVE, vhost.getState());
         vhost.close();
@@ -151,7 +151,7 @@ public class StandardVirtualHostTest ext
     public void testVirtualHostHavingStoreSetAsTypeBecomesStoppedOnClose() throws Exception
     {
         String virtualHostName = getName();
-        VirtualHost host = createVirtualHostUsingStoreType(virtualHostName);
+        VirtualHost host = createVirtualHost(virtualHostName);
         assertNotNull(host);
         assertEquals(State.ACTIVE, host.getState());
         host.close();
@@ -166,33 +166,16 @@ public class StandardVirtualHostTest ext
     {
         final String queueName = getName();
         final String exchangeName = "made-up-exchange";
-        File config = writeConfigFile(queueName, queueName, exchangeName, true, new String[0]);
-
-        try
-        {
-            createVirtualHost(queueName, config);
-            fail("virtualhost creation should have failed due to illegal configuration");
-        }
-        catch (ServerScopedRuntimeException e)
-        {
-            Throwable cause = e.getCause();
-            assertNotNull(cause);
-            assertEquals("Attempt to bind queue '" + queueName + "' to unknown exchange:" + exchangeName, cause.getMessage());
-        }
-    }
+        writeConfigFile(queueName, queueName, exchangeName, true, new String[0]);
 
-    public void testCreateVirtualHostWithoutConfigurationInConfigFile() throws Exception
-    {
-        File config = writeConfigFile(getName(), getName(), getName() +".direct", false, new String[0]);
-        String hostName = getName() + "-not-existing";
         try
         {
-            createVirtualHost(hostName, config);
+            createVirtualHost(queueName);
             fail("virtualhost creation should have failed due to illegal configuration");
         }
-        catch (RuntimeException e)
+        catch (IllegalConfigurationException e)
         {
-            assertEquals("No configuration found for virtual host '" + hostName + "' in " + config.getAbsolutePath(), e.getMessage());
+            // pass
         }
     }
 
@@ -205,8 +188,8 @@ public class StandardVirtualHostTest ext
         Map<String, String[]> bindingArguments = new HashMap<String, String[]>();
         bindingArguments.put("ping", new String[]{"x-filter-jms-selector=select=1", "x-qpid-no-local"});
         bindingArguments.put("pong", new String[]{"x-filter-jms-selector=select='pong'"});
-        File config = writeConfigFile(vhostName, queueName, exchangeName, false, new String[]{"ping","pong"}, bindingArguments);
-        VirtualHost vhost = createVirtualHost(vhostName, config);
+        writeConfigFile(vhostName, queueName, exchangeName, false, new String[]{"ping","pong"}, bindingArguments);
+        VirtualHost vhost = createVirtualHost(vhostName);
 
         ExchangeImpl exch = vhost.getExchange(getName() +".direct");
         Collection<BindingImpl> bindings = ((AbstractExchange)exch).getBindings();
@@ -246,8 +229,8 @@ public class StandardVirtualHostTest ext
         String vhostName = getName();
         String queueName = getName();
 
-        File config = writeConfigFile(vhostName, queueName, exchangeName, false, routingKeys);
-        VirtualHost vhost = createVirtualHost(vhostName, config);
+        writeConfigFile(vhostName, queueName, exchangeName, false, routingKeys);
+        VirtualHost vhost = createVirtualHost(vhostName);
         assertNotNull("virtualhost should exist", vhost);
 
         AMQQueue queue = vhost.getQueue(queueName);
@@ -263,16 +246,19 @@ public class StandardVirtualHostTest ext
     }
 
 
-    private VirtualHost createVirtualHost(String vhostName, File config) throws Exception
+    private VirtualHost createVirtualHost(String virtualHostName) throws Exception
     {
-        Broker broker = BrokerTestHelper.createBrokerMock();
+        Broker<?> broker = BrokerTestHelper.createBrokerMock();
         _virtualHostRegistry = broker.getVirtualHostRegistry();
 
-        VirtualHostConfiguration configuration = new  VirtualHostConfiguration(vhostName, config, broker);
-        VirtualHost host = new StandardVirtualHostFactory().createVirtualHost(_virtualHostRegistry, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), configuration,
-                mock(org.apache.qpid.server.model.VirtualHost.class));
+        org.apache.qpid.server.model.VirtualHost<?> model = mock(org.apache.qpid.server.model.VirtualHost.class);
+        when(model.getAttribute(org.apache.qpid.server.model.VirtualHost.CONFIG_STORE_TYPE)).thenReturn(JsonFileConfigStore.TYPE);
+        when(model.getAttribute(org.apache.qpid.server.model.VirtualHost.CONFIG_STORE_PATH)).thenReturn(_storeFolder.getAbsolutePath());
+        when(model.getAttribute(org.apache.qpid.server.model.VirtualHost.STORE_TYPE)).thenReturn(TestMemoryMessageStore.TYPE);
+        when(model.getName()).thenReturn(virtualHostName);
+        VirtualHost host = new StandardVirtualHostFactory().createVirtualHost(_virtualHostRegistry, mock(StatisticsGatherer.class),
+                new SecurityManager(broker, false), model);
         _virtualHostRegistry.registerVirtualHost(host);
-
         return host;
     }
 
@@ -285,95 +271,79 @@ public class StandardVirtualHostTest ext
      * @param dontDeclare if true then don't declare the exchange, even if its name is non-null
      * @param routingKeys routingKeys to bind the queue with (empty array = none)
      * @return
+     * @throws Exception
      */
-    private File writeConfigFile(String vhostName, String queueName, String exchangeName, boolean dontDeclare, String[] routingKeys)
+    private void writeConfigFile(String vhostName, String queueName, String exchangeName, boolean dontDeclare, String[] routingKeys) throws Exception
     {
-        return writeConfigFile(vhostName, queueName, exchangeName, dontDeclare, routingKeys, null);
+        writeConfigFile(vhostName, queueName, exchangeName, dontDeclare, routingKeys, null);
     }
 
-    private File writeConfigFile(String vhostName, String queueName, String exchangeName, boolean dontDeclare, String[] routingKeys, Map<String, String[]> bindingArguments)
+    private void writeConfigFile(String vhostName, String queueName, String exchangeName, boolean dontDeclare,
+            String[] routingKeys, Map<String, String[]> bindingArguments) throws Exception
     {
-        File tmpFile = null;
-        try
-        {
-            tmpFile = File.createTempFile(getName(), ".tmp");
-            tmpFile.deleteOnExit();
-
-            FileWriter fstream = new FileWriter(tmpFile);
-            BufferedWriter writer = new BufferedWriter(fstream);
-
-            //extra outer tag to please Commons Configuration
-
-            writer.write("<virtualhosts>");
-            writer.write("  <default>" + vhostName + "</default>");
-            writer.write("  <virtualhost>");
-            writer.write("      <name>" + vhostName + "</name>");
-            writer.write("      <" + vhostName + ">");
-            writer.write("          <type>" + StandardVirtualHostFactory.TYPE + "</type>");
-            writer.write("              <store>");
-            writer.write("                <class>" + TestMemoryMessageStore.class.getName() + "</class>");
-            writer.write("              </store>");
-            if(exchangeName != null && !dontDeclare)
-            {
-                writer.write("          <exchanges>");
-                writer.write("              <exchange>");
-                writer.write("                  <type>direct</type>");
-                writer.write("                  <name>" + exchangeName + "</name>");
-                writer.write("              </exchange>");
-                writer.write("          </exchanges>");
-            }
-            writer.write("          <queues>");
-            writer.write("              <queue>");
-            writer.write("                  <name>" + queueName + "</name>");
-            writer.write("                  <" + queueName + ">");
-            if(exchangeName != null)
-            {
-                writer.write("                      <exchange>" + exchangeName + "</exchange>");
-            }
-            for(String routingKey: routingKeys)
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("modelVersion", Model.MODEL_VERSION);
+        data.put("configVersion", org.apache.qpid.server.model.VirtualHost.CURRENT_CONFIG_VERSION);
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.writeValue(new File(_storeFolder, vhostName + ".json"), data);
+
+        JsonFileConfigStore store = new JsonFileConfigStore();
+        org.apache.qpid.server.model.VirtualHost<?> virtualHost = mock(org.apache.qpid.server.model.VirtualHost.class);
+        when(virtualHost.getName()).thenReturn(vhostName);
+        when(virtualHost.getAttribute(org.apache.qpid.server.model.VirtualHost.CONFIG_STORE_PATH)).thenReturn(_storeFolder.getAbsolutePath());
+        ConfigurationRecoveryHandler recoveryHandler = mock(ConfigurationRecoveryHandler.class);
+        when(recoveryHandler.completeConfigurationRecovery()).thenReturn(org.apache.qpid.server.model.VirtualHost.CURRENT_CONFIG_VERSION);
+        store.configureConfigStore(virtualHost , recoveryHandler );
+
+        UUID exchangeId = UUIDGenerator.generateExchangeUUID(exchangeName == null? "amq.direct" : exchangeName, vhostName);
+        if(exchangeName != null && !dontDeclare)
+        {
+            Map<String, Object> exchangeAttributes = new HashMap<String, Object>();
+            exchangeAttributes.put(org.apache.qpid.server.model.Exchange.NAME, exchangeName);
+            exchangeAttributes.put(org.apache.qpid.server.model.Exchange.TYPE, "direct");
+            exchangeAttributes.put(org.apache.qpid.server.model.Exchange.DURABLE, true);
+            store.create(exchangeId, org.apache.qpid.server.model.Exchange.class.getSimpleName(), exchangeAttributes);
+        }
+
+        UUID queueId = UUID.randomUUID();
+        Map<String, Object> queueAttributes = new HashMap<String, Object>();
+        queueAttributes.put(org.apache.qpid.server.model.Queue.NAME, queueName);
+        queueAttributes.put(org.apache.qpid.server.model.Queue.DURABLE, true);
+        store.create(queueId, org.apache.qpid.server.model.Queue.class.getSimpleName(), queueAttributes);
+
+        Map<String, Object> bindingAttributes = new HashMap<String, Object>();
+        bindingAttributes.put(org.apache.qpid.server.model.Binding.NAME, queueName);
+        bindingAttributes.put(org.apache.qpid.server.model.Binding.QUEUE, queueId);
+        bindingAttributes.put(org.apache.qpid.server.model.Binding.EXCHANGE, exchangeId );
+        store.create(UUID.randomUUID(), org.apache.qpid.server.model.Binding.class.getSimpleName(), bindingAttributes);
+
+        for (int i = 0; i < routingKeys.length; i++)
+        {
+            Map<String, Object> attributes = new HashMap<String, Object>();
+            attributes.put(org.apache.qpid.server.model.Binding.NAME, routingKeys[i]);
+            attributes.put(org.apache.qpid.server.model.Binding.QUEUE, queueId);
+            attributes.put(org.apache.qpid.server.model.Binding.EXCHANGE, exchangeId );
+            if (bindingArguments != null && bindingArguments.containsKey(routingKeys[i]))
             {
-                writer.write("                      <routingKey>" + routingKey + "</routingKey>\n");
-                if (bindingArguments!= null && bindingArguments.containsKey(routingKey))
+                String[] args = (String[])bindingArguments.get(routingKeys[i]);
+                Map<String, Object> arguments = new HashMap<String, Object>();
+                for (int j = 0; j < args.length; j++)
                 {
-                    writer.write("                      <" + routingKey + ">\n");
-                    String[] arguments = (String[])bindingArguments.get(routingKey);
-                    for (String argument : arguments)
+                    int pos = args[j].indexOf('=');
+                    if (pos == -1)
+                    {
+                        arguments.put(args[j], null);
+                    }
+                    else
                     {
-                        writer.write("                          <bindingArgument>" + argument + "</bindingArgument>\n");
+                        arguments.put(args[j].substring(0, pos), args[j].substring(pos + 1));
                     }
-                    writer.write("                      </" + routingKey + ">\n");
                 }
+                attributes.put(org.apache.qpid.server.model.Binding.ARGUMENTS, arguments );
             }
-            writer.write("                  </" + queueName + ">");
-            writer.write("              </queue>");
-            writer.write("          </queues>");
-            writer.write("      </" + vhostName + ">");
-            writer.write("  </virtualhost>");
-            writer.write("</virtualhosts>");
-
-            writer.flush();
-            writer.close();
-        }
-        catch (IOException e)
-        {
-            fail("Unable to create virtualhost configuration");
+            store.create(UUID.randomUUID(), org.apache.qpid.server.model.Binding.class.getSimpleName(), attributes);
         }
-
-        return tmpFile;
+        store.close();
     }
 
-    private VirtualHost createVirtualHostUsingStoreType(String virtualHostName) throws ConfigurationException, Exception
-    {
-        Broker broker = BrokerTestHelper.createBrokerMock();
-        _virtualHostRegistry = broker.getVirtualHostRegistry();
-
-        Configuration config = new PropertiesConfiguration();
-        VirtualHostConfiguration configuration = new  VirtualHostConfiguration(virtualHostName, config, broker);
-        final org.apache.qpid.server.model.VirtualHost virtualHost = mock(org.apache.qpid.server.model.VirtualHost.class);
-        when(virtualHost.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.STORE_TYPE))).thenReturn(TestMemoryMessageStore.TYPE);
-        VirtualHost host = new StandardVirtualHostFactory().createVirtualHost(_virtualHostRegistry, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), configuration,
-                virtualHost);
-        _virtualHostRegistry.registerVirtualHost(host);
-        return host;
-    }
 }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory Wed Mar 12 13:19:29 2014
@@ -17,3 +17,4 @@
 # under the License.
 #
 org.apache.qpid.server.store.TestMemoryMessageStoreFactory
+org.apache.qpid.server.store.TestableMemoryMessageStoreFactory
\ No newline at end of file

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java Wed Mar 12 13:19:29 2014
@@ -29,7 +29,6 @@ import java.util.Set;
 
 import javax.security.auth.Subject;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -64,7 +63,7 @@ public class DefaultAccessControl implem
         _aclFile = new File(fileName);
     }
 
-    DefaultAccessControl(RuleSet rs) throws ConfigurationException
+    DefaultAccessControl(RuleSet rs)
     {
         _ruleSet = rs;
         _eventLogger = rs;

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java Wed Mar 12 13:19:29 2014
@@ -36,12 +36,6 @@ import org.apache.qpid.server.security.a
 
 import static org.mockito.Mockito.mock;
 
-/**
- * These tests check that the ACL file parsing works correctly.
- *
- * For each message that can be returned in a {@link ConfigurationException}, an ACL file is created that should trigger this
- * particular message.
- */
 public class PlainConfigurationTest extends TestCase
 {
     private PlainConfiguration writeACLConfig(String...aclData) throws Exception

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java Wed Mar 12 13:19:29 2014
@@ -31,7 +31,6 @@ import javax.security.auth.Subject;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.server.connection.ConnectionPrincipal;
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.EventLoggerProvider;
@@ -68,12 +67,12 @@ public class DefaultAccessControlTest ex
         _plugin = null;
     }
 
-    private void setUpGroupAccessControl() throws ConfigurationException
+    private void setUpGroupAccessControl()
     {
         configureAccessControl(createGroupRuleSet());
     }
 
-    private void configureAccessControl(final RuleSet rs) throws ConfigurationException
+    private void configureAccessControl(final RuleSet rs)
     {
         _plugin = new DefaultAccessControl(rs);
     }
@@ -98,7 +97,7 @@ public class DefaultAccessControlTest ex
     /**
      * ACL plugin must always abstain if there is no  subject attached to the thread.
      */
-    public void testNoSubjectAlwaysAbstains() throws ConfigurationException
+    public void testNoSubjectAlwaysAbstains()
     {
         setUpGroupAccessControl();
         final Result result = _plugin.authorise(Operation.ACCESS, ObjectType.VIRTUALHOST, ObjectProperties.EMPTY);
@@ -109,7 +108,7 @@ public class DefaultAccessControlTest ex
      * Tests that an allow rule expressed with a username allows an operation performed by a thread running
      * with the same username.
      */
-    public void testUsernameAllowsOperation() throws ConfigurationException
+    public void testUsernameAllowsOperation()
     {
         setUpGroupAccessControl();
         Subject.doAs(TestPrincipalUtils.createTestSubject("user1"), new PrivilegedAction<Object>()
@@ -128,7 +127,7 @@ public class DefaultAccessControlTest ex
      * Tests that an allow rule expressed with an <b>ACL groupname</b> allows an operation performed by a thread running
      * by a user who belongs to the same group..
      */
-    public void testGroupMembershipAllowsOperation() throws ConfigurationException
+    public void testGroupMembershipAllowsOperation()
     {
         setUpGroupAccessControl();
 
@@ -141,7 +140,7 @@ public class DefaultAccessControlTest ex
      * Tests that a deny rule expressed with a <b>groupname</b> denies an operation performed by a thread running
      * by a user who belongs to the same group.
      */
-    public void testGroupMembershipDeniesOperation() throws ConfigurationException
+    public void testGroupMembershipDeniesOperation()
     {
         setUpGroupAccessControl();
         authoriseAndAssertResult(Result.DENIED, "user3", DENIED_GROUP);
@@ -150,7 +149,7 @@ public class DefaultAccessControlTest ex
     /**
      * Tests that the catch all deny denies the operation and logs with the logging actor.
      */
-    public void testCatchAllRuleDeniesUnrecognisedUsername() throws ConfigurationException
+    public void testCatchAllRuleDeniesUnrecognisedUsername()
     {
         setUpGroupAccessControl();
         Subject.doAs(TestPrincipalUtils.createTestSubject("unknown", "unkgroup1", "unkgroup2"),
@@ -177,7 +176,7 @@ public class DefaultAccessControlTest ex
     /**
      * Tests that a grant access method rule allows any access operation to be performed on any component
      */
-    public void testAuthoriseAccessMethodWhenAllAccessOperationsAllowedOnAllComponents() throws ConfigurationException
+    public void testAuthoriseAccessMethodWhenAllAccessOperationsAllowedOnAllComponents()
     {
         final RuleSet rs = new RuleSet(mock(EventLoggerProvider.class));
 
@@ -203,7 +202,7 @@ public class DefaultAccessControlTest ex
     /**
      * Tests that a grant access method rule allows any access operation to be performed on a specified component
      */
-    public void testAuthoriseAccessMethodWhenAllAccessOperationsAllowedOnSpecifiedComponent() throws ConfigurationException
+    public void testAuthoriseAccessMethodWhenAllAccessOperationsAllowedOnSpecifiedComponent()
     {
         final RuleSet rs = new RuleSet(mock(EventLoggerProvider.class));
 
@@ -303,7 +302,7 @@ public class DefaultAccessControlTest ex
     /**
      * Tests that a grant access method rule allows any access operation to be performed on a specified component
      */
-    public void testAuthoriseAccessMethodWhenSpecifiedAccessOperationsAllowedOnSpecifiedComponent() throws ConfigurationException
+    public void testAuthoriseAccessMethodWhenSpecifiedAccessOperationsAllowedOnSpecifiedComponent()
     {
         final RuleSet rs = new RuleSet(mock(EventLoggerProvider.class));
 
@@ -340,7 +339,7 @@ public class DefaultAccessControlTest ex
     /**
      * Tests that granting of all method rights on a method allows a specified operation to be performed on any component
      */
-    public void testAuthoriseAccessUpdateMethodWhenAllRightsGrantedOnSpecifiedMethodForAllComponents() throws ConfigurationException
+    public void testAuthoriseAccessUpdateMethodWhenAllRightsGrantedOnSpecifiedMethodForAllComponents()
     {
         final RuleSet rs = new RuleSet(mock(EventLoggerProvider.class));
 
@@ -379,7 +378,7 @@ public class DefaultAccessControlTest ex
     /**
      * Tests that granting of all method rights allows any operation to be performed on any component
      */
-    public void testAuthoriseAccessUpdateMethodWhenAllRightsGrantedOnAllMethodsInAllComponents() throws ConfigurationException
+    public void testAuthoriseAccessUpdateMethodWhenAllRightsGrantedOnAllMethodsInAllComponents()
     {
         final RuleSet rs = new RuleSet(mock(EventLoggerProvider.class));
 
@@ -417,7 +416,7 @@ public class DefaultAccessControlTest ex
     /**
      * Tests that granting of access method rights with mask allows matching operations to be performed on the specified component
      */
-    public void testAuthoriseAccessMethodWhenMatchingAccessOperationsAllowedOnSpecifiedComponent() throws ConfigurationException
+    public void testAuthoriseAccessMethodWhenMatchingAccessOperationsAllowedOnSpecifiedComponent()
     {
         final RuleSet rs = new RuleSet(mock(EventLoggerProvider.class));
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java Wed Mar 12 13:19:29 2014
@@ -20,9 +20,7 @@
  */
 package org.apache.qpid.server.store.derby;
 
-import java.util.Collections;
 import java.util.Map;
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
@@ -51,13 +49,6 @@ public class DerbyMessageStoreFactory im
     }
 
     @Override
-    public Map<String, Object> convertStoreConfiguration(Configuration configuration)
-    {
-        return Collections.emptyMap();
-    }
-
-
-    @Override
     public void validateAttributes(Map<String, Object> attributes)
     {
         if(getType().equals(attributes.get(VirtualHost.STORE_TYPE)))

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProvider.java Wed Mar 12 13:19:29 2014
@@ -24,7 +24,6 @@ import com.jolbox.bonecp.BoneCP;
 import com.jolbox.bonecp.BoneCPConfig;
 import java.sql.Connection;
 import java.sql.SQLException;
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.jdbc.ConnectionProvider;
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java Wed Mar 12 13:19:29 2014
@@ -21,7 +21,6 @@
 package org.apache.qpid.server.store.jdbc.bonecp;
 
 import java.sql.SQLException;
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory;
 import org.apache.qpid.server.store.jdbc.ConnectionProvider;

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java Wed Mar 12 13:19:29 2014
@@ -20,9 +20,7 @@
  */
 package org.apache.qpid.server.store.jdbc;
 
-import java.util.HashMap;
 import java.util.Map;
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
@@ -51,28 +49,6 @@ public class JDBCMessageStoreFactory imp
     }
 
     @Override
-    public Map<String, Object> convertStoreConfiguration(Configuration storeConfiguration)
-    {
-        Map<String,Object> convertedMap = new HashMap<String,Object>();
-        convertedMap.put("jdbcBlobType", storeConfiguration.getString("sqlBlobType"));
-        convertedMap.put("jdbcVarbinaryType", storeConfiguration.getString("sqlVarbinaryType"));
-        if(storeConfiguration.containsKey("useBytesForBlob"))
-        {
-            convertedMap.put("jdbcUseBytesForBlob", storeConfiguration.getBoolean("useBytesForBlob"));
-        }
-        convertedMap.put("jdbcBigIntType", storeConfiguration.getString("sqlBigIntType"));
-        convertedMap.put("connectionPool", storeConfiguration.getString("pool.type"));
-        convertedMap.put("minConnectionsPerPartition", storeConfiguration.getInteger("pool.minConnectionsPerPartition",
-                null));
-        convertedMap.put("maxConnectionsPerPartition", storeConfiguration.getInteger("pool.maxConnectionsPerPartition",
-                null));
-        convertedMap.put("partitionCount", storeConfiguration.getInteger("pool.partitionCount", null));
-
-        return convertedMap;
-    }
-
-
-    @Override
     public void validateAttributes(Map<String, Object> attributes)
     {
         if(getType().equals(attributes.get(VirtualHost.STORE_TYPE)))

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java Wed Mar 12 13:19:29 2014
@@ -20,10 +20,10 @@
  */
 package org.apache.qpid.server.jmx;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.common.Closeable;
 
 import javax.management.JMException;
+
 import java.io.IOException;
 
 /**
@@ -40,7 +40,7 @@ import java.io.IOException;
  */
 public interface ManagedObjectRegistry extends Closeable
 {
-    void start() throws IOException, ConfigurationException;
+    void start() throws IOException;
 
     void registerObject(ManagedObject managedObject) throws JMException;
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java Wed Mar 12 13:19:29 2014
@@ -20,9 +20,7 @@
  */
 package org.apache.qpid.server.store;
 
-import java.util.Collections;
 import java.util.Map;
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
 
 public class MemoryMessageStoreFactory implements MessageStoreFactory
@@ -41,12 +39,6 @@ public class MemoryMessageStoreFactory i
     }
 
     @Override
-    public Map<String, Object> convertStoreConfiguration(Configuration configuration)
-    {
-        return Collections.emptyMap();
-    }
-
-    @Override
     public void validateAttributes(Map<String, Object> attributes)
     {
     }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/module.xml?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/module.xml (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/module.xml Wed Mar 12 13:19:29 2014
@@ -418,6 +418,7 @@
     <propertyref name="java.naming.factory.initial"/>
     <propertyref name="java.naming.provider.url"/>
     <propertyref name="messagestore.class.name" />
+    <propertyref name="messagestore.type" />
     <propertyref name="max_prefetch"/>
 
     <propertyref name="QPID_HOME"/>

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Wed Mar 12 13:19:29 2014
@@ -22,6 +22,7 @@ package org.apache.qpid.test.utils;
 
 import junit.framework.TestCase;
 import junit.framework.TestResult;
+
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
@@ -124,10 +125,7 @@ public class QpidTestCase extends TestCa
         }
     }
 
-    protected static final String MESSAGE_STORE_CLASS_NAME_KEY = "messagestore.class.name";
-    protected static final String CONFIGURATION_STORE_CLASS_NAME_KEY = "configurationstore.class.name";
-
-    protected static final String MEMORY_STORE_CLASS_NAME = "org.apache.qpid.server.store.MemoryMessageStore";
+    protected static final String MESSAGE_STORE_TYPE = "messagestore.type";
 
     private static List<String> _exclusionList;
 
@@ -151,12 +149,12 @@ public class QpidTestCase extends TestCa
         }
     }
 
-    public String getTestProfileMessageStoreClassName()
+    public String getTestProfileMessageStoreType()
     {
-        final String storeClass = System.getProperty(MESSAGE_STORE_CLASS_NAME_KEY);
-        _logger.debug("MESSAGE_STORE_CLASS_NAME_KEY " + storeClass);
+        final String storeType = System.getProperty(MESSAGE_STORE_TYPE);
+        _logger.debug(MESSAGE_STORE_TYPE + "=" + storeType);
 
-        return storeClass != null ? storeClass : MEMORY_STORE_CLASS_NAME ;
+        return storeType != null ? storeType : "TestableMemory";
     }
 
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/etc/config-systests.json
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/etc/config-systests.json?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/etc/config-systests.json (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/etc/config-systests.json Wed Mar 12 13:19:29 2014
@@ -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"
   } ]
 }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java Wed Mar 12 13:19:29 2014
@@ -25,9 +25,17 @@ import static org.apache.qpid.test.utils
 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.Tran
 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 QpidBrokerT
                                                 boolean sslOnly,
                                                 boolean needClientAuth,
                                                 boolean wantClientAuth,
-                                                boolean samePort) throws ConfigurationException
+                                                boolean samePort) throws Exception
     {
         if(isJavaBroker())
         {

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java Wed Mar 12 13:19:29 2014
@@ -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 Abstra
     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 Abstra
 
         _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 Abstra
         // 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();

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java Wed Mar 12 13:19:29 2014
@@ -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 AbstractACLTestCas
         }
     }
     
-    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));

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java Wed Mar 12 13:19:29 2014
@@ -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 
         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();
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java Wed Mar 12 13:19:29 2014
@@ -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.ContentHe
 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 Qp
 
     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 Qp
         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 Qp
         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 Qp
         return _virtualHost;
     }
 
-    public PropertiesConfiguration getConfig()
-    {
-        return _config;
-    }
-
     protected void reloadVirtualHost()
     {
         VirtualHost original = getVirtualHost();
@@ -189,7 +181,7 @@ public class MessageStoreTest extends Qp
 
         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)
         {

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java Wed Mar 12 13:19:29 2014
@@ -30,6 +30,7 @@ import org.apache.qpid.server.model.Virt
 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);
 

Added: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStoreFactory.java?rev=1576732&view=auto
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStoreFactory.java (added)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStoreFactory.java Wed Mar 12 13:19:29 2014
@@ -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)
+    {
+    }
+
+}

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java Wed Mar 12 13:19:29 2014
@@ -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
     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
     @Override
     public String getStoreType()
     {
-        return "SLOW";
+        return TYPE;
     }
 
     @Override

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStoreFactory.java Wed Mar 12 13:19:29 2014
@@ -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 imp
     @Override
     public String getType()
     {
-        return "SLOW";
+        return SlowMessageStore.TYPE;
     }
 
     @Override
@@ -40,43 +38,6 @@ public class SlowMessageStoreFactory imp
     }
 
     @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)
     {
     }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java Wed Mar 12 13:19:29 2014
@@ -37,7 +37,9 @@ import org.apache.qpid.client.AMQDestina
 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 Q
 
     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();
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java Wed Mar 12 13:19:29 2014
@@ -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 AccessControlProviderRestTe
                           "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);

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java Wed Mar 12 13:19:29 2014
@@ -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 ext
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         TestBrokerConfiguration config = getBrokerConfiguration();

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Wed Mar 12 13:19:29 2014
@@ -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,

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java Wed Mar 12 13:19:29 2014
@@ -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 Q
     }
 
     @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)

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java Wed Mar 12 13:19:29 2014
@@ -30,12 +30,18 @@ import org.apache.qpid.server.model.Bind
 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 Qpi
     {
         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 Qpi
     {
         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);

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java Wed Mar 12 13:19:29 2014
@@ -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 BrokerRestHttpsClientCertAu
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().setUseSslAuth(true);

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java Wed Mar 12 13:19:29 2014
@@ -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
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         getRestTestHelper().setUseSsl(true);

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java Wed Mar 12 13:19:29 2014
@@ -30,6 +30,13 @@ import org.apache.qpid.server.model.Exch
 
 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 Qp
     {
         @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);

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java Wed Mar 12 13:19:29 2014
@@ -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
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
         Map<String, Object> anonymousAuthProviderAttributes = new HashMap<String, Object>();

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java Wed Mar 12 13:19:29 2014
@@ -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
     }
 
     @Override
-    protected void customizeConfiguration() throws ConfigurationException, IOException
+    protected void customizeConfiguration() throws IOException
     {
         super.customizeConfiguration();
 



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