diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-02-23 18:38:07 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-02-23 18:38:07 +0000 |
| commit | 3f605ec90f464d82213bdbaec9341c847b188326 (patch) | |
| tree | 50316209cee2057e23e12ba781774b57dcdd66e1 /qpid/java/broker-plugins/management-http/src/main/java/resources/js | |
| parent | 5f16207bf77afd5caed1ba9329da7a32f1b0c718 (diff) | |
| download | qpid-python-3f605ec90f464d82213bdbaec9341c847b188326.tar.gz | |
QPID-5579 : [Java Broker] build attribute meta data the same way for REST API and AMQP Management
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1571054 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-http/src/main/java/resources/js')
4 files changed, 8 insertions, 8 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 aebaa39564..41f43bdeaa 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 @@ -606,7 +606,7 @@ define(["dojo/_base/xhr", new UpdatableStore(that.brokerData.keystores, query(".broker-key-stores")[0], [ { name: "Name", field: "name", width: "20%"}, { name: "Path", field: "path", width: "40%"}, - { name: "Type", field: "type", width: "5%"}, + { name: "Type", field: "keyStoreType", width: "5%"}, { name: "Key Manager Algorithm", field: "keyManagerFactoryAlgorithm", width: "20%"}, { name: "Alias", field: "certificateAlias", width: "15%"} ], function(obj) { @@ -623,7 +623,7 @@ define(["dojo/_base/xhr", new UpdatableStore(that.brokerData.truststores, query(".broker-trust-stores")[0], [ { name: "Name", field: "name", width: "20%"}, { name: "Path", field: "path", width: "40%"}, - { name: "Type", field: "type", width: "5%"}, + { name: "Type", field: "trustStoreType", width: "5%"}, { name: "Trust Manager Algorithm", field: "trustManagerFactoryAlgorithm", width: "25%"}, { name: "Peers only", field: "peersOnly", width: "10%", formatter: function(val){ diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js index 36930be85a..4820e42ccf 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js @@ -101,7 +101,7 @@ define(["dojo/dom", storeNodes(["name", "path", - "type", + "keyStoreType", "keyManagerFactoryAlgorithm", "certificateAlias", "peersOnly" @@ -121,7 +121,7 @@ define(["dojo/dom", { this.name.innerHTML = entities.encode(String(this.keyStoreData[ "name" ])); this.path.innerHTML = entities.encode(String(this.keyStoreData[ "path" ])); - this.type.innerHTML = entities.encode(String(this.keyStoreData[ "type" ])); + this.keyStoreType.innerHTML = entities.encode(String(this.keyStoreData[ "keyStoreType" ])); this.keyManagerFactoryAlgorithm.innerHTML = entities.encode(String(this.keyStoreData[ "keyManagerFactoryAlgorithm" ])); this.certificateAlias.innerHTML = this.keyStoreData[ "certificateAlias" ] ? entities.encode(String( this.keyStoreData[ "certificateAlias" ])) : ""; }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js index e3d880ce24..1d3c462d1e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js @@ -101,7 +101,7 @@ define(["dojo/dom", storeNodes(["name", "path", - "type", + "trustStoreType", "trustManagerFactoryAlgorithm", "certificateAlias", "peersOnly" @@ -121,7 +121,7 @@ define(["dojo/dom", { this.name.innerHTML = entities.encode(String(this.keyStoreData[ "name" ])); this.path.innerHTML = entities.encode(String(this.keyStoreData[ "path" ])); - this.type.innerHTML = entities.encode(String(this.keyStoreData[ "type" ])); + this.trustStoreType.innerHTML = entities.encode(String(this.keyStoreData[ "trustStoreType" ])); this.trustManagerFactoryAlgorithm.innerHTML = entities.encode(String(this.keyStoreData[ "trustManagerFactoryAlgorithm" ])); this.peersOnly.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.keyStoreData[ "peersOnly" ] ? "checked='checked'": "")+" />" ; }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js index 4fdcffb7f1..ae54d19750 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js @@ -129,10 +129,10 @@ define(["dojo/_base/lang", } optionalFieldContainer.addChild(new dijit.form.ValidationTextBox({ required: false, - value: keystore.type, + value: isKeystore ? keystore.keyStoreType : keystore.trustStoreType, label: "Key store type:", placeHolder: "Use default", - name: "type"})); + name: isKeystore ? "keyStoreType" : "trustStoreType"})); var panel = new dijit.TitlePane({title: "Optional Attributes", content: optionalFieldContainer.domNode, open: false}); return panel; } |