qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1584365 [15/15] - in /qpid/branches/java-broker-config-store-changes/qpid/java: ./ bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/main/ja...
Date Thu, 03 Apr 2014 19:59:01 GMT
Modified: qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java Thu Apr  3 19:58:53 2014
@@ -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 exte
         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);
         }
     }
 

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Thu Apr  3 19:58:53 2014
@@ -22,7 +22,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -48,8 +47,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;
@@ -66,10 +63,10 @@ import org.apache.qpid.server.BrokerOpti
 import org.apache.qpid.server.configuration.BrokerProperties;
 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.store.MemoryMessageStore;
+import org.apache.qpid.server.store.MessageStore;
+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,15 +98,12 @@ public class QpidBrokerTestCase extends 
     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";
 
     private static final String DEFAULT_INITIAL_CONTEXT = "org.apache.qpid.jndi.PropertiesFileInitialContextFactory";
 
-    private static Map<String, String> supportedStoresClassToTypeMapping = new HashMap<String, String>();
-
     static
     {
         String initialContext = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
@@ -118,17 +112,9 @@ public class QpidBrokerTestCase extends 
         {
             System.setProperty(Context.INITIAL_CONTEXT_FACTORY, DEFAULT_INITIAL_CONTEXT);
         }
-
-        MessageStoreCreator messageStoreCreator = new MessageStoreCreator();
-        Collection<MessageStoreFactory> factories = messageStoreCreator.getFactories();
-        for (MessageStoreFactory messageStoreFactory : factories)
-        {
-            supportedStoresClassToTypeMapping.put(messageStoreFactory.createMessageStore().getClass().getName(), messageStoreFactory.getType());
-        }
     }
 
     // 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";
@@ -249,7 +235,16 @@ public class QpidBrokerTestCase extends 
             configuration.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, Port.PORT, actualPort);
             configuration.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_RMI_PORT, Port.PORT, getManagementPort(actualPort));
             configuration.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_JMX_PORT, Port.PORT, getManagementPort(actualPort) + JMXPORT_CONNECTORSERVER_OFFSET);
+
+            String workDir = System.getProperty("QPID_WORK") + File.separator + TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST + File.separator + actualPort;
+            Map<String, Object> virtualHostSettings = configuration.getObjectAttributes(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
+
+            @SuppressWarnings("unchecked")
+            Map<String, Object> storeSettings = (Map<String, Object>)virtualHostSettings.get(VirtualHost.MESSAGE_STORE_SETTINGS);
+            storeSettings.put(MessageStore.STORE_PATH, workDir);
+            configuration.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHost.MESSAGE_STORE_SETTINGS, storeSettings);
         }
+
         return configuration;
     }
 
@@ -420,7 +415,7 @@ public class QpidBrokerTestCase extends 
     {
         int actualPort = getPort(port);
         TestBrokerConfiguration configuration = getBrokerConfiguration(actualPort);
-        startBroker(actualPort, configuration, _testVirtualhosts, managementMode);
+        startBroker(actualPort, configuration, managementMode);
     }
 
     protected File getBrokerCommandLog4JFile()
@@ -434,16 +429,14 @@ public class QpidBrokerTestCase extends 
         _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)
         {
@@ -451,11 +444,10 @@ public class QpidBrokerTestCase extends 
         }
 
         Set<Integer> portsUsedByBroker = guessAllPortsUsedByBroker(port);
+        String testConfig = saveTestConfiguration(port, testConfiguration);
 
         if (_brokerType.equals(BrokerType.INTERNAL) && !existingInternalBroker())
         {
-            _logger.info("Set test.virtualhosts property to: " + virtualHostsConfig);
-            setSystemProperty(TEST_VIRTUALHOSTS, virtualHostsConfig);
             setSystemProperty(BrokerProperties.PROPERTY_USE_CUSTOM_RMI_SOCKET_FACTORY, "false");
             BrokerOptions options = new BrokerOptions();
 
@@ -549,7 +541,6 @@ public class QpidBrokerTestCase extends 
                 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())
@@ -651,25 +642,6 @@ public class QpidBrokerTestCase extends 
         return _output + File.separator + getTestQueueName() + "-" + port + "-config";
     }
 
-    public String getTestVirtualhostsFile(int port)
-    {
-        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 +687,6 @@ public class QpidBrokerTestCase extends 
         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 +827,34 @@ public class QpidBrokerTestCase extends 
      * 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))
