diff options
Diffstat (limited to 'qpid/java/broker/src')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerOptions.java | 2 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/resources/initial-config.json (renamed from qpid/java/broker/src/main/resources/initial-store.json) | 10 |
2 files changed, 6 insertions, 6 deletions
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", |