From 6fa7bd72f94ed7f71d5b0c58883dcac180ea67e5 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sun, 13 Apr 2014 08:49:34 +0000 Subject: QPID-5687 : [Java Broker] fix the initial config store to use "type" not "pluginType", add a test that checks the broker will startup with no config store. Change the handling of ${amqp.qpid_port} and friends to allow setting through system properties git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586938 13f79535-47bb-0310-9956-ffa450edef68 --- .../broker/src/test/java/org/apache/qpid/server/MainTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qpid/java/broker') diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java index f3b1749808..c6d68843b7 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java @@ -203,20 +203,20 @@ public class MainTest extends QpidTestCase { //short name String newPort = "12345"; - BrokerOptions options = startDummyMain("-prop name=value -prop " + BrokerOptions.QPID_AMQP_PORT + "=" + newPort); + BrokerOptions options = startDummyMain("-prop name=value -prop " + org.apache.qpid.server.model.Broker.QPID_AMQP_PORT + "=" + newPort); Map props = options.getConfigProperties(); - assertEquals(newPort, props.get(BrokerOptions.QPID_AMQP_PORT)); + assertEquals(newPort, props.get(org.apache.qpid.server.model.Broker.QPID_AMQP_PORT)); assertEquals("value", props.get("name")); //long name newPort = "678910"; - options = startDummyMain("--config-property name2=value2 --config-property " + BrokerOptions.QPID_AMQP_PORT + "=" + newPort); + options = startDummyMain("--config-property name2=value2 --config-property " + org.apache.qpid.server.model.Broker.QPID_AMQP_PORT + "=" + newPort); props = options.getConfigProperties(); - assertEquals(newPort, props.get(BrokerOptions.QPID_AMQP_PORT)); + assertEquals(newPort, props.get(org.apache.qpid.server.model.Broker.QPID_AMQP_PORT)); assertEquals("value2", props.get("name2")); } -- cgit v1.2.1