QPID-4754: Make broker name editable and show it in the browser title

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1469914 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 6 insertions, 6 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index 3e0fe71ce7..73936b7b3c 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
@@ -58,7 +58,6 @@ define(["dojo/_base/xhr",
                         return new dijit.form.ValidationTextBox({
                           required: true,
                           value: brokerData.name,
-                          disabled: true,
                           label: "Name*:",
                           name: "name"})
                     }
@@ -639,6 +638,7 @@ define(["dojo/_base/xhr",
            {
                this.showReadOnlyAttributes();
                var brokerData = this.brokerData;
+               window.document.title = "Qpid: " + brokerData.name + " Management";
                for(var i in this.attributes)
                {
                  var propertyName = this.attributes[i].name;
diff --git a/qpid/java/broker/src/main/resources/initial-config.json b/qpid/java/broker/src/main/resources/initial-config.json
index fde3c3a96e..f8b724d351 100644
--- a/qpid/java/broker/src/main/resources/initial-config.json
+++ b/qpid/java/broker/src/main/resources/initial-config.json
@@ -19,7 +19,7 @@
  *
  */
 {
-  "name": "QpidBroker",
+  "name": "Broker",
   "storeVersion": 1,
   "defaultVirtualHost" : "default",
   "authenticationproviders" : [ {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
index 47e6849c01..7555a5632c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
+++ b/qpid/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>();
diff --git a/qpid/java/systests/etc/config-systests.json b/qpid/java/systests/etc/config-systests.json
index 6bfaf08113..c47744c47c 100644
--- a/qpid/java/systests/etc/config-systests.json
+++ b/qpid/java/systests/etc/config-systests.json
@@ -19,7 +19,7 @@
  *
  */
 {
-  "name": "QpidBroker",
+  "name": "Broker",
   "defaultVirtualHost" : "test",
   "authenticationproviders" : [ {
     "name" : "plain",
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
index 88a99ccf2b..677b5cb18c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
@@ -220,7 +220,7 @@ public class BrokerRestTest extends QpidRestTestCase
         assertEquals("Unexpected value of attribute " + Broker.DURABLE, Boolean.TRUE, brokerDetails.get(Broker.DURABLE));
         assertEquals("Unexpected value of attribute " + Broker.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
                 brokerDetails.get(Broker.LIFETIME_POLICY));
-        assertEquals("Unexpected value of attribute " + Broker.NAME, "QpidBroker", brokerDetails.get(Broker.NAME));
+        assertEquals("Unexpected value of attribute " + Broker.NAME, "Broker", brokerDetails.get(Broker.NAME));
         assertEquals("Unexpected value of attribute " + Broker.STATE, State.ACTIVE.name(), brokerDetails.get(Broker.STATE));
 
         assertNotNull("Unexpected value of attribute " + Broker.ID, brokerDetails.get(Broker.ID));
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
index 5593ad0b42..cb4fd1ad5b 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
@@ -33,7 +33,7 @@ public class StructureRestTest extends QpidRestTestCase
     {
         Map<String, Object> structure = getRestTestHelper().getJsonAsMap("/rest/structure");
         assertNotNull("Structure data cannot be null", structure);
-        assertNode(structure, "QpidBroker");
+        assertNode(structure, "Broker");
 
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> virtualhosts = (List<Map<String, Object>>) structure.get("virtualhosts");