QPID-4029: update the systest configuration to be self-contained, separating the tests config from the example config files to allow modifiying them in isolation

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1344276 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 221 insertions, 10 deletions

diff --git a/qpid/java/systests/etc/config-systests-bdb.xml b/qpid/java/systests/etc/config-systests-bdb.xml
index 9364006fcc..6b17b564a8 100644
--- a/qpid/java/systests/etc/config-systests-bdb.xml
+++ b/qpid/java/systests/etc/config-systests-bdb.xml
@@ -25,6 +25,5 @@
         <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-bdb-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
-        <xml fileName="${QPID_HOME}/etc/config.xml"/>
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/config-systests-derby-mem.xml b/qpid/java/systests/etc/config-systests-derby-mem.xml
index 1e4b19e48f..8e40df986e 100644
--- a/qpid/java/systests/etc/config-systests-derby-mem.xml
+++ b/qpid/java/systests/etc/config-systests-derby-mem.xml
@@ -25,6 +25,5 @@
         <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-derby-mem-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
-        <xml fileName="${QPID_HOME}/etc/config.xml"/>
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/config-systests-derby.xml b/qpid/java/systests/etc/config-systests-derby.xml
index 303154d8f0..21a7a8cabe 100644
--- a/qpid/java/systests/etc/config-systests-derby.xml
+++ b/qpid/java/systests/etc/config-systests-derby.xml
@@ -25,6 +25,5 @@
         <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-derby-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
-        <xml fileName="${QPID_HOME}/etc/config.xml"/>
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/config-systests-firewall.xml b/qpid/java/systests/etc/config-systests-firewall.xml
index c73ac6a687..a884a39614 100644
--- a/qpid/java/systests/etc/config-systests-firewall.xml
+++ b/qpid/java/systests/etc/config-systests-firewall.xml
@@ -26,6 +26,5 @@
         <xml fileName="${QPID_FIREWALL_CONFIG_SETTINGS}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-firewall-settings.xml"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
-        <xml fileName="${QPID_HOME}/etc/config.xml"/>                
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/config-systests-settings.xml b/qpid/java/systests/etc/config-systests-settings.xml
index 88533400d3..8fad3b8a68 100644
--- a/qpid/java/systests/etc/config-systests-settings.xml
+++ b/qpid/java/systests/etc/config-systests-settings.xml
@@ -20,7 +20,17 @@
  -
  -->
 <broker>
+    <prefix>${QPID_HOME}</prefix>
+    <work>${QPID_WORK}</work>
+    <conf>${prefix}/etc</conf>
+
+    <plugin-directory>${QPID_HOME}/lib/plugins</plugin-directory>
+    <cache-directory>${QPID_WORK}/cache</cache-directory>
+
     <connector>
+        <!-- To enable SSL edit the keystorePath and keystorePassword
+	     and set enabled to true.
+             To disable Non-SSL port set sslOnly to true -->
         <ssl>
             <port>15671</port>
             <enabled>false</enabled>
@@ -28,14 +38,63 @@
             <keyStorePath>${QPID_HOME}/../test-profiles/test_resources/ssl/java_broker_keystore.jks</keyStorePath>
             <keyStorePassword>password</keyStorePassword>
         </ssl>
+        <port>5672</port>
+        <socketReceiveBuffer>262144</socketReceiveBuffer>
+        <socketSendBuffer>262144</socketSendBuffer>
     </connector>
     <management>
         <enabled>false</enabled>
+        <jmxport>
+            <registryServer>8999</registryServer>
+            <!--
+             If unspecified, connectorServer defaults to 100 + registryServer port.
+            <connectorServer>9099</connectionServer>
+            -->
+        </jmxport>
         <ssl>
             <enabled>false</enabled>
             <keyStorePath>${QPID_HOME}/../test-profiles/test_resources/ssl/java_broker_keystore.jks</keyStorePath>
             <keyStorePassword>password</keyStorePassword>
         </ssl>
     </management>
