qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1591949 [1/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/virtualhost/bdb_ha/ broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/ broker-plugins/management-http/src/main/java/resour...
Date Fri, 02 May 2014 15:29:49 GMT
Author: orudyy
Date: Fri May  2 15:29:48 2014
New Revision: 1591949

URL: http://svn.apache.org/r1591949
Log:
QPID-5744: Change web management console to call management REST API under /api/latest and auxiliary REST services under /service. Fix broken UI.

Modified:
    qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html Fri May  2 15:29:48 2014
@@ -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>

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js Fri May  2 15:29:48 2014
@@ -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) {

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html Fri May  2 15:29:48 2014
@@ -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>

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js Fri May  2 15:29:48 2014
@@ -63,6 +63,8 @@ var errorHandler = function errorHandler
     }
 }
 
+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,
     // 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(u
 {
             dojo.xhrPost({
                 // The URL of the request
-                url: "rest/sasl",
+                url: saslServiceUrl,
                 content: {
                     mechanism: saslMechanism
                 },
@@ -110,7 +112,7 @@ var saslCramMD5 = function saslCramMD5(u
 
                     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(u
                         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(u
                                 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(usern
 SaslClient.getUser = function(callbackFunction)
 {
     dojo.xhrGet({
-        url: "rest/sasl",
+        url: saslServiceUrl,
         handleAs: "json",
         failOk: true
     }).then(callbackFunction, errorHandler);

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js Fri May  2 15:29:48 2014
@@ -47,7 +47,7 @@ define(["dojo/_base/xhr", "dojo/domReady
           {
             xhr.get({
               sync: true,
-              url: "rest/helper?action=version",
+              url: "service/helper?action=version",
               handleAs: "json"
              }).then(function(version) {
                qpidVersion = version;

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/timezone.js Fri May  2 15:29:48 2014
@@ -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)

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js Fri May  2 15:29:48 2014
@@ -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;
 

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js Fri May  2 15:29:48 2014
@@ -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;
 

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Fri May  2 15:29:48 2014
@@ -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;

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js Fri May  2 15:29:48 2014
@@ -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)
                                {

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js Fri May  2 15:29:48 2014
@@ -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(

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/GroupProvider.js Fri May  2 15:29:48 2014
@@ -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;
 

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js Fri May  2 15:29:48 2014
@@ -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;
            }
 

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Plugin.js Fri May  2 15:29:48 2014
@@ -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;

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js Fri May  2 15:29:48 2014
@@ -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];

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js Fri May  2 15:29:48 2014
@@ -174,7 +174,7 @@ function (declare, xhr, event, connect, 
       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, 
     {
       var that = this;
       xhr.get({
-        url: "rest/userpreferences",
+        url: "service/userpreferences",
         sync: false,
         handleAs: "json"
       }).then(

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js Fri May  2 15:29:48 2014
@@ -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) {

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProviderFields.js Fri May  2 15:29:48 2014
@@ -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"},

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js Fri May  2 15:29:48 2014
@@ -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(

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js Fri May  2 15:29:48 2014
@@ -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;
            }
 

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js Fri May  2 15:29:48 2014
@@ -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"},

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Fri May  2 15:29:48 2014
@@ -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();

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/AclFile.js Fri May  2 15:29:48 2014
@@ -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];
         }

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js Fri May  2 15:29:48 2014
@@ -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);
         };

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1591949&r1=1591948&r2=1591949&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js Fri May  2 15:29:48 2014
@@ -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) {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message