svn commit: r1467938 - in /qpid/trunk/qpid/java: broker/etc/ broker/src/main/java/org/apache/qpid/server/ broker/src/main/resources/ systests/etc/

[ro...@apache.org]

Author: robbie
Date: Mon Apr 15 11:28:34 2013
New Revision: 1467938

URL: http://svn.apache.org/r1467938
Log:
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

Added:
    qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json
      - copied, changed from r1467932, qpid/trunk/qpid/java/broker/src/main/resources/initial-store.json
Removed:
    qpid/trunk/qpid/java/broker/etc/virtualhosts.xml
    qpid/trunk/qpid/java/broker/src/main/resources/initial-store.json
    qpid/trunk/qpid/java/systests/etc/config-systests.xml
Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1467938&r1=1467937&r2=1467938&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java Mon Apr 15 11:28:34 2013
@@ -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;

Copied: qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json (from r1467932, qpid/trunk/qpid/java/broker/src/main/resources/initial-store.json)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json?p2=qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json&p1=qpid/trunk/qpid/java/broker/src/main/resources/initial-store.json&r1=1467932&r2=1467938&rev=1467938&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/resources/initial-store.json (original)
+++ qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json Mon Apr 15 11:28:34 2013
@@ -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",



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