+    <advanced>
+        <framesize>65535</framesize>
+        <locale>en_US</locale>
+    </advanced>
+
+    <security>
+        <pd-auth-manager>
+            <principal-database>
+                <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class>
+                <attributes>
+                    <attribute>
+                        <name>passwordFile</name>
+                        <value>${conf}/passwd</value>
+                    </attribute>
+                </attributes>
+            </principal-database>
+        </pd-auth-manager>
+
+        <!-- By default, all authenticated users have permissions to perform all actions -->
+
+        <!-- ACL Example
+             This example illustrates securing the both Management (JMX) and Messaging.
+        <acl>${conf}/broker_example.acl</acl>
+        -->
+
+        <msg-auth>false</msg-auth>
+    </security>
+
     <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests.xml</virtualhosts>
+
+    <heartbeat>
+        <delay>0</delay>
+        <timeoutFactor>2.0</timeoutFactor>
+    </heartbeat>
+    <queue>
+        <auto_register>true</auto_register>
+    </queue>
+
+    <status-updates>ON</status-updates>
+
 </broker>
diff --git a/qpid/java/systests/etc/config-systests.xml b/qpid/java/systests/etc/config-systests.xml
index 0e8f2803e3..958aafc9da 100644
--- a/qpid/java/systests/etc/config-systests.xml
+++ b/qpid/java/systests/etc/config-systests.xml
@@ -24,6 +24,5 @@
     <override>
         <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
-        <xml fileName="${QPID_HOME}/etc/config.xml"/>                
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/virtualhosts-systests-bdb.xml b/qpid/java/systests/etc/virtualhosts-systests-bdb.xml
index 367fee65ac..a797f3dbb5 100644
--- a/qpid/java/systests/etc/virtualhosts-systests-bdb.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-bdb.xml
@@ -24,6 +24,6 @@
     <override>
         <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-bdb-settings.xml"/>
-        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-settings.xml"/>
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/virtualhosts-systests-derby-mem.xml b/qpid/java/systests/etc/virtualhosts-systests-derby-mem.xml
index 845b8dfafa..5fd8762ec9 100644
--- a/qpid/java/systests/etc/virtualhosts-systests-derby-mem.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-derby-mem.xml
@@ -24,6 +24,6 @@
     <override>
         <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-derby-mem-settings.xml"/>
-        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-settings.xml"/>
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/virtualhosts-systests-derby.xml b/qpid/java/systests/etc/virtualhosts-systests-derby.xml
index 3745100e1f..3e7034ad94 100644
--- a/qpid/java/systests/etc/virtualhosts-systests-derby.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-derby.xml
@@ -24,6 +24,6 @@
     <override>
         <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
         <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-derby-settings.xml"/>
-        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
+        <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-settings.xml"/>
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/virtualhosts-systests-firewall.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
index c5c6a86d7c..17860e4075 100644
--- a/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
@@ -24,6 +24,6 @@
     <override>
         <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
         <xml fileName="${QPID_FIREWALL_VIRTUALHOSTS_SETTINGS}" optional="true"/>
-        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>                
+        <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-settings.xml"/>
     </override>
 </configuration>