-        {
-            storeDir = "${QPID_WORK}" + File.separator + virtualHostName + "-store";
-        }
-
-        if (storeDir != null)
+        else if (!MemoryMessageStore.TYPE.equals(storeType))
         {
-            _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);
+        Map<String, Object> messageStoreSettings = new HashMap<String, Object>();
+        messageStoreSettings.put(MessageStore.STORE_TYPE, storeType);
+        messageStoreSettings.put(MessageStore.STORE_PATH, storeDir);
+        attributes.put(VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings );
         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 +1389,4 @@ public class QpidBrokerTestCase extends 
         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);
-    }
-
 }

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1582545-1584338
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1576683-1583556

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Thu Apr  3 19:58:53 2014
@@ -20,6 +20,15 @@
  */
 package org.apache.qpid.test.utils;
 
+import org.apache.qpid.server.configuration.ConfigurationEntry;
+import org.apache.qpid.server.configuration.ConfigurationEntryImpl;
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.configuration.store.MemoryConfigurationEntryStore;
+import org.apache.qpid.server.model.*;
+import org.apache.qpid.server.security.access.FileAccessControlProviderConstants;
+import org.apache.qpid.server.security.group.FileGroupManagerFactory;
+import org.apache.qpid.server.store.ConfiguredObjectRecord;
+
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
@@ -29,23 +38,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.qpid.server.configuration.ConfigurationEntry;
-import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.store.MemoryConfigurationEntryStore;
-import org.apache.qpid.server.model.AccessControlProvider;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.GroupProvider;
-import org.apache.qpid.server.model.KeyStore;
-import org.apache.qpid.server.model.Plugin;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.PreferencesProvider;
-import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.model.UUIDGenerator;
-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;
-
 public class TestBrokerConfiguration
 {
     public static final String ENTRY_NAME_HTTP_PORT = "http";
@@ -107,10 +99,36 @@ public class TestBrokerConfiguration
 
     public UUID[] removeObjectConfiguration(String name)
     {
-        ConfigurationEntry entry = findObjectByName(name);
+        final ConfigurationEntry entry = findObjectByName(name);
         if (entry != null)
         {
-            return _store.remove(entry.getId());
+            return _store.remove(new ConfiguredObjectRecord()
+            {
+                @Override
+                public UUID getId()
+                {
+                    return entry.getId();
+                }
+
+                @Override
+                public String getType()
+                {
+                    return entry.getType();
+                }
+
+                @Override
+                public Map<String, Object> getAttributes()
+                {
+                    return entry.getAttributes();
+                }
+
+                @Override
+                public Map<String, ConfiguredObjectRecord> getParents()
+                {
+                    // TODO RG : this should be rectified
+                    return null;
+                }
+            });
         }
         return null;
     }
@@ -125,7 +143,7 @@ public class TestBrokerConfiguration
     public UUID addJmxManagementConfiguration()
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put(PluginFactory.PLUGIN_TYPE, MANAGEMENT_JMX_PLUGIN_TYPE);
+        attributes.put(ConfiguredObject.TYPE, MANAGEMENT_JMX_PLUGIN_TYPE);
         attributes.put(Plugin.NAME, ENTRY_NAME_JMX_MANAGEMENT);
         return addObjectConfiguration(ENTRY_NAME_JMX_MANAGEMENT, Plugin.class.getSimpleName(), attributes);
     }
@@ -133,7 +151,7 @@ public class TestBrokerConfiguration
     public UUID addHttpManagementConfiguration()
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put(PluginFactory.PLUGIN_TYPE, MANAGEMENT_HTTP_PLUGIN_TYPE);
+        attributes.put(ConfiguredObject.TYPE, MANAGEMENT_HTTP_PLUGIN_TYPE);
         attributes.put(Plugin.NAME, ENTRY_NAME_HTTP_MANAGEMENT);
         return addObjectConfiguration(ENTRY_NAME_HTTP_MANAGEMENT, Plugin.class.getSimpleName(), attributes);
     }
