Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js Fri May 2 15:29:48 2014 @@ -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) {
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js Fri May 2 15:29:48 2014 @@ -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), Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addGroupProvider.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=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); }; Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js Fri May 2 15:29:48 2014 @@ -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); }; Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPort.js Fri May 2 15:29:48 2014 @@ -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){ Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js Fri May 2 15:29:48 2014 @@ -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(); }; Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js Fri May 2 15:29:48 2014 @@ -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) { Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.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/PrincipalDatabaseAuthenticationManager.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js Fri May 2 15:29:48 2014 @@ -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", Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js Fri May 2 15:29:48 2014 @@ -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) { Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js Fri May 2 15:29:48 2014 @@ -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( Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/addGroupMember.js Fri May 2 15:29:48 2014 @@ -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), Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.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/FileGroupManager.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/FileGroupManager.js Fri May 2 15:29:48 2014 @@ -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", Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js Fri May 2 15:29:48 2014 @@ -135,7 +135,7 @@ return declare("qpid.management.logs.Log } 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.Log 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 { Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js Fri May 2 15:29:48 2014 @@ -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) { Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js Fri May 2 15:29:48 2014 @@ -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 = []; Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.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/managementhttp.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js Fri May 2 15:29:48 2014 @@ -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]; Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.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/managementjmx.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js Fri May 2 15:29:48 2014 @@ -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]; } Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/showMessage.js Fri May 2 15:29:48 2014 @@ -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, Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/treeView.js Fri May 2 15:29:48 2014 @@ -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", Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.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/standard/addVirtualHost.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js Fri May 2 15:29:48 2014 @@ -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) { Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html Fri May 2 15:29:48 2014 @@ -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> Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html?rev=1591949&r1=1591948&r2=1591949&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html Fri May 2 15:29:48 2014 @@ -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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
