From 16b1e210141d34ad4ce7b36c723b5ecbce7ea474 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 15 Apr 2013 11:28:34 +0000 Subject: 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 --- qpid/java/broker/etc/virtualhosts.xml | 165 --------------------- .../java/org/apache/qpid/server/BrokerOptions.java | 2 +- .../broker/src/main/resources/initial-config.json | 59 ++++++++ .../broker/src/main/resources/initial-store.json | 59 -------- qpid/java/systests/etc/config-systests.xml | 28 ---- 5 files changed, 60 insertions(+), 253 deletions(-) delete mode 100644 qpid/java/broker/etc/virtualhosts.xml create mode 100644 qpid/java/broker/src/main/resources/initial-config.json delete mode 100644 qpid/java/broker/src/main/resources/initial-store.json delete mode 100644 qpid/java/systests/etc/config-systests.xml (limited to 'qpid/java') 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 @@ - - - - test - - localhost - - - org.apache.qpid.server.store.MemoryMessageStore - - - - - 2 - 20000 - - - - - direct - test.direct - true - - - topic - test.topic - - - - amq.direct - 4235264 - - 2117632 - - 600000 - - 50 - - - - queue - - - ping - - - test-queue - - test.direct - true - - - - test-ping - - test.direct - - - - - - - - - - development - - - org.apache.qpid.server.store.MemoryMessageStore - - - - - 30000 - 50 - - queue - - amq.direct - 4235264 - - 2117632 - - 600000 - - - - - ping - - amq.direct - 4235264 - - 2117632 - - 600000 - - - - - - - - test - - - org.apache.qpid.server.store.MemoryMessageStore - - - - - 30000 - 50 - - queue - - amq.direct - 4235264 - - 2117632 - - 600000 - - - - - ping - - amq.direct - 4235264 - - 2117632 - - 600000 - - - - - - - - - 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-config.json b/qpid/java/broker/src/main/resources/initial-config.json new file mode 100644 index 0000000000..44f8fed789 --- /dev/null +++ b/qpid/java/broker/src/main/resources/initial-config.json @@ -0,0 +1,59 @@ +/* + * + * 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. + * + */ +{ + "name": "QpidBroker", + "storeVersion": 1, + "defaultAuthenticationProvider" : "passwordFile", + "defaultVirtualHost" : "default", + "authenticationproviders" : [ { + "name" : "passwordFile", + "type" : "PlainPasswordFile", + "path" : "${QPID_HOME}/etc/passwd" + } ], + "ports" : [ { + "name" : "AMQP", + "port" : 5672 + }, { + "name" : "HTTP", + "port" : 8080, + "protocols" : [ "HTTP" ] + }, { + "name" : "RMI_REGISTRY", + "port" : 8999, + "protocols" : [ "RMI" ] + }, { + "name" : "JMX_CONNECTOR", + "port" : 9099, + "protocols" : [ "JMX_RMI" ] + }], + "virtualhosts" : [ { + "name" : "default", + "storeType" : "DERBY", + "storePath" : "${QPID_WORK}/derbystore/default" + } ], + "plugins" : [ { + "pluginType" : "MANAGEMENT-HTTP", + "name" : "httpManagement" + }, { + "pluginType" : "MANAGEMENT-JMX", + "name" : "jmxManagement" + } ] +} \ No newline at end of file diff --git a/qpid/java/broker/src/main/resources/initial-store.json b/qpid/java/broker/src/main/resources/initial-store.json deleted file mode 100644 index 7e73772d6d..0000000000 --- a/qpid/java/broker/src/main/resources/initial-store.json +++ /dev/null @@ -1,59 +0,0 @@ -/* - * - * 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. - * - */ -{ - "name": "QpidBroker", - "storeVersion": 1, - "defaultAuthenticationProvider" : "passwordFile", - "defaultVirtualHost" : "default", - "authenticationproviders" : [ { - "name" : "passwordFile", - "type" : "PlainPasswordFile", - "path" : "${QPID_HOME}/etc/passwd" - } ], - "ports" : [ { - "name" : "5672-AMQP", - "port" : 5672 - }, { - "name" : "8080-HTTP", - "port" : 8080, - "protocols" : [ "HTTP" ] - }, { - "name" : "8999-RMI", - "port" : 8999, - "protocols" : [ "RMI" ] - }, { - "name" : "9099-JMX_RMI", - "port" : 9099, - "protocols" : [ "JMX_RMI" ] - }], - "virtualhosts" : [ { - "name" : "default", - "storeType" : "DERBY", - "storePath" : "${QPID_WORK}/store" - } ], - "plugins" : [ { - "pluginType" : "MANAGEMENT-HTTP", - "name" : "httpManagement" - }, { - "pluginType" : "MANAGEMENT-JMX", - "name" : "jmxManagement" - } ] -} \ No newline at end of file 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 @@ - - - - - - - - - -- cgit v1.2.1