summaryrefslogtreecommitdiff
path: root/java/broker
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2013-04-19 15:49:28 +0000
committerAlex Rudyy <orudyy@apache.org>2013-04-19 15:49:28 +0000
commit70b92e596a47ab1ba5f9f3432b3d6025a4771bde (patch)
tree07c44df8cfccf9b2239846072f3c9813502ebcb9 /java/broker
parent8ef67fe26a0c84e4322ac4ad70f2f6391a5491e7 (diff)
downloadqpid-python-70b92e596a47ab1ba5f9f3432b3d6025a4771bde.tar.gz
QPID-4754: Make broker name editable and show it in the browser title
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1469914 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
-rw-r--r--java/broker/src/main/resources/initial-config.json2
-rw-r--r--java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/broker/src/main/resources/initial-config.json b/java/broker/src/main/resources/initial-config.json
index fde3c3a96e..f8b724d351 100644
--- a/java/broker/src/main/resources/initial-config.json
+++ b/java/broker/src/main/resources/initial-config.json
@@ -19,7 +19,7 @@
*
*/
{
- "name": "QpidBroker",
+ "name": "Broker",
"storeVersion": 1,
"defaultVirtualHost" : "default",
"authenticationproviders" : [ {
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
index 47e6849c01..7555a5632c 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
@@ -97,7 +97,7 @@ public class BrokerConfigurationStoreCreatorTest extends QpidTestCase
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
- String defaultBrokerName = "QpidBroker";
+ String defaultBrokerName = "Broker";
String testBrokerName = getTestName();
Map<String, Object> brokerObjectMap = new HashMap<String, Object>();