You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/04/19 17:49:29 UTC
svn commit: r1469914 - in /qpid/trunk/qpid/java:
broker-plugins/management-http/src/main/java/resources/js/qpid/management/
broker/src/main/resources/
broker/src/test/java/org/apache/qpid/server/configuration/ systests/etc/
systests/src/main/java/org/a...
Author: orudyy
Date: Fri Apr 19 15:49:28 2013
New Revision: 1469914
URL: http://svn.apache.org/r1469914
Log:
QPID-4754: Make broker name editable and show it in the browser title
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
qpid/trunk/qpid/java/systests/etc/config-systests.json
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1469914&r1=1469913&r2=1469914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Fri Apr 19 15:49:28 2013
@@ -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;
Modified: qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json?rev=1469914&r1=1469913&r2=1469914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json (original)
+++ qpid/trunk/qpid/java/broker/src/main/resources/initial-config.json Fri Apr 19 15:49:28 2013
@@ -19,7 +19,7 @@
*
*/
{
- "name": "QpidBroker",
+ "name": "Broker",
"storeVersion": 1,
"defaultVirtualHost" : "default",
"authenticationproviders" : [ {
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java?rev=1469914&r1=1469913&r2=1469914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java Fri Apr 19 15:49:28 2013
@@ -97,7 +97,7 @@ public class BrokerConfigurationStoreCre
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>();
Modified: qpid/trunk/qpid/java/systests/etc/config-systests.json
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests.json?rev=1469914&r1=1469913&r2=1469914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests.json (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests.json Fri Apr 19 15:49:28 2013
@@ -19,7 +19,7 @@
*
*/
{
- "name": "QpidBroker",
+ "name": "Broker",
"defaultVirtualHost" : "test",
"authenticationproviders" : [ {
"name" : "plain",
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1469914&r1=1469913&r2=1469914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java Fri Apr 19 15:49:28 2013
@@ -220,7 +220,7 @@ public class BrokerRestTest extends Qpid
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));
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java?rev=1469914&r1=1469913&r2=1469914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java Fri Apr 19 15:49:28 2013
@@ -33,7 +33,7 @@ public class StructureRestTest extends Q
{
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");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org