@@ -204,7 +222,7 @@ public class TestBrokerConfiguration
     {
         Map<String, Object> newAttributes = new HashMap<String, Object>(entry.getAttributes());
         newAttributes.putAll(attributes);
-        ConfigurationEntry newEntry = new ConfigurationEntry(entry.getId(), entry.getType(), newAttributes,
+        ConfigurationEntry newEntry = new ConfigurationEntryImpl(entry.getId(), entry.getType(), newAttributes,
                 entry.getChildrenIds(), _store);
         _store.save(newEntry);
         return true;
@@ -242,7 +260,7 @@ public class TestBrokerConfiguration
 
     private void addObjectConfiguration(UUID id, String type, Map<String, Object> attributes)
     {
-        ConfigurationEntry entry = new ConfigurationEntry(id, type, attributes, Collections.<UUID> emptySet(), _store);
+        ConfigurationEntry entry = new ConfigurationEntryImpl(id, type, attributes, Collections.<UUID> emptySet(), _store);
         ConfigurationEntry root = _store.getRootEntry();
 
         Map<String, Collection<ConfigurationEntry>> children = root.getChildren();
@@ -251,7 +269,8 @@ public class TestBrokerConfiguration
 
         Set<UUID> childrenIds = new HashSet<UUID>(root.getChildrenIds());
         childrenIds.add(id);
-        ConfigurationEntry newRoot = new ConfigurationEntry(root.getId(), root.getType(), root.getAttributes(), childrenIds,
+        ConfigurationEntry
+                newRoot = new ConfigurationEntryImpl(root.getId(), root.getType(), root.getAttributes(), childrenIds,
                 _store);
         _store.save(newRoot, entry);
     }
@@ -280,7 +299,8 @@ public class TestBrokerConfiguration
     {
         Map<String, Object> attributes = new HashMap<String, Object>(entry.getAttributes());
         attributes.put(attributeName, value);
-        ConfigurationEntry newEntry = new ConfigurationEntry(entry.getId(), entry.getType(), attributes, entry.getChildrenIds(),
+        ConfigurationEntry
+                newEntry = new ConfigurationEntryImpl(entry.getId(), entry.getType(), attributes, entry.getChildrenIds(),
                 _store);
         _store.save(newEntry);
         return true;
@@ -298,14 +318,19 @@ public class TestBrokerConfiguration
 
     public void addPreferencesProviderConfiguration(String authenticationProvider, Map<String, Object> attributes)
     {
-        ConfigurationEntry pp = new ConfigurationEntry(UUIDGenerator.generateRandomUUID(),
+        ConfigurationEntry pp = new ConfigurationEntryImpl(UUIDGenerator.generateRandomUUID(),
                 PreferencesProvider.class.getSimpleName(), attributes, Collections.<UUID> emptySet(), _store);
         ConfigurationEntry ap = findObjectByName(authenticationProvider);
         Set<UUID> children = new HashSet<UUID>();
         children.addAll(ap.getChildrenIds());
         children.add(pp.getId());
-        ConfigurationEntry newAp = new ConfigurationEntry(ap.getId(), ap.getType(), ap.getAttributes(), children, _store);
+        ConfigurationEntry
+                newAp = new ConfigurationEntryImpl(ap.getId(), ap.getType(), ap.getAttributes(), children, _store);
         _store.save(newAp, pp);
     }
 
+    public Map<String, Object> getObjectAttributes(String name)
+    {
+        return findObjectByName(name).getAttributes();
+    }
 }

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory Thu Apr  3 19:58:53 2014
@@ -17,3 +17,4 @@
 # under the License.
 #
 org.apache.qpid.server.store.SlowMessageStoreFactory
+org.apache.qpid.server.store.QuotaMessageStoreFactory

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/CPPExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/CPPExcludes?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/CPPExcludes (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/CPPExcludes Thu Apr  3 19:58:53 2014
@@ -82,6 +82,7 @@ org.apache.qpid.server.AlertingTest#*
 
 // The C++ server has a totally different persistence mechanism
 org.apache.qpid.server.store.PersistentStoreTest#*
+org.apache.qpid.server.store.SplitStoreTest#*
 
 // These tests are for the Java broker persistent store modules
 org.apache.qpid.server.store.MessageStoreTest#testMessagePersistence

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1582545-1584338
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/CPPExcludes:r1576683-1583556

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/JavaTransientExcludes
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/JavaTransientExcludes?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/JavaTransientExcludes (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/JavaTransientExcludes Thu Apr  3 19:58:53 2014
@@ -20,6 +20,7 @@
 //These tests require a persistent store
 org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
 org.apache.qpid.server.store.PersistentStoreTest#*
+org.apache.qpid.server.store.SplitStoreTest#*
 org.apache.qpid.server.logging.AlertingTest#testAlertingReallyWorksWithRestart
 org.apache.qpid.server.logging.AlertingTest#testAlertingReallyWorksWithChanges
 org.apache.qpid.test.unit.ack.ClientAcknowledgeTest#testClientAckWithLargeFlusherPeriod

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/JavaTransientExcludes:r1576683-1583556
  Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1582545-1584338

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/cpp.excludes
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/cpp.excludes?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/cpp.excludes (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/cpp.excludes Thu Apr  3 19:58:53 2014
@@ -27,3 +27,5 @@ org.apache.qpid.test.client.message.JMSD
 // This test requires a broker capable of 0-8/9 and 0-10
 org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend
 
+//BDB System Tests
+org.apache.qpid.server.store.berkeleydb.*

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile Thu Apr  3 19:58:53 2014
@@ -24,8 +24,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile Thu Apr  3 19:58:53 2014
@@ -24,8 +24,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.version=v0_8
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile Thu Apr  3 19:58:53 2014
@@ -24,8 +24,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.version=v0_9_1
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1582545-1584338
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1576683-1583556

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile Thu Apr  3 19:58:53 2014
@@ -24,8 +24,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.version=v0_9
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-10.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-10.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-8.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-8.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -35,4 +34,3 @@ broker.version=v0_8
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9-1.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9-1.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -35,4 +34,3 @@ broker.version=v0_9_1
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1582545-1584338
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1576683-1583556

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-bdb.0-9.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-bdb.xml
-messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
+messagestore.type=BDB
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -35,4 +34,3 @@ broker.version=v0_9
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-10.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-10.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby-mem.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-8.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-8.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby-mem.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby-mem.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-9.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-mem.0-9.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby-mem.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile Thu Apr  3 19:58:53 2014
@@ -24,8 +24,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile Thu Apr  3 19:58:53 2014
@@ -24,8 +24,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -33,4 +32,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile Thu Apr  3 19:58:53 2014
@@ -24,8 +24,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -33,4 +32,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1582545-1584338
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1576683-1583556

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile Thu Apr  3 19:58:53 2014
@@ -24,8 +24,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -33,4 +32,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-10.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-10.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
 broker.persistent=true

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-8.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-8.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-8
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9-1.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9-1.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-91
-

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1576683-1583556
  Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1582545-1584338

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-dby.0-9.testprofile Thu Apr  3 19:58:53 2014
@@ -25,8 +25,7 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby.xml
-messagestore.class.name=org.apache.qpid.server.store.derby.DerbyMessageStore
+messagestore.type=DERBY
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true
 broker.persistent=true
@@ -34,4 +33,3 @@ broker.persistent=true
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #
 #qpid.amqp.version=0-9
-

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile Thu Apr  3 19:58:53 2014
@@ -24,7 +24,6 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards 
 #

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1576683-1583556
  Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1582545-1584338

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile Thu Apr  3 19:58:53 2014
@@ -24,7 +24,6 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile Thu Apr  3 19:58:53 2014
@@ -24,7 +24,6 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards 
 #

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1582545-1584338
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1576683-1583556

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile Thu Apr  3 19:58:53 2014
@@ -24,7 +24,6 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-10.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-10.testprofile Thu Apr  3 19:58:53 2014
@@ -25,6 +25,5 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 
 profile.excludes=JavaTransientExcludes Java010Excludes

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-8.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-8.testprofile Thu Apr  3 19:58:53 2014
@@ -25,7 +25,6 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1,AMQP_0_9
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9-1.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9-1.testprofile Thu Apr  3 19:58:53 2014
@@ -25,7 +25,6 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards 
 #

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1582545-1584338
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1576683-1583556

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9.testprofile?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/java-mms.0-9.testprofile Thu Apr  3 19:58:53 2014
@@ -25,7 +25,6 @@ broker.command.windows=build${file.separ
 broker.ready=BRK-1004
 broker.stopped=Exception
 qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10,AMQP_0_9_1
-broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests.xml
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards
 #

Modified: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/testprofile.defaults
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/testprofile.defaults?rev=1584365&r1=1584364&r2=1584365&view=diff
==============================================================================
--- qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/testprofile.defaults (original)
+++ qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/testprofile.defaults Thu Apr  3 19:58:53 2014
@@ -21,7 +21,7 @@ java.naming.provider.url=${test.profiles
 
 broker.ready=Listening on TCP
 broker.config=build/etc/config-systests.json
-messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
+messagestore.type=Memory
 broker.protocol.excludes=
 broker.persistent=false
 
@@ -63,6 +63,6 @@ exclude.modules=none
 
 profile.clustered=false
 broker.config-store-type=json
-broker.virtualhosts-config="${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests.xml"
+
 
 

Propchange: qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1582545-1584338
  Merged /qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/testprofile.defaults:r1576683-1583556



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


Mime
View raw message