diff options
| author | Alex Rudyy <orudyy@apache.org> | 2014-05-02 15:29:48 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2014-05-02 15:29:48 +0000 |
| commit | 1af82f62bbf94323e61a415c182adf2d66ac99f0 (patch) | |
| tree | c99ebc2bf6bafbc9e8ad423265a6a72d71893c20 /qpid/java | |
| parent | 75e7d8b9d87c03876d14cd689dc2f1ba1bfcd250 (diff) | |
| download | qpid-python-1af82f62bbf94323e61a415c182adf2d66ac99f0.tar.gz | |
QPID-5744: Change web management console to call management REST API under /api/latest and auxiliary REST services under /service. Fix broken UI.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1591949 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
47 files changed, 231 insertions, 560 deletions
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html index 31734c818d..c3b2a0f9b5 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html @@ -26,28 +26,28 @@ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Node Name*: </strong></td> <td class="tableContainer-valueCell"> <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.nodeName" - required="true" name="haNodeName" placeholder="node name"/> + required="true" name="name" placeholder="node name"/> </td> </tr> <tr> <td class="tableContainer-labelCell" style="width: 300px;"><strong>Replication Group*: </strong></td> <td class="tableContainer-valueCell"> <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.groupName" - required="true" name="haGroupName" placeholder="group name"/> + required="true" name="groupName" placeholder="group name"/> </td> </tr> <tr> <td class="tableContainer-labelCell" style="width: 300px;"><strong>Node Address*: </strong></td> <td class="tableContainer-valueCell"> <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.nodeAddress" - required="true" name="haNodeAddress" data-dojo-props="regExp:'([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}', invalidMessage:'Must be of the form host:port'" placeholder="host:port"/> + required="true" name="address" data-dojo-props="regExp:'([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}', invalidMessage:'Must be of the form host:port'" placeholder="host:port"/> </td> </tr> <tr> <td class="tableContainer-labelCell" style="width: 300px;"><strong>Helper Address*: </strong></td> <td class="tableContainer-valueCell"> <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.helperAddress" - required="true" name="haHelperAddress" data-dojo-props="regExp:'([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}', invalidMessage:'Must be of the form host:port'" placeholder="host:port"/> + required="true" name="helperAddress" data-dojo-props="regExp:'([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}', invalidMessage:'Must be of the form host:port'" placeholder="host:port"/> </td> </tr> <tr> @@ -69,7 +69,7 @@ hidden.set('value', checkbox.get('checked')); })"/> - <input dojoType="dijit/form/TextBox" id="formAddVirtualHost.specific.haCoalescingSyncHidden" type="hidden" name="haCoalescingSync" value="true"/> + <input dojoType="dijit/form/TextBox" id="formAddVirtualHost.specific.haCoalescingSyncHidden" type="hidden" name="coalescingSync" value="true"/> </td> </tr> @@ -84,7 +84,7 @@ var hidden = registry.byId('formAddVirtualHost.specific.haDesignatedPrimaryHidden'); hidden.set('value', checkbox.get('checked')); })"/> - <input dojoType="dijit/form/TextBox" id="formAddVirtualHost.specific.haDesignatedPrimaryHidden" type="hidden" name="haDesignatedPrimary" value="false"/> + <input dojoType="dijit/form/TextBox" id="formAddVirtualHost.specific.haDesignatedPrimaryHidden" type="hidden" name="designatedPrimary" value="false"/> </td> </tr> </table> diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js index dd79aae2fa..d1f4787202 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js @@ -67,7 +67,7 @@ define(["dojo/_base/xhr", xhr.get({ sync: true, - url: "rest/helper?action=pluginList&plugin=JDBCConnectionProviderFactory", + url: "service/helper?action=pluginList&plugin=JDBCConnectionProviderFactory", handleAs: "json" }).then( function(data) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html index f17e8d8bba..b207258510 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html @@ -99,7 +99,7 @@ </div> </div> <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'leading', splitter: true" style="width:20%"> - <div qpid-type="treeView" qpid-props="query: 'rest/structure'" ></div> + <div qpid-type="treeView" qpid-props="query: 'service/structure'" ></div> </div> <div id="managedViews" data-dojo-type="dijit.layout.TabContainer" data-dojo-props="region:'center', tabPosition: 'top'"> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js index a25375a669..c00f0eae19 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js @@ -63,6 +63,8 @@ var errorHandler = function errorHandler(error) } } +var saslServiceUrl="service/sasl"; + var saslPlain = function saslPlain(user, password, callbackFunction) { var responseArray = [ 0 ].concat(encodeUTF8( user )).concat( [ 0 ] ).concat( encodeUTF8( password ) ); @@ -71,7 +73,7 @@ var saslPlain = function saslPlain(user, password, callbackFunction) // Using dojo.xhrGet, as very little information is being sent dojo.xhrPost({ // The URL of the request - url: "rest/sasl", + url: saslServiceUrl, content: { mechanism: "PLAIN", response: plainResponse @@ -85,7 +87,7 @@ var saslCramMD5 = function saslCramMD5(user, password, saslMechanism, callbackFu { dojo.xhrPost({ // The URL of the request - url: "rest/sasl", + url: saslServiceUrl, content: { mechanism: saslMechanism }, @@ -110,7 +112,7 @@ var saslCramMD5 = function saslCramMD5(user, password, saslMechanism, callbackFu dojo.xhrPost({ // The URL of the request - url: "rest/sasl", + url: saslServiceUrl, content: { id: id, response: response @@ -214,7 +216,7 @@ var saslCramMD5 = function saslCramMD5(user, password, saslMechanism, callbackFu clientFirstMessageBare = "n=" + user + ",r=" + clientNonce; dojo.xhrPost({ // The URL of the request - url: "rest/sasl", + url: saslServiceUrl, content: { mechanism: saslMechanism, response: toBase64(GS2_HEADER + clientFirstMessageBare) @@ -244,7 +246,7 @@ var saslCramMD5 = function saslCramMD5(user, password, saslMechanism, callbackFu serverSignature = CryptoJS.HmacSHA1(authMessage, serverKey); dojo.xhrPost({ // The URL of the request - url: "rest/sasl", + url: saslServiceUrl, content: { id: id, response: toBase64(clientFinalMessageWithoutProof @@ -292,7 +294,7 @@ var SaslClient = {}; SaslClient.authenticate = function(username, password, callbackFunction) { dojo.xhrGet({ - url: "rest/sasl", + url: saslServiceUrl, handleAs: "json", failOk: true }).then(function(data) @@ -325,7 +327,7 @@ SaslClient.authenticate = function(username, password, callbackFunction) SaslClient.getUser = function(callbackFunction) { dojo.xhrGet({ - url: "rest/sasl", + url: saslServiceUrl, handleAs: "json", failOk: true }).then(callbackFunction, errorHandler); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js index fdc07f27ca..9ff8afeaa9 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js @@ -47,7 +47,7 @@ define(["dojo/_base/xhr", "dojo/domReady!"], function (xhr) { { xhr.get({ sync: true, - url: "rest/helper?action=version", + url: "service/helper?action=version", handleAs: "json" }).then(function(version) { qpidVersion = version; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js index d03b44843a..f886a72daa 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js @@ -38,7 +38,7 @@ define(["dojo/_base/xhr"], function (xhr) { function loadTimezones() { xhr.get({ - url: "rest/helper?action=ListTimeZones", + url: "service/helper?action=ListTimeZones", sync: true, handleAs: "json", load: function(zones) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js index 1a056d681c..adc066c270 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js @@ -38,11 +38,7 @@ define(["dojo/_base/xhr", function AccessControlProvider(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "accesscontrolprovider", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "accesscontrolprovider", name: name, parent: parent}; } AccessControlProvider.prototype.getTitle = function() { @@ -79,7 +75,7 @@ define(["dojo/_base/xhr", AccessControlProvider.prototype.deleteAccessControlProvider = function() { if(confirm("Are you sure you want to delete access control provider '" + this.name + "'?")) { - var query = "rest/accesscontrolprovider/" +encodeURIComponent(this.name); + var query = "api/latest/accesscontrolprovider/" +encodeURIComponent(this.name); this.success = true var that = this; xhr.del({url: query, sync: true, handleAs: "json"}).then( @@ -102,7 +98,7 @@ define(["dojo/_base/xhr", this.name = query(".name", node)[0]; this.type = query(".type", node)[0]; this.state = query(".state", node)[0]; - this.query = "rest/accesscontrolprovider/"+encodeURIComponent(groupProviderObj.name); + this.query = "api/latest/accesscontrolprovider/"+encodeURIComponent(groupProviderObj.name); var that = this; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js index 4e96f2e5a4..c3e567e902 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js @@ -43,11 +43,7 @@ define(["dojo/_base/xhr", function AuthenticationProvider(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "authenticationprovider", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "authenticationprovider", name: name, parent: parent}; } AuthenticationProvider.prototype.getTitle = function() { @@ -104,7 +100,7 @@ define(["dojo/_base/xhr", AuthenticationProvider.prototype.deleteAuthenticationProvider = function() { if(confirm("Are you sure you want to delete authentication provider '" + this.name + "'?")) { - var query = "rest/authenticationprovider/" +encodeURIComponent(this.name); + var query = "api/latest/authenticationprovider/" +encodeURIComponent(this.name); this.success = true var that = this; xhr.del({url: query, sync: true, handleAs: "json"}).then( @@ -144,7 +140,7 @@ define(["dojo/_base/xhr", this.deletePreferencesProviderButton = query(".deletePreferencesProviderButton", node)[0]; this.preferencesProviderAttributes = dom.byId("preferencesProviderAttributes") - this.query = "rest/authenticationprovider/" + encodeURIComponent(authProviderObj.name); + this.query = "api/latest/authenticationprovider/" + encodeURIComponent(authProviderObj.name); var that = this; 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 41f43bdeaa..a0414b07d2 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 @@ -67,11 +67,14 @@ define(["dojo/_base/xhr", }, { name: "defaultVirtualHost", createWidget: function(brokerData) { - var hosts = brokerData.virtualhosts; + var nodes = brokerData.virtualhostnodes; var data = []; - if (hosts) { - for (var i=0; i< hosts.length; i++) { - data.push({id: hosts[i].name, name: hosts[i].name}); + if (nodes) { + for (var i=0; i< nodes.length; i++) { + if (nodes[i].virtualhosts) + { + data.push({id: nodes[i].virtualhosts[0].name, name: nodes[i].virtualhosts[0].name}); + } } } var hostsStore = new dojo.store.Memory({ data: data }); @@ -106,130 +109,6 @@ define(["dojo/_base/xhr", }); } }, { - name: "queue.alertThresholdQueueDepthMessages", - groupName: "Global Queue Defaults", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["queue.alertThresholdQueueDepthMessages"], - placeholder: "Number of messages", - label: "Depth alert threshold (messages):", - name: "queue.alertThresholdQueueDepthMessages" - }); - } - }, { - name: "queue.alertThresholdQueueDepthBytes", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["queue.alertThresholdQueueDepthBytes"], - placeholder: "Number of bytes", - label: "Depth alert threshold (bytes):", - name: "queue.alertThresholdQueueDepthBytes" - }); - } - }, { - name: "queue.alertThresholdMessageAge", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["queue.alertThresholdMessageAge"], - placeholder: "Time in ms", - label: "Message age alert threshold (ms):", - name: "queue.alertThresholdMessageAge" - }); - } - }, { - name: "queue.alertThresholdMessageSize", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["queue.alertThresholdMessageSize"], - placeholder: "Size in bytes", - label: "Message size alert threshold (bytes):", - name: "queue.alertThresholdMessageSize" - }); - } - }, { - name: "queue.alertRepeatGap", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["queue.alertRepeatGap"], - placeholder: "Time in ms", - label: "Alert repeat gap (ms):", - name: "queue.alertRepeatGap" - }); - } - }, { - name: "queue.maximumDeliveryAttempts", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["queue.maximumDeliveryAttempts"], - placeholder: "Number of messages", - label: "Maximum delivery retries (messages):", - name: "queue.maximumDeliveryAttempts" - }); - } - }, { - name: "queue.deadLetterQueueEnabled", - createWidget: function(brokerData) { - return new dijit.form.CheckBox({ - required: false, - checked: brokerData["queue.deadLetterQueueEnabled"], - value: "true", - label: "Dead letter queue enabled:", - name: "queue.deadLetterQueueEnabled" - }); - } - }, { - name: "queue.flowControlSizeBytes", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["queue.flowControlSizeBytes"], - placeholder: "Size in bytes", - label: "Flow control threshold (bytes):", - name: "queue.flowControlSizeBytes" - }); - } - }, { - name: "queue.flowResumeSizeBytes", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["queue.flowResumeSizeBytes"], - placeholder: "Size in bytes", - label: "Flow resume threshold (bytes):", - name: "queue.flowResumeSizeBytes" - }); - } - }, { name: "connection.sessionCountLimit", groupName: "Global Connection Defaults", createWidget: function(brokerData) @@ -258,77 +137,6 @@ define(["dojo/_base/xhr", name: "connection.heartBeatDelay" }); } - }, { - name: "virtualhost.housekeepingCheckPeriod", - groupName: "Global Virtual Host defaults", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["virtualhost.housekeepingCheckPeriod"], - placeholder: "Time in ms", - label: "House keeping check period (ms):", - name: "virtualhost.housekeepingCheckPeriod" - }); - } - }, { - name: "virtualhost.storeTransactionIdleTimeoutClose", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["virtualhost.storeTransactionIdleTimeoutClose"], - placeholder: "Time in ms", - label: "Idle store transaction close timeout (ms):", - name: "virtualhost.storeTransactionIdleTimeoutClose" - }); - } - }, { - name: "virtualhost.storeTransactionIdleTimeoutWarn", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["virtualhost.storeTransactionIdleTimeoutWarn"], - placeholder: "Time in ms", - label: "Idle store transaction warn timeout (ms):", - name: "virtualhost.storeTransactionIdleTimeoutWarn" - }); - } - }, { - name: "virtualhost.storeTransactionOpenTimeoutClose", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["virtualhost.storeTransactionOpenTimeoutClose"], - placeholder: "Time in ms", - label: "Open store transaction close timeout (ms):", - name: "virtualhost.storeTransactionOpenTimeoutClose" - }); - } - }, { - name: "virtualhost.storeTransactionOpenTimeoutWarn", - createWidget: function(brokerData) { - return new dijit.form.ValidationTextBox({ - trim: "true", - regexp: "[0-9]+", - invalidMessage: "Invalid value", - required: false, - value: brokerData["virtualhost.storeTransactionOpenTimeoutWarn"], - placeholder: "Time in ms", - label: "Open store transaction warn timeout (ms):", - name: "virtualhost.storeTransactionOpenTimeoutWarn" - }); - } } ]; } @@ -381,7 +189,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.brokerUpdater, that.brokerUpdater.authenticationProvidersGrid.grid, - "rest/authenticationprovider", + "api/latest/authenticationprovider", warning + "Are you sure you want to delete authentication provider"); } ); @@ -395,7 +203,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.brokerUpdater, that.brokerUpdater.vhostsGrid.grid, - "rest/virtualhost", + "api/latest/virtualhostnodes", "Deletion of virtual host will delete the message store data.\n\n Are you sure you want to delete virtual host"); } ); @@ -412,7 +220,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.brokerUpdater, that.brokerUpdater.portsGrid.grid, - "rest/port", + "api/latest/port", "Are you sure you want to delete port"); } ); @@ -423,7 +231,7 @@ define(["dojo/_base/xhr", util.showSetAttributesDialog( that.attributeWidgetFactories, that.brokerUpdater.brokerData, - "rest/broker", + "api/latest/broker", "Set broker attributes"); } ); @@ -438,7 +246,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.brokerUpdater, that.brokerUpdater.keyStoresGrid.grid, - "rest/keystore", + "api/latest/keystore", "Are you sure you want to delete key store"); } ); @@ -453,7 +261,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.brokerUpdater, that.brokerUpdater.trustStoresGrid.grid, - "rest/truststore", + "api/latest/truststore", "Are you sure you want to delete trust store"); } ); @@ -482,7 +290,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.brokerUpdater, that.brokerUpdater.groupProvidersGrid.grid, - "rest/groupprovider", + "api/latest/groupprovider", warning + "Are you sure you want to delete group provider"); } ); @@ -497,7 +305,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.brokerUpdater, that.brokerUpdater.accessControlProvidersGrid.grid, - "rest/accesscontrolprovider", + "api/latest/accesscontrolprovider", "Are you sure you want to delete access control provider"); } ); @@ -511,7 +319,7 @@ define(["dojo/_base/xhr", function BrokerUpdater(node, brokerObj, controller, attributes) { this.controller = controller; - this.query = "rest/broker"; + this.query = "api/latest/broker?depth=2"; this.attributes = attributes; this.accessControlProvidersWarn = query(".broker-access-control-providers-warning", node)[0] var that = this; @@ -541,19 +349,41 @@ define(["dojo/_base/xhr", }}; that.vhostsGrid = - new UpdatableStore(that.brokerData.vhosts, query(".broker-virtualhosts")[0], - [ { name: "Virtual Host", field: "name", width: "120px"}, - { name: "State", field: "state", width: "70px"}, - { name: "Connections", field: "connectionCount", width: "80px"}, - { name: "Queues", field: "queueCount", width: "80px"}, - { name: "Exchanges", field: "exchangeCount", width: "100%"} + new UpdatableStore(that.brokerData.virtualhostnodes, query(".broker-virtualhosts")[0], + [ { name: "Virtual Host", field: "_item", width: "120px", + formatter: function(item){ + return item && item.virtualhosts? item.virtualhosts[0].name: (item?item.name: "N/A"); + } + }, + { name: "State", field: "_item", width: "70px", + formatter: function(item){ + return item && item.virtualhosts? item.virtualhosts[0].state: (item?item.state: "N/A"); + } + }, + { name: "Connections", field: "_item", width: "80px", + formatter: function(item){ + return item && item.virtualhosts? item.virtualhosts[0].statistics.connectionCount: 0; + } + }, + { name: "Queues", field: "_item", width: "80px", + formatter: function(item){ + return item && item.virtualhosts? item.virtualhosts[0].statistics.queueCount: 0; + } + }, + { name: "Exchanges", field: "_item", width: "100%", + formatter: function(item){ + return item && item.virtualhosts? item.virtualhosts[0].statistics.exchangeCount: 0; + } + } ], function(obj) { connect.connect(obj.grid, "onRowDblClick", obj.grid, function(evt){ var idx = evt.rowIndex, theItem = this.getItem(idx); - var name = obj.dataStore.getValue(theItem,"name"); - that.controller.show("virtualhost", name, brokerObj, theItem.id); + var nodeName = obj.dataStore.getValue(theItem,"name"); + var host = theItem && theItem.virtualhosts? theItem.virtualhosts[0]: null; + var nodeObject = { type: "virtualhostnode", name: nodeName, parent: brokerObj}; + that.controller.show("virtualhost", host?host.name:nodeName, nodeObject, host?host.id:null); }); }, gridProperties, EnhancedGrid); @@ -749,7 +579,7 @@ define(["dojo/_base/xhr", that.updateHeader(); - that.vhostsGrid.update(that.brokerData.virtualhosts); + that.vhostsGrid.update(that.brokerData.virtualhostnodes); that.portsGrid.update(that.brokerData.ports); @@ -784,9 +614,6 @@ define(["dojo/_base/xhr", dojo.byId("brokerAttribute.platform").innerHTML = entities.encode(String(brokerData.platform)); dojo.byId("brokerAttribute.productVersion").innerHTML = entities.encode(String(brokerData.productVersion)); dojo.byId("brokerAttribute.modelVersion").innerHTML = entities.encode(String(brokerData.modelVersion)); - dojo.byId("brokerAttribute.storeType").innerHTML = entities.encode(String(brokerData.storeType)); - dojo.byId("brokerAttribute.storeVersion").innerHTML = entities.encode(String(brokerData.storeVersion)); - dojo.byId("brokerAttribute.storePath").innerHTML = entities.encode(String(brokerData.storePath)); } return Broker; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js index 2b455a90f1..e2c73a5d41 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js @@ -34,11 +34,7 @@ define(["dojo/_base/xhr", function Connection(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "exchange", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "exchange", name: name, parent: parent }; } Connection.prototype.getTitle = function() @@ -98,7 +94,8 @@ define(["dojo/_base/xhr", - this.query = "rest/connection/"+ encodeURIComponent(connectionObj.parent.virtualhost.name) + "/" + encodeURIComponent(connectionObj.name); + this.query = "api/latest/connection/"+ encodeURIComponent(connectionObj.parent.parent.name) + + "/" + encodeURIComponent(connectionObj.parent.name) + "/" + encodeURIComponent(connectionObj.name); xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js index 48c82621b4..8aec8042bd 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js @@ -37,11 +37,7 @@ define(["dojo/_base/xhr", function Exchange(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "exchange", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "exchange", name: name, parent: parent}; } @@ -53,7 +49,12 @@ define(["dojo/_base/xhr", Exchange.prototype.getVirtualHostName = function() { - return this.modelObj.parent.virtualhost.name; + return this.modelObj.parent.name; + }; + + Exchange.prototype.getVirtualHostNodeName = function() + { + return this.modelObj.parent.parent.name; }; Exchange.prototype.getTitle = function() @@ -81,6 +82,7 @@ define(["dojo/_base/xhr", connect.connect(registry.byNode(addBindingButton), "onClick", function(evt){ addBinding.show({ virtualhost: that.getVirtualHostName(), + virtualhostnode: that.getVirtualHostNodeName(), exchange: that.getExchangeName()}); }); @@ -117,7 +119,8 @@ define(["dojo/_base/xhr", util.deleteGridSelections( this.exchangeUpdater, this.exchangeUpdater.bindingsGrid.grid, - "rest/binding/"+ encodeURIComponent(this.getVirtualHostName()) + "/" + encodeURIComponent(this.name), + "api/latest/binding/" + encodeURIComponent(this.getVirtualHostNodeName()) + + "/" + encodeURIComponent(this.getVirtualHostName()) + "/" + encodeURIComponent(this.name), "Are you sure you want to delete binding for queue"); } @@ -158,7 +161,8 @@ define(["dojo/_base/xhr", - this.query = "rest/exchange/"+ encodeURIComponent(exchangeObj.parent.virtualhost.name) + "/" + encodeURIComponent(exchangeObj.name); + this.query = "api/latest/exchange/" + encodeURIComponent(exchangeObj.parent.parent.name) + + "/" + encodeURIComponent(exchangeObj.parent.name) + "/" + encodeURIComponent(exchangeObj.name); xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data) { @@ -272,7 +276,8 @@ define(["dojo/_base/xhr", Exchange.prototype.deleteExchange = function() { if(confirm("Are you sure you want to delete exchange '" +this.name+"'?")) { - var query = "rest/exchange/"+ encodeURIComponent(this.getVirtualHostName()) + "/" + encodeURIComponent(this.name); + var query = "api/latest/exchange/" + encodeURIComponent(this.getVirtualHostNodeName()) + + "/" + encodeURIComponent(this.getVirtualHostName()) + "/" + encodeURIComponent(this.name); this.success = true var that = this; xhr.del({url: query, sync: true, handleAs: "json"}).then( diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js index fdaaa2c116..74f7209d9d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js @@ -38,11 +38,7 @@ define(["dojo/_base/xhr", function GroupProvider(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "groupprovider", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "groupprovider", name: name, parent: parent}; } GroupProvider.prototype.getTitle = function() { @@ -85,7 +81,7 @@ define(["dojo/_base/xhr", warnMessage = "NOTE: provider deletion will also remove the group file on disk.\n\n"; } if(confirm(warnMessage + "Are you sure you want to delete group provider '" + this.name + "'?")) { - var query = "rest/groupprovider/" +encodeURIComponent(this.name); + var query = "api/latest/groupprovider/" +encodeURIComponent(this.name); this.success = true var that = this; xhr.del({url: query, sync: true, handleAs: "json"}).then( @@ -108,7 +104,7 @@ define(["dojo/_base/xhr", this.name = query(".name", node)[0]; this.type = query(".type", node)[0]; this.state = query(".state", node)[0]; - this.query = "rest/groupprovider/"+encodeURIComponent(groupProviderObj.name); + this.query = "api/latest/groupprovider/"+encodeURIComponent(groupProviderObj.name); this.typeUI ={"GroupFile": "FileGroupManager"}; var that = this; 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 4820e42ccf..f73837ba7d 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 @@ -36,12 +36,8 @@ define(["dojo/dom", function KeyStore(name, parent, controller, objectType) { this.keyStoreName = name; this.controller = controller; - this.modelObj = { type: "keystore", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } - this.url = "rest/keystore/" + encodeURIComponent(name); + this.modelObj = { type: "keystore", name: name, parent: parent}; + this.url = "api/latest/keystore/" + encodeURIComponent(name); this.dialog = addKeystore.showKeystoreDialog; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js index 3f47c6d0ba..47f6cffe5a 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js @@ -34,11 +34,7 @@ define(["dojo/_base/xhr", function Plugin(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "plugin", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "plugin", name: name, parent: parent }; } Plugin.prototype.getTitle = function() { @@ -67,7 +63,7 @@ define(["dojo/_base/xhr", this.controller = controller; this.name = query(".name", node)[0]; this.type = query(".type", node)[0]; - this.query = "rest/plugin/"+encodeURIComponent(pluginObject.name); + this.query = "api/latest/plugin/"+encodeURIComponent(pluginObject.name); var that = this; @@ -78,7 +74,7 @@ define(["dojo/_base/xhr", that.updateHeader(); - require(["qpid/management/plugin/"+ that.pluginData.pluginType.toLowerCase().replace('-','')], + require(["qpid/management/plugin/"+ that.pluginData.type.toLowerCase().replace('-','')], function(SpecificPlugin) { that.details = new SpecificPlugin(query(".pluginDetails", node)[0], pluginObject, controller); }); @@ -90,7 +86,7 @@ define(["dojo/_base/xhr", PluginUpdater.prototype.updateHeader = function() { this.name.innerHTML = entities.encode(String(this.pluginData[ "name" ])); - this.type.innerHTML = entities.encode(String(this.pluginData[ "pluginType" ])); + this.type.innerHTML = entities.encode(String(this.pluginData[ "type" ])); }; return Plugin; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js index 45c54745da..ebcee4afa2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js @@ -36,11 +36,7 @@ define(["dojo/dom", function Port(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "port", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "port", name: name, parent: parent}; } Port.prototype.getTitle = function() { @@ -56,7 +52,7 @@ define(["dojo/dom", contentPane.containerNode.innerHTML = data; parser.parse(contentPane.containerNode); - that.portUpdater = new PortUpdater(contentPane.containerNode, that.modelObj, that.controller, "rest/port/" + encodeURIComponent(that.name)); + that.portUpdater = new PortUpdater(contentPane.containerNode, that.modelObj, that.controller, "api/latest/port/" + encodeURIComponent(that.name)); updater.add( that.portUpdater ); @@ -85,7 +81,7 @@ define(["dojo/dom", Port.prototype.deletePort = function() { if(confirm("Are you sure you want to delete port '" +this.name+"'?")) { - var query = "rest/port/" + encodeURIComponent(this.name); + var query = "api/latest/port/" + encodeURIComponent(this.name); this.success = true var that = this; xhr.del({url: query, sync: true, handleAs: "json"}).then( @@ -104,7 +100,7 @@ define(["dojo/dom", Port.prototype.showEditDialog = function() { var that = this; - xhr.get({url: "rest/broker", sync: properties.useSyncGet, handleAs: "json"}) + xhr.get({url: "api/latest/broker", sync: properties.useSyncGet, handleAs: "json"}) .then(function(data) { var brokerData= data[0]; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js index 5db2cecf0c..f9982a1699 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js @@ -174,7 +174,7 @@ function (declare, xhr, event, connect, dom, domConstruct, parser, json, Memory, if (util.deleteGridSelections( null, this.usersGrid, - "rest/userpreferences", + "service/userpreferences", "Are you sure you want to delete preferences for user", "user")) { @@ -228,7 +228,7 @@ function (declare, xhr, event, connect, dom, domConstruct, parser, json, Memory, { var that = this; xhr.get({ - url: "rest/userpreferences", + url: "service/userpreferences", sync: false, handleAs: "json" }).then( diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js index c8e6f9845c..48feccbced 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js @@ -36,12 +36,8 @@ define(["dojo/_base/xhr", function PreferencesProvider(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "preferencesprovider", name: name }; + this.modelObj = { type: "preferencesprovider", name: name, parent: parent}; this.authenticationProviderName = parent.name; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[parent.type] = parent; - } } PreferencesProvider.prototype.getTitle = function() { @@ -89,7 +85,7 @@ define(["dojo/_base/xhr", if (this.preferencesProviderData){ var preferencesProviderData = this.preferencesProviderData; if(confirm("Are you sure you want to delete preferences provider '" + preferencesProviderData.name + "'?")) { - var query = "rest/preferencesprovider/" + encodeURIComponent(this.authenticationProviderName) + "/" + encodeURIComponent(preferencesProviderData.name); + var query = "api/latest/preferencesprovider/" + encodeURIComponent(this.authenticationProviderName) + "/" + encodeURIComponent(preferencesProviderData.name); this.success = true var that = this; xhr.del({url: query, sync: true, handleAs: "json"}).then( @@ -155,7 +151,7 @@ define(["dojo/_base/xhr", PreferencesProvider.prototype.reload = function() { - var query = "rest/preferencesprovider/" + encodeURIComponent(this.authenticationProviderName) + "/" + encodeURIComponent(this.name); + var query = "api/latest/preferencesprovider/" + encodeURIComponent(this.authenticationProviderName) + "/" + encodeURIComponent(this.name); var that = this; xhr.get({url: query, sync: properties.useSyncGet, handleAs: "json"}) .then(function(data) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js index ebf06377f4..1adcbd1ff1 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js @@ -30,7 +30,7 @@ define(["dojo/_base/xhr", "dijit/form/ValidationTextBox", "dojox/html/entities", "dojo/text!../../showPreferencesProviderFields.html", - "dojo/text!rest/helper?action=ListPreferencesProvidersTypes", + "dojo/text!service/helper?action=ListPreferencesProvidersTypes", "dojox/validate/us", "dojox/validate/web", "dojo/domReady!"], function (xhr, dom, query, parser, string, json, Memory, registry, FilteringSelect, ValidationTextBox, entities, template, preferencesProvidersTypes) { @@ -130,7 +130,7 @@ define(["dojo/_base/xhr", { var that = this; xhr.get({ - url: "rest/preferencesprovider/" +encodeURIComponent(authenticationProviderName) + "/" + encodeURIComponent(provider), + url: "api/latest/preferencesprovider/" +encodeURIComponent(authenticationProviderName) + "/" + encodeURIComponent(provider), sync: true, handleAs: "json" }).then(function(data){if (data && data[0]) { that.init(data[0]);}}); @@ -173,7 +173,7 @@ define(["dojo/_base/xhr", if (this.type.value) { var data = this.getValues(); - xhr.put({url: "rest/preferencesprovider/" +encodeURIComponent(authenticationProviderName) + "/" + encodeURIComponent(data.name), + xhr.put({url: "api/latest/preferencesprovider/" +encodeURIComponent(authenticationProviderName) + "/" + encodeURIComponent(data.name), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js index c1442e5edc..039437a0bf 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js @@ -47,11 +47,7 @@ define(["dojo/_base/xhr", function Queue(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "queue", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "queue", name: name, parent: parent }; } Queue.prototype.getQueueName = function() @@ -62,7 +58,12 @@ define(["dojo/_base/xhr", Queue.prototype.getVirtualHostName = function() { - return this.modelObj.parent.virtualhost.name; + return this.modelObj.parent.name; + }; + + Queue.prototype.getVirtualHostNodeName = function() + { + return this.modelObj.parent.parent.name; }; Queue.prototype.getTitle = function() @@ -85,7 +86,7 @@ define(["dojo/_base/xhr", that.queueUpdater.update(); - var myStore = new JsonRest({target:"rest/message/"+ encodeURIComponent(that.getVirtualHostName()) + + var myStore = new JsonRest({target:"service/message/"+ encodeURIComponent(that.getVirtualHostName()) + "/" + encodeURIComponent(that.getQueueName())}); var messageGridDiv = query(".messages",contentPane.containerNode)[0]; that.dataStore = new ObjectStore({objectStore: myStore}); @@ -123,7 +124,8 @@ define(["dojo/_base/xhr", var id = that.dataStore.getValue(theItem,"id"); showMessage.show({ messageNumber: id, queue: that.getQueueName(), - virtualhost: that.getVirtualHostName() }); + virtualhost: that.getVirtualHostName(), + virtualhostnode: that.getVirtualHostNodeName()}); }); var deleteMessagesButton = query(".deleteMessagesButton", contentPane.containerNode)[0]; @@ -153,7 +155,8 @@ define(["dojo/_base/xhr", function(evt){ event.stop(evt); addBinding.show({ virtualhost: that.getVirtualHostName(), - queue: that.getQueueName()}); + queue: that.getQueueName(), + virtualhostnode: that.getVirtualHostNodeName()}); }); var deleteQueueButton = query(".deleteQueueButton", contentPane.containerNode)[0]; @@ -184,7 +187,7 @@ define(["dojo/_base/xhr", queryParam += "id=" + data[i].id; } - var query = "rest/message/"+ encodeURIComponent(that.getVirtualHostName()) + var query = "service/message/"+ encodeURIComponent(that.getVirtualHostName()) + "/" + encodeURIComponent(that.getQueueName()) + queryParam; that.success = true xhr.del({url: query, sync: true, handleAs: "json"}).then( @@ -307,7 +310,7 @@ define(["dojo/_base/xhr", - this.query = "rest/queue/"+ encodeURIComponent(queueObj.getVirtualHostName()) + "/" + encodeURIComponent(queueObj.getQueueName()); + this.query = "api/latest/queue/" + encodeURIComponent(queueObj.getVirtualHostNodeName()) + "/" + encodeURIComponent(queueObj.getVirtualHostName()) + "/" + encodeURIComponent(queueObj.getQueueName()); xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data) { @@ -490,7 +493,8 @@ define(["dojo/_base/xhr", Queue.prototype.deleteQueue = function() { if(confirm("Are you sure you want to delete queue '" +this.name+"'?")) { - var query = "rest/queue/"+ encodeURIComponent(this.getVirtualHostName()) + "/" + encodeURIComponent(this.name); + var query = "api/latest/queue/" + encodeURIComponent(this.getVirtualHostNodeName()) + + "/" + encodeURIComponent(this.getVirtualHostName()) + "/" + encodeURIComponent(this.name); this.success = true var that = this; xhr.del({url: query, sync: true, handleAs: "json"}).then( 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 1d3c462d1e..14c51f3276 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 @@ -36,12 +36,8 @@ define(["dojo/dom", function TrustStore(name, parent, controller) { this.keyStoreName = name; this.controller = controller; - this.modelObj = { type: "truststore", name: name }; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } - this.url = "rest/truststore/" + encodeURIComponent(name); + this.modelObj = { type: "truststore", name: name, parent: parent}; + this.url = "api/latest/truststore/" + encodeURIComponent(name); this.dialog = addKeystore.showTruststoreDialog; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js index 44dee22007..4a9dfd532a 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js @@ -37,7 +37,7 @@ define(["dojo/_base/xhr", { var that = this; xhr.get({ - url: "rest/preferences", + url: "service/preferences", sync: true, handleAs: "json", load: function(data) @@ -65,7 +65,7 @@ define(["dojo/_base/xhr", { var that = this; xhr.post({ - url: "rest/preferences", + url: "service/preferences", sync: !noSync, handleAs: "json", headers: { "Content-Type": "application/json"}, diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js index e92fb4492e..d745154faf 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js @@ -38,11 +38,7 @@ define(["dojo/_base/xhr", function VirtualHost(name, parent, controller) { this.name = name; this.controller = controller; - this.modelObj = { type: "virtualhost", name: name}; - if(parent) { - this.modelObj.parent = {}; - this.modelObj.parent[ parent.type] = parent; - } + this.modelObj = { type: "virtualhost", name: name, parent: parent}; } VirtualHost.prototype.getTitle = function() @@ -66,7 +62,9 @@ define(["dojo/_base/xhr", that.vhostUpdater.update(); var addQueueButton = query(".addQueueButton", contentPane.containerNode)[0]; - connect.connect(registry.byNode(addQueueButton), "onClick", function(evt){ addQueue.show(that.name) }); + connect.connect(registry.byNode(addQueueButton), "onClick", function(evt){ + addQueue.show({virtualhost:that.name,virtualhostnode:that.modelObj.parent.name}) + }); var deleteQueueButton = query(".deleteQueueButton", contentPane.containerNode)[0]; connect.connect(registry.byNode(deleteQueueButton), "onClick", @@ -74,7 +72,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.vhostUpdater, that.vhostUpdater.queuesGrid.grid, - "rest/queue/"+ encodeURIComponent(that.name), + "api/latest/queue/" + encodeURIComponent(that.modelObj.parent.name) + "/" + encodeURIComponent(that.name), "Are you sure you want to delete queue"); } ); @@ -89,7 +87,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.vhostUpdater, that.vhostUpdater.exchangesGrid.grid, - "rest/exchange/"+ encodeURIComponent(that.name), + "api/latest/exchange/"+ encodeURIComponent(that.modelObj.parent.name) + "/" + encodeURIComponent(that.name), "Are you sure you want to delete exchange"); } ); @@ -121,15 +119,6 @@ define(["dojo/_base/xhr", "state", "durable", "lifetimePolicy", - "alertRepeatGap", - "alertRepeatGapUnits", - "alertThresholdMessageAge", - "alertThresholdMessageAgeUnits", - "alertThresholdMessageSize", - "alertThresholdMessageSizeUnits", - "alertThresholdQueueDepthBytes", - "alertThresholdQueueDepthBytesUnits", - "alertThresholdQueueDepthMessages", "msgInRate", "bytesInRate", "bytesInRateUnits", @@ -140,7 +129,7 @@ define(["dojo/_base/xhr", "storePath", "configPath"]); - this.query = "rest/virtualhost/"+ encodeURIComponent(vhost.name); + this.query = "api/latest/virtualhost/"+ encodeURIComponent(vhost.parent.name) + "/" + encodeURIComponent(vhost.name); var that = this; @@ -245,9 +234,11 @@ define(["dojo/_base/xhr", this.state.innerHTML = entities.encode(String(this.vhostData[ "state" ])); this.durable.innerHTML = entities.encode(String(this.vhostData[ "durable" ])); this.lifetimePolicy.innerHTML = entities.encode(String(this.vhostData[ "lifetimePolicy" ])); - this.storeType.innerHTML = entities.encode(String(this.vhostData[ "storeType" ])); - this.storePath.innerHTML = entities.encode(String(this.vhostData[ "storePath" ])); - this.configPath.innerHTML = entities.encode(String(this.vhostData[ "configPath" ])); + if (this.vhostData.messageStoreSettings) + { + this.storeType.innerHTML = entities.encode(String(this.vhostData[ "messageStoreSettings" ].storeType)); + this.storePath.innerHTML = entities.encode(String(this.vhostData[ "messageStoreSettings" ].storePath)); + } }; Updater.prototype.update = function() @@ -265,31 +256,6 @@ define(["dojo/_base/xhr", thisObj.updateHeader(); - - // update alerting info - var alertRepeatGap = formatter.formatTime( thisObj.vhostData["queue.alertRepeatGap"] ); - - thisObj.alertRepeatGap.innerHTML = alertRepeatGap.value; - thisObj.alertRepeatGapUnits.innerHTML = alertRepeatGap.units; - - - var alertMsgAge = formatter.formatTime( thisObj.vhostData["queue.alertThresholdMessageAge"] ); - - thisObj.alertThresholdMessageAge.innerHTML = alertMsgAge.value; - thisObj.alertThresholdMessageAgeUnits.innerHTML = alertMsgAge.units; - - var alertMsgSize = formatter.formatBytes( thisObj.vhostData["queue.alertThresholdMessageSize"] ); - - thisObj.alertThresholdMessageSize.innerHTML = alertMsgSize.value; - thisObj.alertThresholdMessageSizeUnits.innerHTML = alertMsgSize.units; - - var alertQueueDepth = formatter.formatBytes( thisObj.vhostData["queue.alertThresholdQueueDepthBytes"] ); - - thisObj.alertThresholdQueueDepthBytes.innerHTML = alertQueueDepth.value; - thisObj.alertThresholdQueueDepthBytesUnits.innerHTML = alertQueueDepth.units; - - thisObj.alertThresholdQueueDepthMessages.innerHTML = entities.encode(String(thisObj.vhostData["queue.alertThresholdQueueDepthMessages"])); - var stats = thisObj.vhostData[ "statistics" ]; var sampleTime = new Date(); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js index 3aa9d0baee..12c8677c11 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js @@ -72,7 +72,7 @@ define(["dojo/_base/xhr", function AclFileUpdater(node, aclProviderObj, controller) { this.controller = controller; - this.query = "rest/accesscontrolprovider/"+encodeURIComponent(aclProviderObj.name); + this.query = "api/latest/accesscontrolprovider/"+encodeURIComponent(aclProviderObj.name); this.name = aclProviderObj.name; this.path = query(".path", node)[0]; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js index d20897c1d8..49a99418bf 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js @@ -77,7 +77,7 @@ define(["dojo/_base/lang", var providers = []; var fieldSetContainers = {}; xhr.get({ - url: "rest/helper?action=ListAccessControlProviderAttributes", + url: "service/helper?action=ListAccessControlProviderAttributes", handleAs: "json", sync: true }).then( @@ -169,7 +169,7 @@ define(["dojo/_base/lang", util.showSetAttributesDialog( fields, accessControlProvider ? accessControlProvider : {}, - "rest/accesscontrolprovider" + (name ? "/" + encodeURIComponent(name.name) : ""), + "api/latest/accesscontrolprovider" + (name ? "/" + encodeURIComponent(name.name) : ""), accessControlProvider ? "Edit access control provider - " + accessControlProvider.name : "Add access control provider", accessControlProvider ? false : true); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js index 428a26c3c9..969a8ffd90 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js @@ -125,7 +125,7 @@ define(["dojo/_base/xhr", if (providerName) { xhr.get({ - url: "rest/authenticationprovider/" + encodeURIComponent(providerName), + url: "api/latest/authenticationprovider/" + encodeURIComponent(providerName), handleAs: "json" }).then( function(data) { @@ -175,7 +175,7 @@ define(["dojo/_base/xhr", var newAuthenticationManager = convertToAuthenticationProvider(theForm.getValues()); var that = this; - xhr.put({url: "rest/authenticationprovider/" + encodeURIComponent(newAuthenticationManager.name), + xhr.put({url: "api/latest/authenticationprovider/" + encodeURIComponent(newAuthenticationManager.name), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, putData: json.toJson(newAuthenticationManager), @@ -214,7 +214,7 @@ define(["dojo/_base/xhr", if (!that.hasOwnProperty("providerFieldSets")) { xhr.get({ - url: "rest/helper?action=ListAuthenticationProviderAttributes", + url: "service/helper?action=ListAuthenticationProviderAttributes", handleAs: "json" }).then( function(data) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js index 83e724d0e9..7bdd72525c 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js @@ -114,7 +114,8 @@ define(["dojo/_base/xhr", var newBinding = convertToBinding(theForm.getValues()); var that = this; - xhr.put({url: "rest/binding/"+encodeURIComponent(addBinding.vhost) + xhr.put({url: "api/latest/binding/"+encodeURIComponent(addBinding.vhostnode) + +"/"+encodeURIComponent(addBinding.vhost) +"/"+encodeURIComponent(newBinding.exchange) +"/"+encodeURIComponent(newBinding.queue) +"/"+encodeURIComponent(newBinding.name), @@ -147,6 +148,7 @@ define(["dojo/_base/xhr", addBinding.show = function(obj) { var that = this; + addBinding.vhostnode = obj.virtualhostnode; addBinding.vhost = obj.virtualhost; addBinding.queue = obj.queue; addBinding.exchange = obj.exchange; @@ -154,7 +156,7 @@ define(["dojo/_base/xhr", - xhr.get({url: "rest/queue/" + encodeURIComponent(obj.virtualhost) + "?depth=0", + xhr.get({url: "api/latest/queue/" + encodeURIComponent(obj.virtualhostnode) + "/" + encodeURIComponent(obj.virtualhost) + "?depth=0", handleAs: "json"}).then( function(data) { var queues = []; @@ -181,7 +183,7 @@ define(["dojo/_base/xhr", that.queueChooser.set("disabled", true); } - xhr.get({url: "rest/exchange/" + encodeURIComponent(obj.virtualhost) + "?depth=0", + xhr.get({url: "api/latest/exchange/" + encodeURIComponent(obj.virtualhostnode) + "/" + encodeURIComponent(obj.virtualhost) + "?depth=0", handleAs: "json"}).then( function(data) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js index 915092a9d1..cd882db32e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js @@ -109,7 +109,7 @@ define(["dojo/_base/xhr", var newExchange = convertToExchange(theForm.getValues()); var that = this; - xhr.put({url: "rest/exchange/"+encodeURIComponent(addExchange.vhost) + + xhr.put({url: "api/latest/exchange/"+encodeURIComponent(addExchange.vhost) + "/"+encodeURIComponent(newExchange.name), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, putData: json.toJson(newExchange), diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js index c8cd33fd6a..5f01b9769b 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js @@ -77,7 +77,7 @@ define(["dojo/_base/lang", var providers = []; var fieldSetContainers = {}; xhr.get({ - url: "rest/helper?action=ListGroupProviderAttributes", + url: "service/helper?action=ListGroupProviderAttributes", handleAs: "json", sync: true }).then( @@ -169,7 +169,7 @@ define(["dojo/_base/lang", util.showSetAttributesDialog( fields, groupProvider ? groupProvider : {}, - "rest/groupprovider" + (name ? "/" + encodeURIComponent(name.name) : ""), + "api/latest/groupprovider" + (name ? "/" + encodeURIComponent(name.name) : ""), groupProvider ? "Edit group provider - " + groupProvider.name : "Add group provider", groupProvider ? false : true); }; 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 ae54d19750..2d99f97837 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 @@ -146,7 +146,7 @@ define(["dojo/_base/lang", util.showSetAttributesDialog( keystoreAttributeWidgetFactories, keystore ? keystore : {}, - "rest/keystore" + (keystore ? "/" + encodeURIComponent(keystore.name) : ""), + "api/latest/keystore" + (keystore ? "/" + encodeURIComponent(keystore.name) : ""), keystore ? "Edit keystore - " + keystore.name : "Add keystore", keystore ? false : true); }; @@ -156,7 +156,7 @@ define(["dojo/_base/lang", util.showSetAttributesDialog( truststoreAttributeWidgetFactories, truststore ? truststore : {}, - "rest/truststore" + (truststore ? "/" + encodeURIComponent(truststore.name) : ""), + "api/latest/truststore" + (truststore ? "/" + encodeURIComponent(truststore.name) : ""), truststore ? "Edit truststore - " + truststore.name : "Add truststore", truststore ? false : true); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js index 86ded8f059..5f9c1bc810 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js @@ -297,7 +297,7 @@ define(["dojo/_base/xhr", } var that = this; - xhr.put({url: "rest/port/"+encodeURIComponent(newPort.name), sync: true, handleAs: "json", + xhr.put({url: "api/latest/port/"+encodeURIComponent(newPort.name), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, putData: json.toJson(newPort), load: function(x) {that.success = true; }, @@ -376,7 +376,7 @@ define(["dojo/_base/xhr", editWarning.style.display = "block"; xhr.get({ - url: "rest/port/" + encodeURIComponent(portName), + url: "api/latest/port/" + encodeURIComponent(portName), handleAs: "json" }).then( function(data){ diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js index 64b31309d9..5a1ea48b3e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js @@ -161,7 +161,8 @@ define(["dojo/_base/xhr", var newQueue = convertToQueue(theForm.getValues()); var that = this; - xhr.put({url: "rest/queue/"+encodeURIComponent(addQueue.vhost) + xhr.put({url: "api/latest/queue/"+encodeURIComponent(addQueue.vhostnode) + +"/"+encodeURIComponent(addQueue.vhost) +"/"+encodeURIComponent(newQueue.name), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, putData: json.toJson(newQueue), @@ -188,8 +189,9 @@ define(["dojo/_base/xhr", }); }}); - addQueue.show = function(vhost) { - addQueue.vhost = vhost; + addQueue.show = function(data) { + addQueue.vhost = data.virtualhost; + addQueue.vhostnode = data.virtualhostnode; registry.byId("formAddQueue").reset(); registry.byId("addQueue").show(); }; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js index 4873baeef7..a66dbb3cea 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js @@ -57,7 +57,7 @@ define(["dojo/_base/xhr", var convertToVirtualHost = function convertToVirtualHost(formValues) { - var newVirtualHost = {}; + var newVirtualHost = {messageStoreProvider:true}; var id = dojo.byId("formAddVirtualHost.id").value; if (id) { @@ -74,6 +74,16 @@ define(["dojo/_base/xhr", } } + //temporary hacks to verify the REST API + if (newVirtualHost.type == "STANDARD") + { + newVirtualHost.type = newVirtualHost.storeType; + delete newVirtualHost.storeType; + } + else if (newVirtualHost.type == "BDB_HA") + { + newVirtualHost.name =registry.byId("formAddVirtualHost.specific.nodeName").value; + } return newVirtualHost; } @@ -126,7 +136,7 @@ define(["dojo/_base/xhr", var newVirtualHost = convertToVirtualHost(formValues); var that = this; - xhr.put({url: "rest/virtualhost/" + encodeURIComponent(newVirtualHost.name), + xhr.put({url: "api/latest/virtualhostnode/" + encodeURIComponent(newVirtualHost.name), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, putData: json.toJson(newVirtualHost), @@ -170,7 +180,7 @@ define(["dojo/_base/xhr", { xhr.get({ sync: true, - url: "rest/helper?action=ListVirtualHostTypes", + url: "service/helper?action=ListVirtualHostTypes", handleAs: "json" }).then( function(data) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js index 09433b196d..bd45d0b488 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js @@ -135,7 +135,7 @@ define(["dojo/_base/xhr", queryParam += "id=" + data[i].id; } - var query = "rest/user/"+ encodeURIComponent(that.name) + var query = "api/latest/user/"+ encodeURIComponent(that.name) + queryParam; that.success = true xhr.del({url: query, sync: true, handleAs: "json"}).then( @@ -198,7 +198,7 @@ define(["dojo/_base/xhr", var newUser = convertToUser(theForm.getValues()); - var url = "rest/user/"+encodeURIComponent(addUser.authProvider) + + var url = "api/latest/user/"+encodeURIComponent(addUser.authProvider) + "/"+encodeURIComponent(newUser.name); xhr.put({url: url, sync: true, handleAs: "json", @@ -255,7 +255,7 @@ define(["dojo/_base/xhr", newUser.name = setPassword.name; newUser.id = setPassword.id; - var url = "rest/user/"+encodeURIComponent(setPassword.authProvider) + + var url = "api/latest/user/"+encodeURIComponent(setPassword.authProvider) + "/"+encodeURIComponent(newUser.name); xhr.put({url: url, sync: true, handleAs: "json", diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js index e7888b9807..edf534176d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js @@ -66,23 +66,18 @@ define(["dojo/dom", function generateName(obj) { if(obj) { - var name = ""; - if(obj.parent) + var name = obj.type + (obj.type == "broker" ? "" : ":" + obj.name); + if (obj.parent) { - for(var prop in obj.parent) { - if(obj.parent.hasOwnProperty(prop)) { - name = name + generateName( obj.parent[ prop ]); - } - } - + name = generateName(obj.parent) + "/" + name; } - return name + parent.type +":" + parent.name + "/" + return name; } return ""; } var that = this; - var objId = generateName(parent) + objType+":"+name; + var objId = (parent ? generateName(parent) + "/" : "") + objType + ":" + name; var obj = this.viewedObjects[ objId ]; if(obj) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js index ea918644e9..485502e81c 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js @@ -96,7 +96,7 @@ define(["dojo/_base/xhr", util.deleteGridSelections( that.groupUpdater, that.groupUpdater.groupMembersUpdatableStore.grid, - "rest/groupmember/"+ encodeURIComponent(that.getGroupProviderName()) + + "api/latest/groupmember/"+ encodeURIComponent(that.getGroupProviderName()) + "/" + encodeURIComponent(that.getGroupName()), "Are you sure you want to remove group member"); } @@ -129,7 +129,7 @@ define(["dojo/_base/xhr", "lifetimePolicy", "type"]); - this.query = "rest/groupmember/"+ encodeURIComponent(groupObj.getGroupProviderName()) + "/" + encodeURIComponent(groupObj.getGroupName()); + this.query = "api/latest/groupmember/"+ encodeURIComponent(groupObj.getGroupProviderName()) + "/" + encodeURIComponent(groupObj.getGroupName()); xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}).then(function(data) { @@ -184,7 +184,7 @@ define(["dojo/_base/xhr", Group.prototype.deleteGroupMember = function() { if(confirm("Are you sure you want to delete group member'" +this.name+"'?")) { - var query = "rest/groupmember/"+ encodeURIComponent(this.getGroupProviderName()) + "/" + encodeURIComponent(this.name); + var query = "api/latest/groupmember/"+ encodeURIComponent(this.getGroupProviderName()) + "/" + encodeURIComponent(this.name); this.success = true var that = this; xhr.del({url: query, sync: true, handleAs: "json"}).then( diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js index 1861cc6ffe..d965fd35a8 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js @@ -70,7 +70,7 @@ define(["dojo/_base/xhr", var newGroupMember = convertToGroupMember(theForm.getValues()); var that = this; - xhr.put({url: "rest/groupmember/"+encodeURIComponent(addGroupMember.groupProvider) + + xhr.put({url: "api/latest/groupmember/"+encodeURIComponent(addGroupMember.groupProvider) + "/" + encodeURIComponent(addGroupMember.group) + "/" + encodeURIComponent(newGroupMember.name), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, putData: json.toJson(newGroupMember), diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js index 670a0a893a..55d6645a49 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js @@ -77,7 +77,7 @@ define(["dojo/_base/xhr", function GroupProviderUpdater(node, groupProviderObj, controller) { this.controller = controller; - this.query = "rest/groupprovider/"+encodeURIComponent(groupProviderObj.name); + this.query = "api/latest/groupprovider/"+encodeURIComponent(groupProviderObj.name); this.name = groupProviderObj.name; var that = this; @@ -152,7 +152,7 @@ define(["dojo/_base/xhr", queryParam += "id=" + data[i].id; } - var query = "rest/group/"+ encodeURIComponent(that.name) + var query = "api/latest/group/"+ encodeURIComponent(that.name) + queryParam; that.success = true xhr.del({url: query, sync: true, handleAs: "json"}).then( @@ -226,7 +226,7 @@ define(["dojo/_base/xhr", var newGroup = convertToGroup(theForm.getValues()); - var url = "rest/group/"+encodeURIComponent(addGroup.groupProvider) + + var url = "api/latest/group/"+encodeURIComponent(addGroup.groupProvider) + "/"+encodeURIComponent(newGroup.name); xhr.put({url: url, sync: true, handleAs: "json", diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js index 95870dadf7..29054b5379 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js @@ -135,7 +135,7 @@ return declare("qpid.management.logs.LogFileDownloadDialog", null, { } query+="l="+encodeURIComponent(data[i].appenderName +'/' + data[i].name); } - window.location="rest/logfile?" + query; + window.location="service/logfile?" + query; this.logFileDialog.hide(); } }, @@ -151,7 +151,7 @@ return declare("qpid.management.logs.LogFileDownloadDialog", null, { showDialog: function(){ var self = this; - var requestArguments = {url: "rest/logfilenames", sync: true, handleAs: "json"}; + var requestArguments = {url: "service/logfilenames", sync: true, handleAs: "json"}; xhr.get(requestArguments).then(function(data){ try { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js index 7f7a8c3886..470ad28cd2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js @@ -121,7 +121,7 @@ define(["dojo/_base/xhr", updatable: false, serviceUrl: function() { - return "rest/logrecords?lastLogId=" + self.lastLogId; + return "service/logrecords?lastLogId=" + self.lastLogId; }, onUpdate: function(items) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js index 8cc488324f..f1afff9c03 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js @@ -62,7 +62,7 @@ define(["dojo/_base/xhr", moveMessages.data.destinationQueue = theForm.getValues()["queue"]; var that = this; - xhr.post({url: "rest/message/"+encodeURIComponent(moveMessages.vhost) + xhr.post({url: "service/message/"+encodeURIComponent(moveMessages.vhost) +"/"+encodeURIComponent(moveMessages.queue), sync: true, handleAs: "json", headers: { "Content-Type": "application/json"}, @@ -102,7 +102,7 @@ define(["dojo/_base/xhr", - xhr.get({url: "rest/queue/" + encodeURIComponent(obj.virtualhost) + "?depth=0", + xhr.get({url: "api/latest/queue/" + encodeURIComponent(obj.virtualhost) + "?depth=0", handleAs: "json"}).then( function(data) { var queues = []; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js index 9baf6a2b15..efe6f4eeff 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js @@ -129,14 +129,14 @@ define(["dojo/_base/xhr", util.showSetAttributesDialog( widgetFactories, data, - "rest/plugin/" + encodeURIComponent(data.name), + "api/latest/plugin/" + encodeURIComponent(data.name), "Edit plugin - " + data.name); }; function ManagementHttpUpdater(node, pluginObject, controller) { this.controller = controller; - this.query = "rest/plugin/"+encodeURIComponent(pluginObject.name); + this.query = "api/latest/plugin/"+encodeURIComponent(pluginObject.name); this.name = pluginObject.name; this.httpBasicAuthenticationEnabled = query(".httpBasicAuthenticationEnabled", node)[0]; this.httpsBasicAuthenticationEnabled = query(".httpsBasicAuthenticationEnabled", node)[0]; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js index a1eaa7c449..78d06da51f 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js @@ -85,14 +85,14 @@ define(["dojo/_base/xhr", util.showSetAttributesDialog( widgetFactories, data, - "rest/plugin/" + encodeURIComponent(data.name), + "api/latest/plugin/" + encodeURIComponent(data.name), "Edit plugin - " + data.name); }; function ManagementJmxUpdater(node, pluginObject, controller) { this.controller = controller; - this.query = "rest/plugin/"+encodeURIComponent(pluginObject.name); + this.query = "api/latest/plugin/"+encodeURIComponent(pluginObject.name); this.name = pluginObject.name; this.usePlatformMBeanServer = query(".usePlatformMBeanServer", node)[0]; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js index 1281e44166..cc6242b976 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js @@ -100,14 +100,14 @@ define(["dojo/_base/xhr", var contentField = query(".message-content", this.dialogNode)[0]; if(data.mimeType && data.mimeType.match(/text\/.*/)) { - xhr.get({url: "rest/message-content/" + encodeURIComponent(showMessage.virtualhost) + xhr.get({url: "service/message-content/" + encodeURIComponent(showMessage.virtualhost) + "/" + encodeURIComponent(showMessage.queue) + "/" + encodeURIComponent(showMessage.messageNumber), sync: true }).then(function(obj) { contentField.innerHTML = encode(obj) }); } else { - contentField.innerHTML = "<a href=\"" + "rest/message-content/" + encodeURIComponent(showMessage.virtualhost) + contentField.innerHTML = "<a href=\"" + "service/message-content/" + encodeURIComponent(showMessage.virtualhost) + "/" + encodeURIComponent(showMessage.queue) + "/" + encodeURIComponent(showMessage.messageNumber) + "\" target=\"_blank\">Download</a>"; @@ -122,7 +122,7 @@ define(["dojo/_base/xhr", showMessage.queue = obj.queue; showMessage.messageNumber = obj.messageNumber; - xhr.get({url: "rest/message/" + encodeURIComponent(obj.virtualhost) + xhr.get({url: "service/message/" + encodeURIComponent(obj.virtualhost) + "/" + encodeURIComponent(obj.queue) + "/" + encodeURIComponent(obj.messageNumber), sync: properties.useSyncGet, diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js index 5511b176a3..0a05cca75d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js @@ -223,13 +223,22 @@ define(["dojo/_base/xhr", TreeViewModel.prototype.relocate = function (theItem) { - function findItemDetails(theItem, details, type, object) { + function findItemDetails(theItem, details, type, object, parent) { if (theItem.id == object.id) { details.type = type; details[ type ] = object.name; + details.parent = parent; } else { details[ type ] = object.name; + var parentObject ={ + type: type, + name: object.name + }; + if (parent) + { + parentObject.parent = parent; + } // iterate over children for (var propName in object) { if (object.hasOwnProperty(propName)) { @@ -237,7 +246,7 @@ define(["dojo/_base/xhr", if (util.isArray(prop)) { for (var i = 0; i < prop.length; i++) { findItemDetails(theItem, details, propName.substring(0, propName.length - 1), - prop[i]); + prop[i], parentObject); if (details.type) { break; @@ -257,37 +266,36 @@ define(["dojo/_base/xhr", } var details = new Object(); - - findItemDetails(theItem, details, "broker", this.model); + findItemDetails(theItem, details, "broker", this.model, null); if (details.type == "broker") { controller.show("broker", "", null, theItem.id); } else if (details.type == "virtualhost") { - controller.show("virtualhost", details.virtualhost, {type:"broker", name:""}, theItem.id); + controller.show("virtualhost", details.virtualhost, details.parent, theItem.id); } else if (details.type == "exchange") { - controller.show("exchange", details.exchange, { type: "virtualhost", name: details.virtualhost, parent: {type:"broker", name:""}}, theItem.id); + controller.show("exchange", details.exchange, details.parent, theItem.id); } else if (details.type == "queue") { - controller.show("queue", details.queue, { type: "virtualhost", name: details.virtualhost, parent: {type:"broker", name:""}}, theItem.id); + controller.show("queue", details.queue, details.parent, theItem.id); } else if (details.type == "connection") { - controller.show("connection", details.connection, { type: "virtualhost", name: details.virtualhost, parent: {type:"broker", name:""}}, theItem.id); + controller.show("connection", details.connection, details.parent, theItem.id); } else if (details.type == 'port') { - controller.show("port", details.port, { type: "virtualhost", name: details.virtualhost, parent: {type:"broker", name:""}}, theItem.id); + controller.show("port", details.port, details.parent, theItem.id); } else if (details.type == 'authenticationprovider') { - controller.show("authenticationprovider", details.authenticationprovider, {type:"broker", name:""}, theItem.id); + controller.show("authenticationprovider", details.authenticationprovider, details.parent, theItem.id); } else if (details.type == 'groupprovider') { - controller.show("groupprovider", details.groupprovider, {type:"broker", name:""}, theItem.id); + controller.show("groupprovider", details.groupprovider, details.parent, theItem.id); } else if (details.type == 'group') { - controller.show("group", details.group, { type: "groupprovider", name: details.groupprovider, parent: {type:"broker", name:""}}, theItem.id); + controller.show("group", details.group, details.parent, theItem.id); } else if (details.type == 'keystore') { - controller.show("keystore", details.keystore, {type:"broker", name:""}, theItem.id); + controller.show("keystore", details.keystore, details.parent, theItem.id); } else if (details.type == 'truststore') { - controller.show("truststore", details.truststore, {type:"broker", name:""}, theItem.id); + controller.show("truststore", details.truststore, details.parent, theItem.id); } else if (details.type == 'accesscontrolprovider') { - controller.show("accesscontrolprovider", details.accesscontrolprovider, {type:"broker", name:""}, theItem.id); + controller.show("accesscontrolprovider", details.accesscontrolprovider, details.parent, theItem.id); } else if (details.type == 'plugin') { controller.show("plugin", details.plugin, {type:"broker", name:""}, theItem.id); } else if (details.type == "preferencesprovider") { - controller.show("preferencesprovider", details.preferencesprovider, { type: "authenticationprovider", name: details.authenticationprovider, parent: {type:"broker", name:""}}, theItem.id); + controller.show("preferencesprovider", details.preferencesprovider, details.parent, theItem.id); } }; @@ -307,7 +315,7 @@ define(["dojo/_base/xhr", }; query('div[qpid-type="treeView"]').forEach(function(node, index, arr) { - var treeModel = new TreeViewModel("rest/structure"); + var treeModel = new TreeViewModel("service/structure"); treeModel.update(); var tree = new Tree({ model: treeModel }, node); tree.on("dblclick", diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js index 164e118e09..9ceab3c411 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js @@ -66,7 +66,7 @@ define(["dojo/_base/xhr", } xhr.get({ sync: true, - url: "rest/helper?action=ListMessageStoreTypes", + url: "service/helper?action=ListMessageStoreTypes", handleAs: "json" }).then( function(data) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html index 366ef27c8a..0fab44fe84 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html @@ -41,18 +41,6 @@ <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker model version:</div> <div id="brokerAttribute.modelVersion" style="float:left;"></div> </div> - <div id="brokerAttribute.storeType.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker store type:</div> - <div id="brokerAttribute.storeType" style="float:left;"></div> - </div> - <div id="brokerAttribute.storeVersion.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker store version:</div> - <div id="brokerAttribute.storeVersion" style="float:left;"></div> - </div> - <div id="brokerAttribute.storePath.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker store location:</div> - <div id="brokerAttribute.storePath" style="float:left;"></div> - </div> <div id="brokerAttribute.defaultVirtualHost.container" style="display: none; clear:both; clear:both;"> <div class="formLabel-labelCell" style="float:left; width: 250px;">Default virtual host:</div> <div id="brokerAttribute.defaultVirtualHost" style="float:left;"></div> @@ -67,46 +55,6 @@ </div> <div style="clear:both"></div> <br/> - <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Global Queue Defaults', open: true"> - <div id="brokerAttribute.queue.alertThresholdQueueDepthMessages.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Depth messages alert threshold:</div> - <div id="brokerAttribute.queue.alertThresholdQueueDepthMessages" style="float:left;"></div> - </div> - <div id="brokerAttribute.queue.alertThresholdQueueDepthBytes.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Depth bytes alert threshold:</div> - <div id="brokerAttribute.queue.alertThresholdQueueDepthBytes" style="float:left;"></div> bytes - </div> - <div id="brokerAttribute.queue.alertThresholdMessageAge.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Message age alert threshold:</div> - <div id="brokerAttribute.queue.alertThresholdMessageAge" style="float:left;"></div> ms - </div> - <div id="brokerAttribute.queue.alertThresholdMessageSize.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Message size alert threshold:</div> - <div id="brokerAttribute.queue.alertThresholdMessageSize" style="float:left;"></div> bytes - </div> - <div id="brokerAttribute.queue.alertRepeatGap.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Alert repeat gap:</div> - <div id="brokerAttribute.queue.alertRepeatGap" style="float:left;"></div> ms - </div> - <div id="brokerAttribute.queue.maximumDeliveryAttempts.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Maximum delivery retries:</div> - <div id="brokerAttribute.queue.maximumDeliveryAttempts" style="float:left;"></div> - </div> - <div id="brokerAttribute.queue.deadLetterQueueEnabled.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Dead letter queue enabled:</div> - <div id="brokerAttribute.queue.deadLetterQueueEnabled" style="float:left;"></div> - </div> - <div id="brokerAttribute.queue.flowControlSizeBytes.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Flow control threshold:</div> - <div id="brokerAttribute.queue.flowControlSizeBytes" style="float:left;"></div> bytes - </div> - <div id="brokerAttribute.queue.flowResumeSizeBytes.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Flow resume threshold:</div> - <div id="brokerAttribute.queue.flowResumeSizeBytes" style="float:left;"></div> bytes - </div> - <div style="clear:both"></div> - </div> - <br/> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Global Connection Defaults', open: true"> <div id="brokerAttribute.connection.sessionCountLimit.container" style="clear:both"> <div class="formLabel-labelCell" style="float:left; width: 240px;">Maximum number of sessions:</div> @@ -118,30 +66,6 @@ </div> <div style="clear:both"></div> </div> - <br/> - <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Global Virtual Host Defaults', open: true"> - <div id="brokerAttribute.virtualhost.housekeepingCheckPeriod.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">House keeping check period:</div> - <div id="brokerAttribute.virtualhost.housekeepingCheckPeriod" style="float:left;"></div>ms - </div> - <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutClose.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Idle store transaction close timeout:</div> - <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutClose" style="float:left;"></div>ms - </div> - <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutWarn.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Idle store transaction warn timeout:</div> - <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutWarn" style="float:left;"></div>ms - </div> - <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutClose.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Open store transaction close timeout:</div> - <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutClose" style="float:left;"></div>ms - </div> - <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutWarn.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Open store transaction warn timeout:</div> - <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutWarn" style="float:left;"></div>ms - </div> - <div style="clear:both"></div> - </div> </div> <br/> <button data-dojo-type="dijit.form.Button" class="editBroker">Edit</button> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html index 69856365db..93a802c37e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html @@ -86,44 +86,5 @@ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Connections'"> <div class="connections"></div> </div> - <br/> - <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Thresholds', open: false"> - <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div> - <div style="float:left;"> - <span class="alertThresholdQueueDepthMessages"></span> - <span>msgs</span> - </div> - </div> - <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div> - <div style="float:left;"> - <span class="alertThresholdQueueDepthBytes"></span> - <span class="alertThresholdQueueDepthBytesUnits"></span> - </div> - </div> - <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Message Age:</div> - <div style="float:left;"> - <span class="alertThresholdMessageAge"></span> - <span class="alertThresholdMessageAgeUnits"></span> - </div> - </div> - <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Message Size:</div> - <div style="float:left;"> - <span class="alertThresholdMessageSize"></span> - <span class="alertThresholdMessageSizeUnits"></span> - </div> - </div> - <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Alert frequency:</div> - <div style="float:left;"> - <span class="alertRepeatGap"></span> - <span class="alertRepeatGapUnits"></span> - </div> - </div> - <div style="clear:both"></div> - </div> </div> |