diff --git a/qpid/java/systests/etc/virtualhosts-systests-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-settings.xml
new file mode 100644
index 0000000000..0ec16b31ef
--- /dev/null
+++ b/qpid/java/systests/etc/virtualhosts-systests-settings.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<virtualhosts>
+    <default>test</default>
+    <virtualhost>
+        <name>localhost</name>
+        <localhost>
+            <store>
+                <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+            </store>
+
+            <housekeeping>
+                <threadCount>2</threadCount>
+                <checkPeriod>20000</checkPeriod>
+            </housekeeping>
+
+            <exchanges>
+                <exchange>
+                    <type>direct</type>
+                    <name>test.direct</name>
+                    <durable>true</durable>
+                </exchange>
+                <exchange>
+                    <type>topic</type>
+                    <name>test.topic</name>
+                </exchange>
+            </exchanges>
+            <queues>
+                <exchange>amq.direct</exchange>
+                <maximumQueueDepth>4235264</maximumQueueDepth>
+                <!-- 4Mb -->
+                <maximumMessageSize>2117632</maximumMessageSize>
+                <!-- 2Mb -->
+                <maximumMessageAge>600000</maximumMessageAge>
+                <!-- 10 mins -->
+                <maximumMessageCount>50</maximumMessageCount>
+                <!-- 50 messages -->
+
+                <queue>
+                    <name>queue</name>
+                </queue>
+                <queue>
+                    <name>ping</name>
+                </queue>
+                <queue>
+                    <name>test-queue</name>
+                    <test-queue>
+                        <exchange>test.direct</exchange>
+                        <durable>true</durable>
+                    </test-queue>
+                </queue>
+                <queue>
+                    <name>test-ping</name>
+                    <test-ping>
+                        <exchange>test.direct</exchange>
+                    </test-ping>
+                </queue>
+
+            </queues>
+        </localhost>
+    </virtualhost>
+
+
+    <virtualhost>
+        <name>development</name>
+        <development>
+            <store>
+                <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+            </store>
+
+            <queues>
+                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
+                <maximumMessageCount>50</maximumMessageCount>
+                <queue>
+                    <name>queue</name>
+                    <queue>
+                        <exchange>amq.direct</exchange>
+                        <maximumQueueDepth>4235264</maximumQueueDepth>
+                        <!-- 4Mb -->
+                        <maximumMessageSize>2117632</maximumMessageSize>
+                        <!-- 2Mb -->
+                        <maximumMessageAge>600000</maximumMessageAge>
+                        <!-- 10 mins -->
+                    </queue>
+                </queue>
+                <queue>
+                    <name>ping</name>
+                    <ping>
+                        <exchange>amq.direct</exchange>
+                        <maximumQueueDepth>4235264</maximumQueueDepth>
+                        <!-- 4Mb -->
+                        <maximumMessageSize>2117632</maximumMessageSize>
+                        <!-- 2Mb -->
+                        <maximumMessageAge>600000</maximumMessageAge>
+                        <!-- 10 mins -->
+                    </ping>
+                </queue>
+            </queues>
+        </development>
+    </virtualhost>
+    <virtualhost>
+        <name>test</name>
+        <test>
+            <store>
+                <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+            </store>
+
+            <queues>
+                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
+                <maximumMessageCount>50</maximumMessageCount>
+                <queue>
+                    <name>queue</name>
+                    <queue>
+                        <exchange>amq.direct</exchange>
+                        <maximumQueueDepth>4235264</maximumQueueDepth>
+                        <!-- 4Mb -->
+                        <maximumMessageSize>2117632</maximumMessageSize>
+                        <!-- 2Mb -->
+                        <maximumMessageAge>600000</maximumMessageAge>
+                        <!-- 10 mins -->
+                    </queue>
+                </queue>
+                <queue>
+                    <name>ping</name>
+                    <ping>
+                        <exchange>amq.direct</exchange>
+                        <maximumQueueDepth>4235264</maximumQueueDepth>
+                        <!-- 4Mb -->
+                        <maximumMessageSize>2117632</maximumMessageSize>
+                        <!-- 2Mb -->
+                        <maximumMessageAge>600000</maximumMessageAge>
+                        <!-- 10 mins -->
+                    </ping>
+                </queue>
+            </queues>
+        </test>
+    </virtualhost>
+</virtualhosts>
diff --git a/qpid/java/systests/etc/virtualhosts-systests.xml b/qpid/java/systests/etc/virtualhosts-systests.xml
index d6aeefac72..d2bdad3cc6 100644
--- a/qpid/java/systests/etc/virtualhosts-systests.xml
+++ b/qpid/java/systests/etc/virtualhosts-systests.xml
@@ -23,6 +23,6 @@
     <system/>
     <override>
         <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
-        <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>                
+        <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-settings.xml"/>
     </override>
 </configuration>