QPID-4390, QPID-4743: configuration improvements from review

- Rename the embedded initial config file to initial-config.json
- Ensure the default vhost store path is unique by including its type and vhost name.
- Rename ports to remove the port number.
- Remove leftover systests config.xml file.
- Stop shipping unused virtualhosts.xml in example config to reduce confusion

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

4 files changed, 6 insertions, 199 deletions

diff --git a/qpid/java/broker/etc/virtualhosts.xml b/qpid/java/broker/etc/virtualhosts.xml
deleted file mode 100644
index 0f7cc7866f..0000000000
--- a/qpid/java/broker/etc/virtualhosts.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?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>
-                <!--<class>org.apache.qpid.server.store.derby.DerbyMessageStore</class>
-                <environment-path>${QPID_WORK}/derbystore</environment-path>-->
-            </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>
-                <!--<class>org.apache.qpid.server.store.derby.DerbyMessageStore</class>
-                <environment-path>${QPID_WORK}/derbystore</environment-path>-->
-            </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>
-                <!--<class>org.apache.qpid.server.store.derby.DerbyMessageStore</class>
-                <environment-path>${QPID_WORK}/derbystore</environment-path>-->
-            </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/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
index 48e6351942..8a8f7606a2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
@@ -33,7 +33,7 @@ public class BrokerOptions
     public static final String DEFAULT_CONFIG_NAME_PREFIX = "config";
     public static final String DEFAULT_LOG_CONFIG_FILE = "etc/log4j.xml";
     public static final String DEFAULT_INITIAL_CONFIG_LOCATION =
-        BrokerOptions.class.getClassLoader().getResource("initial-store.json").toExternalForm();
+        BrokerOptions.class.getClassLoader().getResource(DEFAULT_INITIAL_CONFIG_NAME).toExternalForm();
 
     private String _logConfigFile;
     private Integer _logWatchFrequency = 0;
diff --git a/qpid/java/broker/src/main/resources/initial-store.json b/qpid/java/broker/src/main/resources/initial-config.json
index 7e73772d6d..44f8fed789 100644
--- a/qpid/java/broker/src/main/resources/initial-store.json
+++ b/qpid/java/broker/src/main/resources/initial-config.json
@@ -29,25 +29,25 @@
     "path" : "${QPID_HOME}/etc/passwd"
   } ],
   "ports" : [  {
-    "name" : "5672-AMQP",
+    "name" : "AMQP",
     "port" : 5672
   }, {
-    "name" : "8080-HTTP",
+    "name" : "HTTP",
     "port" : 8080,
     "protocols" : [ "HTTP" ]
   }, {
-    "name" : "8999-RMI",
+    "name" : "RMI_REGISTRY",
     "port" : 8999,
     "protocols" : [ "RMI" ]
   }, {
-    "name" : "9099-JMX_RMI",
+    "name" : "JMX_CONNECTOR",
     "port" : 9099,
     "protocols" : [ "JMX_RMI" ]
   }],
   "virtualhosts" : [ {
     "name" : "default",
     "storeType" : "DERBY",
-    "storePath" : "${QPID_WORK}/store"
+    "storePath" : "${QPID_WORK}/derbystore/default"
   } ],
   "plugins" : [ {
     "pluginType" : "MANAGEMENT-HTTP",
diff --git a/qpid/java/systests/etc/config-systests.xml b/qpid/java/systests/etc/config-systests.xml
deleted file mode 100644
index 958aafc9da..0000000000
--- a/qpid/java/systests/etc/config-systests.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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.
- -
- -->
-<configuration>
-    <system/>
-    <override>
-        <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
-        <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
-    </override>
-</configuration>