qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1438107 [3/3] - in /qpid/branches/java-broker-config-qpid-4390/qpid/java: ./ bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ broker-plugins/management-http...
Date Thu, 24 Jan 2013 17:55:21 GMT
Added: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1438107&view=auto
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (added)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Thu Jan 24 17:55:19 2013
@@ -0,0 +1,217 @@
+/*
+ *
+ * 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.test.utils;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+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.store.JsonConfigurationEntryStore;
+import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.Plugin;
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.UUIDGenerator;
+import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.plugin.PluginFactory;
+
+public class TestBrokerConfiguration
+{
+    public static final String ENTRY_NAME_HTTP_PORT = "http";
+    public static final String ENTRY_NAME_AMQP_PORT = "amqp";
+    public static final String ENTRY_NAME_RMI_PORT = "rmi";
+    public static final String ENTRY_NAME_JMX_PORT = "jmx";
+    public static final String ENTRY_NAME_VIRTUAL_HOST = "test";
+    public static final String ENTRY_NAME_AUTHENTICATION_PROVIDER = "plain";
+    public static final String ENTRY_NAME_EXTERNAL_PROVIDER = "external";
+    public static final String ENTRY_NAME_SSL_PORT = "sslPort";
+    public static final String ENTRY_NAME_HTTP_MANAGEMENT = "MANAGEMENT-HTTP";
+    public static final String MANAGEMENT_HTTP_PLUGIN_TYPE = "MANAGEMENT-HTTP";
+    public static final String ENTRY_NAME_JMX_MANAGEMENT = "MANAGEMENT-JMX";
+    public static final String MANAGEMENT_JMX_PLUGIN_TYPE = "MANAGEMENT-JMX";
+    public static final String ENTRY_NAME_ANONYMOUS_PROVIDER = "anonymous";
+
+    private JsonConfigurationEntryStore _store;
+
+    public TestBrokerConfiguration(String storeType, String intialStoreLocation)
+    {
+        // TODO: add support for DERBY store
+        _store = new JsonConfigurationEntryStore();
+
+        try
+        {
+            // load the initial store data into our store
+            _store.load(new File(intialStoreLocation).toURI().toURL());
+        }
+        catch (MalformedURLException e)
+        {
+            // ignore
+        }
+    }
+
+    public boolean setBrokerAttribute(String name, Object value)
+    {
+        return setObjectAttribute(_store.getRootEntry(), name, value);
+    }
+
+    public boolean setObjectAttribute(String objectName, String attributeName, Object value)
+    {
+        ConfigurationEntry entry = findObjectByName(objectName);
+        if (entry == null)
+        {
+            return false;
+        }
+        return setObjectAttribute(entry, attributeName, value);
+    }
+
+    public boolean setObjectAttributes(String objectName, Map<String, Object> attributes)
+    {
+        ConfigurationEntry entry = findObjectByName(objectName);
+        if (entry == null)
+        {
+            return false;
+        }
+        return setObjectAttributes(entry, attributes);
+    }
+
+    public boolean save(File configFile)
+    {
+        _store.saveTo(configFile);
+        return true;
+    }
+
+    public UUID[] removeObjectConfiguration(String name)
+    {
+        ConfigurationEntry entry = findObjectByName(name);
+        if (entry != null)
+        {
+            return _store.remove(entry.getId());
+        }
+        return null;
+    }
+
+    public UUID addObjectConfiguration(String name, String type, Map<String, Object> attributes)
+    {
+        UUID id = UUIDGenerator.generateBrokerChildUUID(type, name);
+        addObjectConfiguration(id, type, attributes);
+        return id;
+    }
+
+    public UUID addJmxManagementConfiguration()
+    {
+        Map<String, Object> attributes = new HashMap<String, Object>();
+        attributes.put(PluginFactory.PLUGIN_TYPE, MANAGEMENT_JMX_PLUGIN_TYPE);
+        attributes.put(Plugin.NAME, ENTRY_NAME_JMX_MANAGEMENT);
+        return addObjectConfiguration(ENTRY_NAME_JMX_MANAGEMENT, Plugin.class.getSimpleName(), attributes);
+    }
+
+    public UUID addHttpManagementConfiguration()
+    {
+        Map<String, Object> attributes = new HashMap<String, Object>();
+        attributes.put(PluginFactory.PLUGIN_TYPE, MANAGEMENT_HTTP_PLUGIN_TYPE);
+        attributes.put(Plugin.NAME, ENTRY_NAME_HTTP_MANAGEMENT);
+        return addObjectConfiguration(ENTRY_NAME_HTTP_MANAGEMENT, Plugin.class.getSimpleName(), attributes);
+    }
+
+    public UUID addPortConfiguration(Map<String, Object> attributes)
+    {
+        String name = (String) attributes.get(Port.NAME);
+        return addObjectConfiguration(name, Port.class.getSimpleName(), attributes);
+    }
+
+    public UUID addHostConfiguration(Map<String, Object> attributes)
+    {
+        String name = (String) attributes.get(VirtualHost.NAME);
+        return addObjectConfiguration(name, VirtualHost.class.getSimpleName(), attributes);
+    }
+
+    public UUID addAuthenticationProviderConfiguration(Map<String, Object> attributes)
+    {
+        String name = (String) attributes.get(AuthenticationProvider.NAME);
+        return addObjectConfiguration(name, AuthenticationProvider.class.getSimpleName(), attributes);
+    }
+
+    private boolean setObjectAttributes(ConfigurationEntry entry, Map<String, Object> attributes)
+    {
+        Map<String, Object> newAttributes = new HashMap<String, Object>(entry.getAttributes());
+        newAttributes.putAll(attributes);
+        ConfigurationEntry newEntry = new ConfigurationEntry(entry.getId(), entry.getType(), newAttributes,
+                entry.getChildrenIds(), _store);
+        _store.save(newEntry);
+        return true;
+    }
+
+    private ConfigurationEntry findObjectByName(String objectName)
+    {
+        ConfigurationEntry root = _store.getRootEntry();
+        return findObjectByName(root, objectName);
+    }
+
+    private ConfigurationEntry findObjectByName(ConfigurationEntry entry, String objectName)
+    {
+        Map<String, Object> attributes = entry.getAttributes();
+        if (attributes != null)
+        {
+            String name = (String) attributes.get("name");
+            if (objectName.equals(name))
+            {
+                return entry;
+            }
+        }
+        Set<UUID> childrenIds = entry.getChildrenIds();
+        for (UUID uuid : childrenIds)
+        {
+            ConfigurationEntry child = _store.getEntry(uuid);
+            ConfigurationEntry result = findObjectByName(child, objectName);
+            if (result != null)
+            {
+                return result;
+            }
+        }
+        return null;
+    }
+
+    private void addObjectConfiguration(UUID id, String type, Map<String, Object> attributes)
+    {
+        ConfigurationEntry entry = new ConfigurationEntry(id, type, attributes, Collections.<UUID> emptySet(), _store);
+        ConfigurationEntry root = _store.getRootEntry();
+        Set<UUID> childrenIds = new HashSet<UUID>(root.getChildrenIds());
+        childrenIds.add(id);
+        ConfigurationEntry newRoot = new ConfigurationEntry(root.getId(), root.getType(), root.getAttributes(), childrenIds,
+                _store);
+        _store.save(newRoot, entry);
+    }
+
+    private boolean setObjectAttribute(ConfigurationEntry entry, String attributeName, Object value)
+    {
+        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(),
+                _store);
+        _store.save(newEntry);
+        return true;
+    }
+}

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java Thu Jan 24 17:55:19 2013
@@ -24,4 +24,7 @@ public interface TestSSLConstants
     String KEYSTORE_PASSWORD = "password";
     String TRUSTSTORE = "test-profiles/test_resources/ssl/java_client_truststore.jks";
     String TRUSTSTORE_PASSWORD = "password";
+
+    String BROKER_KEYSTORE = "test-profiles/test_resources/ssl/java_broker_keystore.jks";
+    String BROKER_KEYSTORE_PASSWORD = "password";
 }

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile Thu Jan 24 17:55:19 2013
@@ -19,11 +19,11 @@
 
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
-broker.config=build/etc/config-systests-bdb.xml
+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
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile Thu Jan 24 17:55:19 2013
@@ -19,15 +19,15 @@
 
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-bdb.xml
+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
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
 broker.version=v0_8
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile Thu Jan 24 17:55:19 2013
@@ -19,15 +19,15 @@
 
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-bdb.xml
+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
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
 broker.version=v0_9_1
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile Thu Jan 24 17:55:19 2013
@@ -19,15 +19,15 @@
 
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-bdb.xml
+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
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
 broker.version=v0_9
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-10.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-10.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
-broker.config=build/etc/config-systests-bdb.xml
+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
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-8.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-8.testprofile Thu Jan 24 17:55:19 2013
@@ -20,15 +20,15 @@
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-bdb.xml
+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
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
 broker.version=v0_8
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9-1.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9-1.testprofile Thu Jan 24 17:55:19 2013
@@ -20,15 +20,15 @@
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-bdb.xml
+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
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
 broker.version=v0_9_1
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9.testprofile Thu Jan 24 17:55:19 2013
@@ -20,15 +20,15 @@
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-bdb.xml
+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
 profile.excludes=JavaExcludes JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
 broker.persistent=true
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
 broker.version=v0_9
 #
 # Do not enable. Allow client to attempt 0-10 and negotiate downwards

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-10.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-10.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@ broker.language=java
 broker.version=v0_10
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
-broker.config=build/etc/config-systests-derby-mem.xml
+qpid.broker_default_amqp_protocol_excludes=AMQP_1_0
+broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby-mem.xml
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-8.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-8.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@ broker.version=v0_8
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby-mem.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+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
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@ broker.version=v0_9_1
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby-mem.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+qpid.broker_default_amqp_protocol_excludes=AMQP_1_0,AMQP_0_10
+broker.virtualhosts-config=${QPID_HOME}/etc/virtualhosts-systests-derby-mem.xml
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-9.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-mem.0-9.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@ broker.version=v0_9
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby-mem.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+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
 messagestorefactory.class.name=org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile Thu Jan 24 17:55:19 2013
@@ -19,11 +19,11 @@
 broker.language=java
 broker.version=v0_10
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
-broker.config=build/etc/config-systests-derby.xml
+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
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile Thu Jan 24 17:55:19 2013
@@ -19,11 +19,11 @@
 broker.version=v0_8
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+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
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile Thu Jan 24 17:55:19 2013
@@ -19,11 +19,11 @@
 broker.version=v0_9_1
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+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
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile Thu Jan 24 17:55:19 2013
@@ -19,11 +19,11 @@
 broker.version=v0_9
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+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
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-10.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-10.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@ broker.language=java
 broker.version=v0_10
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
-broker.config=build/etc/config-systests-derby.xml
+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
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-8.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-8.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@ broker.version=v0_8
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+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
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9-1.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9-1.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@ broker.version=v0_9_1
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+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
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9.testprofile Thu Jan 24 17:55:19 2013
@@ -20,11 +20,11 @@ broker.version=v0_9
 broker.language=java
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=build/etc/config-systests-derby.xml
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+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
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes
 broker.clean.between.tests=true

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile Thu Jan 24 17:55:19 2013
@@ -19,10 +19,11 @@
 broker.version=v0_10
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+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 
 #

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile Thu Jan 24 17:55:19 2013
@@ -19,10 +19,11 @@
 broker.version=v0_8
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+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-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile Thu Jan 24 17:55:19 2013
@@ -19,10 +19,11 @@
 broker.version=v0_9_1
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+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 
 #

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile Thu Jan 24 17:55:19 2013
@@ -19,10 +19,11 @@
 broker.version=v0_9
 broker.language=java
 broker.type=spawned
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+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-qpid-4390/qpid/java/test-profiles/java-mms.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-10.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-10.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-10.testprofile Thu Jan 24 17:55:19 2013
@@ -20,9 +20,10 @@ broker.language=java
 broker.version=v0_10
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+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-qpid-4390/qpid/java/test-profiles/java-mms.0-8.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-8.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-8.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-8.testprofile Thu Jan 24 17:55:19 2013
@@ -20,10 +20,11 @@ broker.language=java
 broker.version=v0_8
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT --exclude-0-9 @PORT --exclude-0-9 @SSL_PORT
+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-qpid-4390/qpid/java/test-profiles/java-mms.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9-1.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9-1.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9-1.testprofile Thu Jan 24 17:55:19 2013
@@ -20,10 +20,11 @@ broker.language=java
 broker.version=v0_9_1
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT
+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 
 #

Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9.testprofile
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9.testprofile?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9.testprofile (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9.testprofile Thu Jan 24 17:55:19 2013
@@ -20,10 +20,11 @@ broker.language=java
 broker.version=v0_9
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
+broker.command=build/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT --exclude-1-0 @PORT --exclude-1-0 @SSL_PORT --exclude-0-9-1 @PORT --exclude-0-9-1 @SSL_PORT
+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-qpid-4390/qpid/java/test-profiles/testprofile.defaults
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/testprofile.defaults?rev=1438107&r1=1438106&r2=1438107&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/testprofile.defaults (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/testprofile.defaults Thu Jan 24 17:55:19 2013
@@ -20,7 +20,7 @@ java.naming.factory.initial=org.apache.q
 java.naming.provider.url=${test.profiles}/test-provider.properties
 
 broker.ready=Listening on TCP
-broker.config=build/etc/config-systests.xml
+broker.config=build/etc/config-systests.json
 messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
 broker.protocol.excludes=
 broker.persistent=false
@@ -40,6 +40,8 @@ log4j.debug=false
 # Keep in sync
 test.port=15672
 test.mport=18999
+test.cport=19099
+test.hport=18080
 #Note : Management will start open second port on: mport + 100 : 19099 
 test.port.ssl=15671
 test.port.alt=25672
@@ -55,5 +57,7 @@ haltonerror=no
 exclude.modules=none
 
 profile.clustered=false
+broker.config-store-type=json
+broker.virtualhosts-config="${QPID_HOME}/etc/virtualhosts-systests.xml"
 
 



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


Mime
View raw message