Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js (original) +++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js Fri Apr 29 11:04:40 2016 @@ -26,196 +26,239 @@ define(["dojo/_base/connect", "dojox/grid/EnhancedGrid", "qpid/common/UpdatableStore", "qpid/common/util", - "dojo/domReady!"], - function (connect, entities, query, json, registry, EnhancedGrid, UpdatableStore, util) - { - var priorityNames = {'_0': 'Never', '_1': 'Default', '_2': 'High', '_3': 'Highest'}; - var nodeFields = ["storePath", "groupName", "role", "address", "designatedPrimary", "priority", "quorumOverride"]; - - function findNode(nodeClass, containerNode) - { - return query("." + nodeClass, containerNode)[0]; - } - - function getModelObj(nodeName, remoteNodeName, modelObj) - { - if (nodeName == remoteNodeName) - { - return modelObj; - } - else - { - return {name: remoteNodeName, type: "remotereplicationnode", parent : modelObj}; - } - } - - function BDBHA(data) - { - this.parent = data.parent; - var that = this; - util.buildUI(data.containerNode, data.parent, "virtualhostnode/bdb_ha/show.html", nodeFields, this, function(){that._postParse(data);}); - }; - BDBHA.prototype._postParse = function(data) - { - var that = this; - var containerNode = data.containerNode; - this.management = data.parent.management; - this.designatedPrimaryContainer = findNode("designatedPrimaryContainer", containerNode); - this.priorityContainer = findNode("priorityContainer", containerNode); - this.quorumOverrideContainer = findNode("quorumOverrideContainer", containerNode); - this.permittedNodes = query(".permittedNodes", containerNode)[0]; - this.membersGridPanel = registry.byNode(query(".membersGridPanel", containerNode)[0]); - this.membersGrid = new UpdatableStore([], - findNode("groupMembers", containerNode), - [ - { name: 'Name', field: 'name', width: '10%' }, - { name: 'Role', field: 'role', width: '15%' }, - { name: 'Address', field: 'address', width: '30%' }, - { name: 'Join Time', field: 'joinTime', width: '25%', - formatter: function(value){ - return value ? that.management.userPreferences.formatDateTime(value) : ""; - }}, - { name: 'Replication Transaction ID', field: 'lastKnownReplicationTransactionId', width: '20%', formatter: function(value){ return value > 0 ? value : "N/A";} } - ], - null, - { - selectionMode: "single", - keepSelection: true, - plugins: { - indirectSelection: true - } - }, - EnhancedGrid, true ); - - this.removeNodeButton = registry.byNode(query(".removeNodeButton", containerNode)[0]); - this.transferMasterButton = registry.byNode(query(".transferMasterButton", containerNode)[0]); - this.transferMasterButton.set("disabled", true); - this.removeNodeButton.set("disabled", true); - - var nodeControlsToggler = function(rowIndex) - { - var data = that.membersGrid.grid.selection.getSelected(); - that.transferMasterButton.set("disabled", data.length != 1|| data[0].role != "REPLICA"); - that.removeNodeButton.set("disabled", data.length != 1 || data[0].role == "MASTER"); - }; - connect.connect(this.membersGrid.grid.selection, 'onSelected', nodeControlsToggler); - connect.connect(this.membersGrid.grid.selection, 'onDeselected', nodeControlsToggler); - - var modelObj = data.parent.modelObj; - this.transferMasterButton.on("click", - function(e) - { - var data = that.membersGrid.grid.selection.getSelected(); - if (data.length == 1 && confirm("Are you sure you would like to transfer mastership to node '" + data[0].name + "'?")) - { - that.management.update(getModelObj(that.data.name, data[0].name, modelObj), {role: "MASTER"}).then( - function(data){that.membersGrid.grid.selection.clear();}); - } - } - ); - - this.removeNodeButton.on("click", - function(e){ - var data = that.membersGrid.grid.selection.getSelected(); - if (data.length == 1 && confirm("Are you sure you would like to delete node '" + data[0].name + "'?")) - { - that.management.remove(getModelObj(that.data.name, data[0].name, modelObj)).then( - function(data){ - that.membersGrid.grid.selection.clear(); - if (data[0].name == that.data.name) - { - that.parent.destroy(); - } - }, util.xhrErrorHandler); - } - } - ); - this._parsed = true; - } - - BDBHA.prototype.update=function(data) - { - if(!this._parsed) - { - return; - } - - this.parent.editNodeButton.set("disabled", false); - - - var permittedNodesMarkup = ""; - if (data.permittedNodes) - { - for(var i=0;i<data.permittedNodes.length;i++) - { - permittedNodesMarkup+="<div>" + data.permittedNodes[i] + "</div>"; - } - } - this.permittedNodes.innerHTML = permittedNodesMarkup ; - - this.data = data; - for(var i = 0; i < nodeFields.length; i++) - { - var name = nodeFields[i]; - if (name == "priority") - { - this[name].innerHTML = priorityNames["_" + data[name]]; - } - else if (name == "quorumOverride") - { - this[name].innerHTML = (data[name] == 0 ? "MAJORITY" : entities.encode(String(data[name]))); - } - else - { - this[name].innerHTML = entities.encode(String(data[name])); - } - } - - var members = data.remotereplicationnodes; - if (members) - { - members.push({ - id: data.id, - name: data.name, - groupName: data.groupName, - address: data.address, - role: data.role, - joinTime: data.joinTime, - lastKnownReplicationTransactionId: data.lastKnownReplicationTransactionId - }); - } - this._updateGrid(members, this.membersGridPanel, this.membersGrid); - - if (!members || members.length < 3) - { - this.designatedPrimaryContainer.style.display="block"; - this.priorityContainer.style.display="none"; - this.quorumOverrideContainer.style.display="none"; - } - else - { - this.designatedPrimaryContainer.style.display="none"; - this.priorityContainer.style.display="block"; - this.quorumOverrideContainer.style.display="block"; - } - }; - - BDBHA.prototype._updateGrid=function(conf, panel, updatableGrid) - { - if (conf && conf.length > 0) - { - panel.domNode.style.display="block"; - var changed = updatableGrid.update(conf); - if (changed) - { - updatableGrid.grid._refresh(); - } - } - else - { - panel.domNode.style.display="none"; - } - } + "dojo/domReady!"], function (connect, entities, query, json, registry, EnhancedGrid, UpdatableStore, util) + { + var priorityNames = { + '_0': 'Never', + '_1': 'Default', + '_2': 'High', + '_3': 'Highest' + }; + var nodeFields = ["storePath", + "groupName", + "role", + "address", + "designatedPrimary", + "priority", + "quorumOverride"]; + + function findNode(nodeClass, containerNode) + { + return query("." + nodeClass, containerNode)[0]; + } + + function getModelObj(nodeName, remoteNodeName, modelObj) + { + if (nodeName == remoteNodeName) + { + return modelObj; + } + else + { + return { + name: remoteNodeName, + type: "remotereplicationnode", + parent: modelObj + }; + } + } + + function BDBHA(data) + { + this.parent = data.parent; + var that = this; + util.buildUI(data.containerNode, + data.parent, + "virtualhostnode/bdb_ha/show.html", + nodeFields, + this, + function () + { + that._postParse(data); + }); + }; + BDBHA.prototype._postParse = function (data) + { + var that = this; + var containerNode = data.containerNode; + this.management = data.parent.management; + this.designatedPrimaryContainer = findNode("designatedPrimaryContainer", containerNode); + this.priorityContainer = findNode("priorityContainer", containerNode); + this.quorumOverrideContainer = findNode("quorumOverrideContainer", containerNode); + this.permittedNodes = query(".permittedNodes", containerNode)[0]; + this.membersGridPanel = registry.byNode(query(".membersGridPanel", containerNode)[0]); + this.membersGrid = new UpdatableStore([], findNode("groupMembers", containerNode), [{ + name: 'Name', + field: 'name', + width: '10%' + }, + { + name: 'Role', + field: 'role', + width: '15%' + }, + { + name: 'Address', + field: 'address', + width: '30%' + }, + { + name: 'Join Time', + field: 'joinTime', + width: '25%', + formatter: function (value) + { + return value ? that.management.userPreferences.formatDateTime(value) : ""; + } + }, + { + name: 'Replication Transaction ID', + field: 'lastKnownReplicationTransactionId', + width: '20%', + formatter: function (value) + { + return value > 0 ? value : "N/A"; + } + }], null, { + selectionMode: "single", + keepSelection: true, + plugins: { + indirectSelection: true + } + }, EnhancedGrid, true); + + this.removeNodeButton = registry.byNode(query(".removeNodeButton", containerNode)[0]); + this.transferMasterButton = registry.byNode(query(".transferMasterButton", containerNode)[0]); + this.transferMasterButton.set("disabled", true); + this.removeNodeButton.set("disabled", true); + + var nodeControlsToggler = function (rowIndex) + { + var data = that.membersGrid.grid.selection.getSelected(); + that.transferMasterButton.set("disabled", data.length != 1 || data[0].role != "REPLICA"); + that.removeNodeButton.set("disabled", data.length != 1 || data[0].role == "MASTER"); + }; + connect.connect(this.membersGrid.grid.selection, 'onSelected', nodeControlsToggler); + connect.connect(this.membersGrid.grid.selection, 'onDeselected', nodeControlsToggler); + + var modelObj = data.parent.modelObj; + this.transferMasterButton.on("click", function (e) + { + var data = that.membersGrid.grid.selection.getSelected(); + if (data.length == 1 && confirm("Are you sure you would like to transfer mastership to node '" + + data[0].name + "'?")) + { + that.management.update(getModelObj(that.data.name, data[0].name, modelObj), {role: "MASTER"}) + .then(function (data) + { + that.membersGrid.grid.selection.clear(); + }); + } + }); + + this.removeNodeButton.on("click", function (e) + { + var data = that.membersGrid.grid.selection.getSelected(); + if (data.length == 1 && confirm("Are you sure you would like to delete node '" + data[0].name + + "'?")) + { + that.management.remove(getModelObj(that.data.name, data[0].name, modelObj)).then(function (data) + { + that.membersGrid.grid.selection.clear(); + if (data[0].name + == that.data.name) + { + that.parent.destroy(); + } + }, + util.xhrErrorHandler); + } + }); + this._parsed = true; + } + + BDBHA.prototype.update = function (data) + { + if (!this._parsed) + { + return; + } + + this.parent.editNodeButton.set("disabled", false); + + var permittedNodesMarkup = ""; + if (data.permittedNodes) + { + for (var i = 0; i < data.permittedNodes.length; i++) + { + permittedNodesMarkup += "<div>" + data.permittedNodes[i] + "</div>"; + } + } + this.permittedNodes.innerHTML = permittedNodesMarkup; + + this.data = data; + for (var i = 0; i < nodeFields.length; i++) + { + var name = nodeFields[i]; + if (name == "priority") + { + this[name].innerHTML = priorityNames["_" + data[name]]; + } + else if (name == "quorumOverride") + { + this[name].innerHTML = (data[name] == 0 ? "MAJORITY" : entities.encode(String(data[name]))); + } + else + { + this[name].innerHTML = entities.encode(String(data[name])); + } + } + + var members = data.remotereplicationnodes; + if (members) + { + members.push({ + id: data.id, + name: data.name, + groupName: data.groupName, + address: data.address, + role: data.role, + joinTime: data.joinTime, + lastKnownReplicationTransactionId: data.lastKnownReplicationTransactionId + }); + } + this._updateGrid(members, this.membersGridPanel, this.membersGrid); + + if (!members || members.length < 3) + { + this.designatedPrimaryContainer.style.display = "block"; + this.priorityContainer.style.display = "none"; + this.quorumOverrideContainer.style.display = "none"; + } + else + { + this.designatedPrimaryContainer.style.display = "none"; + this.priorityContainer.style.display = "block"; + this.quorumOverrideContainer.style.display = "block"; + } + }; + + BDBHA.prototype._updateGrid = function (conf, panel, updatableGrid) + { + if (conf && conf.length > 0) + { + panel.domNode.style.display = "block"; + var changed = updatableGrid.update(conf); + if (changed) + { + updatableGrid.grid._refresh(); + } + } + else + { + panel.domNode.style.display = "none"; + } + } - return BDBHA; -}); + return BDBHA; + });
Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js Fri Apr 29 11:04:40 2016 @@ -27,19 +27,19 @@ define(["dojo/_base/xhr", "qpid/common/util", "dijit/form/ValidationTextBox", "dijit/form/NumberTextBox", - "dojo/domReady!"], - function (xhr, parser, dom, domConstruct, json, registry, template, util) - { - return { - show: function (data) - { - this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode).then(function(instances) - { - registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); - registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); - }); - } - }; - } -); + "dojo/domReady!"], function (xhr, parser, dom, domConstruct, json, registry, template, util) + { + return { + show: function (data) + { + this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); + parser.parse(this.containerNode).then(function (instances) + { + registry.byId("addVirtualHost.storeUnderfullSize") + .set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("addVirtualHost.storeOverfullSize") + .set("regExpGen", util.numericOrContextVarRegexp); + }); + } + }; + }); Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js Fri Apr 29 11:04:40 2016 @@ -16,19 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], - function (util, registry) - { - return { - show: function(data) - { - util.parseHtmlIntoDiv(data.containerNode, "virtualhost/sizemonitoring/edit.html", - function() - { - registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); - registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); - }); - } - }; - } -); +define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], function (util, registry) +{ + return { + show: function (data) + { + util.parseHtmlIntoDiv(data.containerNode, "virtualhost/sizemonitoring/edit.html", function () + { + registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + }); + } + }; +}); Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/show.js (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/show.js Fri Apr 29 11:04:40 2016 @@ -17,10 +17,8 @@ * under the License. */ -define(["qpid/common/util", - "dojo/domReady!"], - function (util) - { +define(["qpid/common/util", "dojo/domReady!"], function (util) +{ var fields = ["storePath", "storeUnderfullSize", "storeOverfullSize"]; function Derby(data) @@ -28,11 +26,10 @@ define(["qpid/common/util", util.buildUI(data.containerNode, data.parent, "virtualhost/sizemonitoring/show.html", fields, this); } - Derby.prototype.update = function(data) + Derby.prototype.update = function (data) { util.updateUI(data, fields, this); } return Derby; - } -); +}); Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/add.js (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/add.js Fri Apr 29 11:04:40 2016 @@ -27,15 +27,13 @@ define(["dojo/_base/xhr", "dojo/text!virtualhostnode/derby/add.html", "dijit/form/ValidationTextBox", "dijit/form/CheckBox", - "dojo/domReady!"], - function (xhr, parser, dom, domConstruct, json, registry, template) - { - return { - show: function (data) - { - this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode); - } - }; - } -); + "dojo/domReady!"], function (xhr, parser, dom, domConstruct, json, registry, template) + { + return { + show: function (data) + { + this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); + parser.parse(this.containerNode); + } + }; + }); Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js Fri Apr 29 11:04:40 2016 @@ -16,18 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], - function (util, registry) - { - return { - show: function(data) - { - util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html", - function() - { +define(["qpid/common/util", "dijit/registry", "dojo/domReady!"], function (util, registry) +{ + return { + show: function (data) + { + util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html", function () + { registry.byId("editVirtualHostNode.storePath").set("disabled", data.data.state != "STOPPED"); - }); - } - }; - } -); + }); + } + }; +}); Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/show.js Fri Apr 29 11:04:40 2016 @@ -18,21 +18,20 @@ * under the License. * */ -define(["qpid/common/util", "dojo/domReady!"], - function (util) - { +define(["qpid/common/util", "dojo/domReady!"], function (util) +{ var fields = ["storePath"]; function DerbyNode(data) { - this.parent = data.parent; - util.buildUI(data.containerNode, data.parent, "virtualhostnode/derby/show.html", fields, this); + this.parent = data.parent; + util.buildUI(data.containerNode, data.parent, "virtualhostnode/derby/show.html", fields, this); } - DerbyNode.prototype.update=function(data) + DerbyNode.prototype.update = function (data) { - this.parent.editNodeButton.set("disabled", !(data.state == "STOPPED" || data.state == "ERRORED")); - util.updateUI(data, fields, this); + this.parent.editNodeButton.set("disabled", !(data.state == "STOPPED" || data.state == "ERRORED")); + util.updateUI(data, fields, this); }; return DerbyNode; Modified: qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js Fri Apr 29 11:04:40 2016 @@ -31,14 +31,16 @@ define(["dojo/_base/xhr", "dojo/store/Memory", "dijit/form/FilteringSelect", "dojo/domReady!"], - function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) { - return { - show: function(data) { - data.context.addInheritedContext({ - "qpid.jdbcstore.bonecp.partitionCount": "4", - "qpid.jdbcstore.bonecp.minConnectionsPerPartition": "5", - "qpid.jdbcstore.bonecp.maxConnectionsPerPartition": "10" - }); - } - }; - }); + function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) + { + return { + show: function (data) + { + data.context.addInheritedContext({ + "qpid.jdbcstore.bonecp.partitionCount": "4", + "qpid.jdbcstore.bonecp.minConnectionsPerPartition": "5", + "qpid.jdbcstore.bonecp.maxConnectionsPerPartition": "10" + }); + } + }; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/edit.js Fri Apr 29 11:04:40 2016 @@ -25,9 +25,11 @@ define(["dojo/_base/xhr", "dijit/registry", "dojo/parser", "qpid/common/util", - "dojo/domReady!"], - function (xhr, dom, construct, win, registry, parser, util) { - return { - show: function(data) { } - }; - }); + "dojo/domReady!"], function (xhr, dom, construct, win, registry, parser, util) + { + return { + show: function (data) + { + } + }; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/show.js Fri Apr 29 11:04:40 2016 @@ -18,45 +18,45 @@ * under the License. * */ -define(["dojo/_base/xhr", - "dojo/parser", - "dojox/html/entities", - "dojo/query", - "dojo/domReady!"], - function (xhr, parser, entities, query) - { - var fieldNames = ["maxConnectionsPerPartition", "minConnectionsPerPartition", "partitionCount"]; +define(["dojo/_base/xhr", "dojo/parser", "dojox/html/entities", "dojo/query", "dojo/domReady!"], + function (xhr, parser, entities, query) + { + var fieldNames = ["maxConnectionsPerPartition", "minConnectionsPerPartition", "partitionCount"]; - function BoneCP(data) - { - var containerNode = data.containerNode; - this.parent = data.parent; - var that = this; - xhr.get({url: "store/pool/bonecp/show.html", - sync: true, - load: function(template) { - containerNode.innerHTML = template; - parser.parse(containerNode).then(function(instances) - { - for(var i=0; i<fieldNames.length;i++) - { - var fieldName = fieldNames[i]; - that[fieldName]= query("." + fieldName, containerNode)[0]; - } - }); - }}); - } + function BoneCP(data) + { + var containerNode = data.containerNode; + this.parent = data.parent; + var that = this; + xhr.get({ + url: "store/pool/bonecp/show.html", + sync: true, + load: function (template) + { + containerNode.innerHTML = template; + parser.parse(containerNode).then(function (instances) + { + for (var i = 0; i < fieldNames.length; i++) + { + var fieldName = fieldNames[i]; + that[fieldName] = + query("." + fieldName, containerNode)[0]; + } + }); + } + }); + } - BoneCP.prototype.update=function(data) - { + BoneCP.prototype.update = function (data) + { - for(var i=0; i<fieldNames.length;i++) - { - var fieldName = fieldNames[i]; - var value = data && data.context ? data.context["qpid.jdbcstore.bonecp."+fieldName] : ""; - this[fieldName].innerHTML= value?entities.encode(String(value)):""; - } - }; + for (var i = 0; i < fieldNames.length; i++) + { + var fieldName = fieldNames[i]; + var value = data && data.context ? data.context["qpid.jdbcstore.bonecp." + fieldName] : ""; + this[fieldName].innerHTML = value ? entities.encode(String(value)) : ""; + } + }; - return BoneCP; -}); + return BoneCP; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js Fri Apr 29 11:04:40 2016 @@ -31,11 +31,12 @@ define(["dojo/_base/xhr", "dojo/store/Memory", "dijit/form/FilteringSelect", "dojo/domReady!"], - function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) { - return { - show: function(data) - { - data.context.removeDynamicallyAddedInheritedContext(); - } - }; - }); + function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) + { + return { + show: function (data) + { + data.context.removeDynamicallyAddedInheritedContext(); + } + }; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/edit.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/edit.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/edit.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/edit.js Fri Apr 29 11:04:40 2016 @@ -18,9 +18,11 @@ * under the License. * */ -define([], - function () - { - return {show: function(data) {}}; - } -); +define([], function () +{ + return { + show: function (data) + { + } + }; +}); Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/show.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/show.js Fri Apr 29 11:04:40 2016 @@ -18,14 +18,13 @@ * under the License. * */ -define([], - function () - { +define([], function () +{ function NonePool(data) { } - NonePool.prototype.update=function(data) + NonePool.prototype.update = function (data) { }; Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js Fri Apr 29 11:04:40 2016 @@ -30,57 +30,60 @@ define(["dojo/_base/xhr", "dijit/form/ValidationTextBox", "dijit/form/CheckBox", "dojo/domReady!"], - function (xhr, array, parser, dom, domConstruct, json, string, Memory, registry, template, util) - { - return { - show: function (data) - { - var that = this; - this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode).then(function(instances) - { - that._postParse(data); - }); - }, - _postParse: function (data) - { - var that = this; - registry.byId("addVirtualHost.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); - registry.byId("addVirtualHost.username").set("regExpGen", util.nameOrContextVarRegexp); + function (xhr, array, parser, dom, domConstruct, json, string, Memory, registry, template, util) + { + return { + show: function (data) + { + var that = this; + this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); + parser.parse(this.containerNode).then(function (instances) + { + that._postParse(data); + }); + }, + _postParse: function (data) + { + var that = this; + registry.byId("addVirtualHost.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); + registry.byId("addVirtualHost.username").set("regExpGen", util.nameOrContextVarRegexp); - var typeMetaData = data.metadata.getMetaData("VirtualHost", "JDBC"); - var poolTypes = typeMetaData.attributes.connectionPoolType.validValues; - var poolTypesData = []; - array.forEach(poolTypes, - function(item) - { - poolTypesData.push({id: item, name: item}); - } - ); + var typeMetaData = data.metadata.getMetaData("VirtualHost", "JDBC"); + var poolTypes = typeMetaData.attributes.connectionPoolType.validValues; + var poolTypesData = []; + array.forEach(poolTypes, function (item) + { + poolTypesData.push({ + id: item, + name: item + }); + }); - var poolTypesStore = new Memory({ data: poolTypesData }); - var poolTypeControl = registry.byId("addVirtualHost.connectionPoolType"); - poolTypeControl.set("store", poolTypesStore); - poolTypeControl.set("value", "NONE"); + var poolTypesStore = new Memory({data: poolTypesData}); + var poolTypeControl = registry.byId("addVirtualHost.connectionPoolType"); + poolTypeControl.set("store", poolTypesStore); + poolTypeControl.set("value", "NONE"); - var poolTypeFieldsDiv = dom.byId("addVirtualHost.poolSpecificDiv"); - poolTypeControl.on("change", - function(type) - { - if(type && string.trim(type) != "") - { - var widgets = registry.findWidgets(poolTypeFieldsDiv); - array.forEach(widgets, function(item) { item.destroyRecursive();}); - domConstruct.empty(poolTypeFieldsDiv); - require(["qpid/management/store/pool/"+type.toLowerCase()+"/add"], - function(poolType) - { - poolType.show({containerNode:poolTypeFieldsDiv, context: data.parent.virtualHostContext}); - }); - } - } - ); - } - }; - } -); + var poolTypeFieldsDiv = dom.byId("addVirtualHost.poolSpecificDiv"); + poolTypeControl.on("change", function (type) + { + if (type && string.trim(type) != "") + { + var widgets = registry.findWidgets(poolTypeFieldsDiv); + array.forEach(widgets, function (item) + { + item.destroyRecursive(); + }); + domConstruct.empty(poolTypeFieldsDiv); + require(["qpid/management/store/pool/" + type.toLowerCase() + "/add"], function (poolType) + { + poolType.show({ + containerNode: poolTypeFieldsDiv, + context: data.parent.virtualHostContext + }); + }); + } + }); + } + }; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js Fri Apr 29 11:04:40 2016 @@ -24,62 +24,67 @@ define(["qpid/common/util", "dojo/dom", "dojo/dom-construct", "dijit/registry", - "dojo/domReady!"], - function (util, array, json, string, Memory, dom, domConstruct, registry) - { - - return { - show: function(data) - { - var that = this; - util.parseHtmlIntoDiv(data.containerNode, "virtualhost/jdbc/edit.html", - function(){that._postParse(data)}); - }, - _postParse: function(data) - { - registry.byId("editVirtualHost.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); - registry.byId("editVirtualHost.username").set("regExpGen", util.nameOrContextVarRegexp); - - var typeMetaData = data.metadata.getMetaData("VirtualHost", "JDBC"); - var poolTypes = typeMetaData.attributes.connectionPoolType.validValues; - var poolTypesData = []; - array.forEach(poolTypes, - function(item) - { - poolTypesData.push({id: item, name: item}); - } - ); - - var poolTypesStore = new Memory({ data: poolTypesData }); - var poolTypeControl = registry.byId("editVirtualHost.connectionPoolType"); - poolTypeControl.set("store", poolTypesStore); - poolTypeControl.set("value", data.data.connectionPoolType); - - var passwordControl = registry.byId("editVirtualHost.password"); - if (data.data.password) - { - passwordControl.set("placeHolder", "*******"); - } - - var poolTypeFieldsDiv = dom.byId("editVirtualHost.poolSpecificDiv"); - poolTypeControl.on("change", - function(type) - { - if(type && string.trim(type) != "") - { - var widgets = registry.findWidgets(poolTypeFieldsDiv); - array.forEach(widgets, function(item) { item.destroyRecursive();}); - domConstruct.empty(poolTypeFieldsDiv); - - require(["qpid/management/store/pool/"+type.toLowerCase()+"/edit"], - function(poolType) - { - poolType.show({containerNode:poolTypeFieldsDiv, data: data.data, context: data.parent.context}) - }); - } - } - ); - } - }; - } -); + "dojo/domReady!"], function (util, array, json, string, Memory, dom, domConstruct, registry) + { + + return { + show: function (data) + { + var that = this; + util.parseHtmlIntoDiv(data.containerNode, "virtualhost/jdbc/edit.html", function () + { + that._postParse(data) + }); + }, + _postParse: function (data) + { + registry.byId("editVirtualHost.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); + registry.byId("editVirtualHost.username").set("regExpGen", util.nameOrContextVarRegexp); + + var typeMetaData = data.metadata.getMetaData("VirtualHost", "JDBC"); + var poolTypes = typeMetaData.attributes.connectionPoolType.validValues; + var poolTypesData = []; + array.forEach(poolTypes, function (item) + { + poolTypesData.push({ + id: item, + name: item + }); + }); + + var poolTypesStore = new Memory({data: poolTypesData}); + var poolTypeControl = registry.byId("editVirtualHost.connectionPoolType"); + poolTypeControl.set("store", poolTypesStore); + poolTypeControl.set("value", data.data.connectionPoolType); + + var passwordControl = registry.byId("editVirtualHost.password"); + if (data.data.password) + { + passwordControl.set("placeHolder", "*******"); + } + + var poolTypeFieldsDiv = dom.byId("editVirtualHost.poolSpecificDiv"); + poolTypeControl.on("change", function (type) + { + if (type && string.trim(type) != "") + { + var widgets = registry.findWidgets(poolTypeFieldsDiv); + array.forEach(widgets, function (item) + { + item.destroyRecursive(); + }); + domConstruct.empty(poolTypeFieldsDiv); + + require(["qpid/management/store/pool/" + type.toLowerCase() + "/edit"], function (poolType) + { + poolType.show({ + containerNode: poolTypeFieldsDiv, + data: data.data, + context: data.parent.context + }) + }); + } + }); + } + }; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/show.js Fri Apr 29 11:04:40 2016 @@ -19,46 +19,58 @@ * */ define(["qpid/common/util", "dojo/query", "dojo/_base/array", "dojo/dom-construct", "dijit/registry", "dojo/domReady!"], - function (util, query, array, domConstruct, registry) - { - var fieldNames = ["connectionUrl", "username", "connectionPoolType"]; + function (util, query, array, domConstruct, registry) + { + var fieldNames = ["connectionUrl", "username", "connectionPoolType"]; - function JDBC(data) - { - var that = this; - util.buildUI(data.containerNode, data.parent, "virtualhostnode/jdbc/show.html", fieldNames, this, function() - { - that.usernameAttributeContainer=query(".usernameAttributeContainer", data.containerNode)[0]; - that.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer", data.containerNode)[0]; - }); - } + function JDBC(data) + { + var that = this; + util.buildUI(data.containerNode, + data.parent, + "virtualhostnode/jdbc/show.html", + fieldNames, + this, + function () + { + that.usernameAttributeContainer = + query(".usernameAttributeContainer", data.containerNode)[0]; + that.connectionPoolTypeAttributeContainer = + query(".connectionPoolTypeAttributeContainer", data.containerNode)[0]; + }); + } - JDBC.prototype.update = function(data) - { - var previousConnectionPoolType = this.connectionPoolType ? this.connectionPoolType.innerHTML : null; - util.updateUI(data, fieldNames, this); - this.usernameAttributeContainer.style.display = data.username ? "block" : "none"; - if (data.connectionPoolType && (!this.poolDetails || previousConnectionPoolType != data.connectionPoolType)) - { - var that = this; - require(["qpid/management/store/pool/" + data.connectionPoolType.toLowerCase() + "/show"], - function(PoolDetails) - { - var widgets = registry.findWidgets(that.connectionPoolTypeAttributeContainer); - array.forEach(widgets, function(item) { item.destroyRecursive();}); - domConstruct.empty(that.connectionPoolTypeAttributeContainer); + JDBC.prototype.update = function (data) + { + var previousConnectionPoolType = this.connectionPoolType ? this.connectionPoolType.innerHTML : null; + util.updateUI(data, fieldNames, this); + this.usernameAttributeContainer.style.display = data.username ? "block" : "none"; + if (data.connectionPoolType && (!this.poolDetails || previousConnectionPoolType + != data.connectionPoolType)) + { + var that = this; + require(["qpid/management/store/pool/" + data.connectionPoolType.toLowerCase() + "/show"], + function (PoolDetails) + { + var widgets = registry.findWidgets(that.connectionPoolTypeAttributeContainer); + array.forEach(widgets, function (item) + { + item.destroyRecursive(); + }); + domConstruct.empty(that.connectionPoolTypeAttributeContainer); - that.poolDetails = new PoolDetails({containerNode:that.connectionPoolTypeAttributeContainer, parent: that}); - that.poolDetails.update(data); - } - ); - } - else - { - this.poolDetails.update(data); - } - } + that.poolDetails = new PoolDetails({ + containerNode: that.connectionPoolTypeAttributeContainer, + parent: that + }); + that.poolDetails.update(data); + }); + } + else + { + this.poolDetails.update(data); + } + } - return JDBC; - } -); + return JDBC; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js Fri Apr 29 11:04:40 2016 @@ -32,56 +32,59 @@ define(["dojo/_base/xhr", "dijit/form/ValidationTextBox", "dijit/form/CheckBox", "dojo/domReady!"], - function (xhr, array, parser, dom, domConstruct, json, string, Memory, registry, template, util) - { - return { - show: function (data) - { - var that = this; - this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); - parser.parse(this.containerNode).then(function(instances) - { - that._postParse(data); - }); - }, - _postParse: function(data) - { - var that = this; - registry.byId("addVirtualHostNode.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); - registry.byId("addVirtualHostNode.username").set("regExpGen", util.nameOrContextVarRegexp); + function (xhr, array, parser, dom, domConstruct, json, string, Memory, registry, template, util) + { + return { + show: function (data) + { + var that = this; + this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); + parser.parse(this.containerNode).then(function (instances) + { + that._postParse(data); + }); + }, + _postParse: function (data) + { + var that = this; + registry.byId("addVirtualHostNode.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); + registry.byId("addVirtualHostNode.username").set("regExpGen", util.nameOrContextVarRegexp); - var typeMetaData = data.metadata.getMetaData("VirtualHostNode", "JDBC"); - var poolTypes = typeMetaData.attributes.connectionPoolType.validValues; - var poolTypesData = []; - array.forEach(poolTypes, - function(item) - { - poolTypesData.push({id: item, name: item}); - } - ); - var poolTypesStore = new Memory({ data: poolTypesData }); - var poolTypeControl = registry.byId("addVirtualHostNode.connectionPoolType"); - poolTypeControl.set("store", poolTypesStore); - poolTypeControl.set("value", "NONE"); + var typeMetaData = data.metadata.getMetaData("VirtualHostNode", "JDBC"); + var poolTypes = typeMetaData.attributes.connectionPoolType.validValues; + var poolTypesData = []; + array.forEach(poolTypes, function (item) + { + poolTypesData.push({ + id: item, + name: item + }); + }); + var poolTypesStore = new Memory({data: poolTypesData}); + var poolTypeControl = registry.byId("addVirtualHostNode.connectionPoolType"); + poolTypeControl.set("store", poolTypesStore); + poolTypeControl.set("value", "NONE"); - var poolTypeFieldsDiv = dom.byId("addVirtualHostNode.poolSpecificDiv"); - poolTypeControl.on("change", - function(type) - { - if(type && string.trim(type) != "") - { - var widgets = registry.findWidgets(poolTypeFieldsDiv); - array.forEach(widgets, function(item) { item.destroyRecursive();}); - domConstruct.empty(poolTypeFieldsDiv); - require(["qpid/management/store/pool/"+type.toLowerCase()+"/add"], - function(poolType) - { - poolType.show({containerNode:poolTypeFieldsDiv, context: data.parent.virtualHostNodeContext}); - }); - } - } - ); - } - }; - } -); + var poolTypeFieldsDiv = dom.byId("addVirtualHostNode.poolSpecificDiv"); + poolTypeControl.on("change", function (type) + { + if (type && string.trim(type) != "") + { + var widgets = registry.findWidgets(poolTypeFieldsDiv); + array.forEach(widgets, function (item) + { + item.destroyRecursive(); + }); + domConstruct.empty(poolTypeFieldsDiv); + require(["qpid/management/store/pool/" + type.toLowerCase() + "/add"], function (poolType) + { + poolType.show({ + containerNode: poolTypeFieldsDiv, + context: data.parent.virtualHostNodeContext + }); + }); + } + }); + } + }; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js Fri Apr 29 11:04:40 2016 @@ -24,65 +24,74 @@ define(["qpid/common/util", "dojo/dom", "dojo/dom-construct", "dijit/registry", - "dojo/domReady!"], - function (util, array, json, string, Memory, dom, domConstruct, registry) - { - return { - show: function(data) - { - var that = this; - util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/jdbc/edit.html", function(){ that._postParse(data);}); - }, - _postParse: function(data) - { - registry.byId("editVirtualHostNode.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); - registry.byId("editVirtualHostNode.username").set("regExpGen", util.nameOrContextVarRegexp); + "dojo/domReady!"], function (util, array, json, string, Memory, dom, domConstruct, registry) + { + return { + show: function (data) + { + var that = this; + util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/jdbc/edit.html", function () + { + that._postParse(data); + }); + }, + _postParse: function (data) + { + registry.byId("editVirtualHostNode.connectionUrl").set("regExpGen", util.jdbcUrlOrContextVarRegexp); + registry.byId("editVirtualHostNode.username").set("regExpGen", util.nameOrContextVarRegexp); - var typeMetaData = data.metadata.getMetaData("VirtualHostNode", "JDBC"); - var poolTypes = typeMetaData.attributes.connectionPoolType.validValues; - var poolTypesData = []; - array.forEach(poolTypes, - function(item) - { - poolTypesData.push({id: item, name: item}); - } - ); - var poolTypesStore = new Memory({ data: poolTypesData }); - var poolTypeControl = registry.byId("editVirtualHostNode.connectionPoolType"); - poolTypeControl.set("store", poolTypesStore); - poolTypeControl.set("value", data.data.connectionPoolType); + var typeMetaData = data.metadata.getMetaData("VirtualHostNode", "JDBC"); + var poolTypes = typeMetaData.attributes.connectionPoolType.validValues; + var poolTypesData = []; + array.forEach(poolTypes, function (item) + { + poolTypesData.push({ + id: item, + name: item + }); + }); + var poolTypesStore = new Memory({data: poolTypesData}); + var poolTypeControl = registry.byId("editVirtualHostNode.connectionPoolType"); + poolTypeControl.set("store", poolTypesStore); + poolTypeControl.set("value", data.data.connectionPoolType); - var passwordControl = registry.byId("editVirtualHostNode.password"); - if (data.data.password) - { - passwordControl.set("placeHolder", "*******"); - } + var passwordControl = registry.byId("editVirtualHostNode.password"); + if (data.data.password) + { + passwordControl.set("placeHolder", "*******"); + } - var poolTypeFieldsDiv = dom.byId("editVirtualHostNode.poolSpecificDiv"); - poolTypeControl.on("change", - function(type) - { - if(type && string.trim(type) != "") - { - var widgets = registry.findWidgets(poolTypeFieldsDiv); - array.forEach(widgets, function(item) { item.destroyRecursive();}); - domConstruct.empty(poolTypeFieldsDiv); + var poolTypeFieldsDiv = dom.byId("editVirtualHostNode.poolSpecificDiv"); + poolTypeControl.on("change", function (type) + { + if (type && string.trim(type) != "") + { + var widgets = registry.findWidgets(poolTypeFieldsDiv); + array.forEach(widgets, function (item) + { + item.destroyRecursive(); + }); + domConstruct.empty(poolTypeFieldsDiv); - require(["qpid/management/store/pool/"+type.toLowerCase()+"/edit"], - function(poolType) - { - poolType.show({containerNode:poolTypeFieldsDiv, data: data.data, context: data.parent.context}) + require(["qpid/management/store/pool/" + type.toLowerCase() + "/edit"], function (poolType) + { + poolType.show({ + containerNode: poolTypeFieldsDiv, + data: data.data, + context: data.parent.context + }) - if (!(data.data.state == "STOPPED" || data.data.state == "ERRORED")) - { - var widgets = registry.findWidgets(poolTypeFieldsDiv); - array.forEach(widgets, function(item) { item.set("disabled", true);}); - } - }); - } - } - ); - } - }; - } -); + if (!(data.data.state == "STOPPED" || data.data.state == "ERRORED")) + { + var widgets = registry.findWidgets(poolTypeFieldsDiv); + array.forEach(widgets, function (item) + { + item.set("disabled", true); + }); + } + }); + } + }); + } + }; + }); Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/show.js Fri Apr 29 11:04:40 2016 @@ -20,49 +20,61 @@ */ define(["qpid/common/util", "dojo/query", "dojo/_base/array", "dojo/dom-construct", "dijit/registry", "dojo/domReady!"], - function (util, query, array, domConstruct, registry) - { - var fieldNames = ["connectionUrl", "username", "connectionPoolType"]; - - function Jdbc(data) - { - this.parent = data.parent; - var that = this; - util.buildUI(data.containerNode, data.parent, "virtualhostnode/jdbc/show.html", fieldNames, this, - function() - { - that.usernameAttributeContainer=query(".usernameAttributeContainer", data.containerNode)[0]; - that.connectionPoolTypeAttributeContainer=query(".connectionPoolTypeAttributeContainer", data.containerNode)[0]; - }); - } - - Jdbc.prototype.update=function(data) - { - var previousConnectionPoolType = this.connectionPoolType ? this.connectionPoolType.innerHTML : null; - this.parent.editNodeButton.set("disabled", !(data.state == "STOPPED" || data.state == "ERRORED")); - util.updateUI(data, fieldNames, this); - - this.usernameAttributeContainer.style.display = data.username ? "block" : "none"; - if (data.connectionPoolType && (!this.poolDetails || previousConnectionPoolType != data.connectionPoolType)) - { - var that = this; - require(["qpid/management/store/pool/" + data.connectionPoolType.toLowerCase() + "/show"], - function(PoolDetails) - { - var widgets = registry.findWidgets(that.connectionPoolTypeAttributeContainer); - array.forEach(widgets, function(item) { item.destroyRecursive();}); - domConstruct.empty(that.connectionPoolTypeAttributeContainer); - - that.poolDetails = new PoolDetails({containerNode:that.connectionPoolTypeAttributeContainer, parent: that}); - that.poolDetails.update(data); - } - ); - } - else - { - this.poolDetails.update(data); - } - }; + function (util, query, array, domConstruct, registry) + { + var fieldNames = ["connectionUrl", "username", "connectionPoolType"]; + + function Jdbc(data) + { + this.parent = data.parent; + var that = this; + util.buildUI(data.containerNode, + data.parent, + "virtualhostnode/jdbc/show.html", + fieldNames, + this, + function () + { + that.usernameAttributeContainer = + query(".usernameAttributeContainer", data.containerNode)[0]; + that.connectionPoolTypeAttributeContainer = + query(".connectionPoolTypeAttributeContainer", data.containerNode)[0]; + }); + } + + Jdbc.prototype.update = function (data) + { + var previousConnectionPoolType = this.connectionPoolType ? this.connectionPoolType.innerHTML : null; + this.parent.editNodeButton.set("disabled", !(data.state == "STOPPED" || data.state == "ERRORED")); + util.updateUI(data, fieldNames, this); + + this.usernameAttributeContainer.style.display = data.username ? "block" : "none"; + if (data.connectionPoolType && (!this.poolDetails || previousConnectionPoolType + != data.connectionPoolType)) + { + var that = this; + require(["qpid/management/store/pool/" + data.connectionPoolType.toLowerCase() + "/show"], + function (PoolDetails) + { + var widgets = registry.findWidgets(that.connectionPoolTypeAttributeContainer); + array.forEach(widgets, function (item) + { + item.destroyRecursive(); + }); + domConstruct.empty(that.connectionPoolTypeAttributeContainer); + + that.poolDetails = new PoolDetails({ + containerNode: that.connectionPoolTypeAttributeContainer, + parent: that + }); + that.poolDetails.update(data); + }); + } + else + { + this.poolDetails.update(data); + } + }; - return Jdbc; -}); + return Jdbc; + }); Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html Fri Apr 29 11:04:40 2016 @@ -46,16 +46,34 @@ } var dojoConfig = { - tlmSiblingOfDojo:false, - async:true, + tlmSiblingOfDojo: false, + async: true, baseUrl: getContextPath(), - packages:[ - { name:"dojo", location:"dojo/dojo" }, - { name:"dijit", location:"dojo/dijit" }, - { name:"dojox", location:"dojo/dojox" }, - { name:"qpid", location:"js/qpid" }, - { name:"dgrid", location:"dojo/dgrid" }, - { name:"dstore", location:"dojo/dstore" } + packages: [ + { + name: "dojo", + location: "dojo/dojo" + }, + { + name: "dijit", + location: "dojo/dijit" + }, + { + name: "dojox", + location: "dojo/dojox" + }, + { + name: "qpid", + location: "js/qpid" + }, + { + name: "dgrid", + location: "dojo/dgrid" + }, + { + name: "dstore", + location: "dojo/dstore" + } ] }; @@ -85,39 +103,48 @@ "dijit/Menu", "dijit/MenuItem", "qpid/common/footer" - ], function(parser, query, ConsoleHelper, Management, util, treeView, controller, updater, entities, registry, dom){ - parser.parse(); - qpidManagementHelper = ConsoleHelper; - qpidManagementHelper.controller = controller; - management = new Management("",util.xhrErrorHandler); - management.authenticate().then(function(data) - { - if(data.user) - { - var userName = entities.encode(String(data.user)); - var controlButton = registry.byId("authenticatedUserControls"); - if (controlButton) - { - controlButton.set("label", userName); - } - dom.byId("authenticatedUser").innerHTML = userName; - dom.byId("login").style.display = "inline"; - management.init(function() - { - updater.registerUpdateIntervalListener(management.userPreferences); - qpidManagementHelper.management = management; - controller.init(management); - treeView.create(getContextPath() + 'service/structure', management, query('div[qpid-type="treeView"]')[0]); - dijit.Tooltip.defaultPosition = ["after-centered", "below-centered"]; - }); - } - else - { - alert("User identifier is not found! Re-authenticate!"); - window.location = "logout"; - } - }); - }); + ], + function (parser, query, ConsoleHelper, Management, util, treeView, controller, updater, entities, registry, dom) + { + parser.parse(); + qpidManagementHelper = ConsoleHelper; + qpidManagementHelper.controller = controller; + management = new Management("", util.xhrErrorHandler); + management.authenticate().then(function (data) + { + if (data.user) + { + var userName = entities.encode(String(data.user)); + var controlButton = registry.byId("authenticatedUserControls"); + if (controlButton) + { + controlButton.set("label", userName); + } + dom.byId("authenticatedUser").innerHTML = userName; + dom.byId("login").style.display = "inline"; + management.init(function () + { + updater.registerUpdateIntervalListener( + management.userPreferences); + qpidManagementHelper.management = + management; + controller.init(management); + treeView.create(getContextPath() + + 'service/structure', + management, + query('div[qpid-type="treeView"]')[0]); + dijit.Tooltip.defaultPosition = + ["after-centered", + "below-centered"]; + }); + } + else + { + alert("User identifier is not found! Re-authenticate!"); + window.location = "logout"; + } + }); + }); </script> </head> Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/enc-base64-min.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/enc-base64-min.js?rev=1741609&r1=1741608&r2=1741609&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/enc-base64-min.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/crypto-js/enc-base64-min.js Fri Apr 29 11:04:40 2016 @@ -1,8 +1,58 @@ /* -CryptoJS v3.1.2 -code.google.com/p/crypto-js -(c) 2009-2013 by Jeff Mott. All rights reserved. -code.google.com/p/crypto-js/wiki/License -*/ -(function(){var h=CryptoJS,j=h.lib.WordArray;h.enc.Base64={stringify:function(b){var e=b.words,f=b.sigBytes,c=this._map;b.clamp();b=[];for(var a=0;a<f;a+=3)for(var d=(e[a>>>2]>>>24-8*(a%4)&255)<<16|(e[a+1>>>2]>>>24-8*((a+1)%4)&255)<<8|e[a+2>>>2]>>>24-8*((a+2)%4)&255,g=0;4>g&&a+0.75*g<f;g++)b.push(c.charAt(d>>>6*(3-g)&63));if(e=c.charAt(64))for(;b.length%4;)b.push(e);return b.join("")},parse:function(b){var e=b.length,f=this._map,c=f.charAt(64);c&&(c=b.indexOf(c),-1!=c&&(e=c));for(var c=[],a=0,d=0;d< -e;d++)if(d%4){var g=f.indexOf(b.charAt(d-1))<<2*(d%4),h=f.indexOf(b.charAt(d))>>>6-2*(d%4);c[a>>>2]|=(g|h)<<24-8*(a%4);a++}return j.create(c,a)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}})(); + CryptoJS v3.1.2 + code.google.com/p/crypto-js + (c) 2009-2013 by Jeff Mott. All rights reserved. + code.google.com/p/crypto-js/wiki/License + */ +(function () +{ + var h = CryptoJS, j = h.lib.WordArray; + h.enc.Base64 = { + stringify: function (b) + { + var e = b.words, f = b.sigBytes, c = this._map; + b.clamp(); + b = []; + for (var a = 0; + a < f; + a += 3) + { + for (var d = (e[a >>> 2] >>> 24 - 8 * (a % 4) & 255) << 16 | (e[a + 1 >>> 2] >>> 24 - 8 * ((a + 1) % 4) + & 255) << 8 | e[a + 2 >>> 2] >>> 24 - 8 + * ((a + + 2) + % 4) + & 255, g = 0; + 4 > g && a + 0.75 * g < f; + g++) + { + b.push(c.charAt(d >>> 6 * (3 - g) & 63)); + } + } + if (e = c.charAt(64)) + { + for (; b.length % 4;) + { + b.push(e); + } + } + return b.join("") + }, + parse: function (b) + { + var e = b.length, f = this._map, c = f.charAt(64); + c && (c = b.indexOf(c), -1 != c && (e = c)); + for (var c = [], a = 0, d = 0; d < e; d++) + { + if (d % 4) + { + var g = f.indexOf(b.charAt(d - 1)) << 2 * (d % 4), h = f.indexOf(b.charAt(d)) >>> 6 - 2 * (d % 4); + c[a >>> 2] |= (g | h) << 24 - 8 * (a % 4); + a++ + } + } + return j.create(c, a) + }, + _map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=" + } +})(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
