diff options
Diffstat (limited to 'qpid/java/bdbstore/src/main/java/resources')
10 files changed, 182 insertions, 176 deletions
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js index ed34bbbd7a..bd1812e86a 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define(["qpid/common/util", "qpid/common/metadata", "dijit/registry", "dojo/_base/window", "dojo/domReady!"], +define(["qpid/common/util", "qpid/common/metadata", "dijit/registry", "dojo/domReady!"], function (util, metadata, registry, win) { var fieldNames = ["storeUnderfullSize", "storeOverfullSize", @@ -28,120 +28,6 @@ define(["qpid/common/util", "qpid/common/metadata", "dijit/registry", "dojo/_bas registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); - - var that = this; - this.permittedNodes = registry.byId("editVirtualHost.permittedNodes"); - this.permittedNodesList = registry.byId("editVirtualHost.permittedNodesList"); - this.permittedNodesList.on("change", function(value){that._changePermittedNodeList(value);}); - - // permitted node text field - this.permittedNode = registry.byId("editVirtualHost.permittedNode"); - this.permittedNode.on("change", function(value){that._changePermittedNode(value);}); - - // add and remove buttons & click handlers - this.permittedNodeAddButton = registry.byId("editVirtualHost.permittedNodeAdd"); - this.permittedNodeAddButton.set("disabled", true); - this.permittedNodeRemoveButton = registry.byId("editVirtualHost.permittedNodeRemove"); - this.permittedNodeRemoveButton.set("disabled", true); - this.permittedNodeAddButton.on("click", function(e){that._clickAddPermittedNodeButton(e);}); - this.permittedNodeRemoveButton.on("click", function(e){that._clickRemovePermittedNodeButton(e);}); - - var permittedNodes = data.data.permittedNodes; - for(var i=0; i<permittedNodes.length;i++) - { - var host = permittedNodes[i]; - var newOption = this._addOption(host); - // add new option to list - this.permittedNodesList.containerNode.appendChild(newOption); - } - }, - _clickAddPermittedNodeButton: function(e) - { - // check the text box is valid and not empty - if(this.permittedNode.isValid() && - this.permittedNode.value && - this.permittedNode.value != "") - { - // read value to add from text box - var newAddress = this.permittedNode.value; - - // clear UI value - this.permittedNode.set("value", ""); - this.permittedNodeAddButton.set("disabled", true); - - //check entry not already present in list - var alreadyPresent = false; - var children = this.permittedNodesList.containerNode.children; - var i; - for (i = 0; i < children.length; i++) - { - var child = children.item(i); - if (child.value == newAddress) - { - alreadyPresent = true; - break; - } - } - - if (!alreadyPresent) - { - var newOption = this._addOption(newAddress); - - // add new option to list - this.permittedNodesList.containerNode.appendChild(newOption); - this._updatePermittedNodes(); - } - } - }, - _clickRemovePermittedNodeButton: function(e) - { - var selectedValues = this.permittedNodesList.get("value"); - var v; - for (v in selectedValues) - { - var children = this.permittedNodesList.containerNode.children; - var i; - for (i = 0; i < children.length; i++) - { - var child = children.item(i); - if (child.value == selectedValues[v]) - { - this.permittedNodesList.containerNode.removeChild(child); - } - } - } - this._updatePermittedNodes(); - this.permittedNodeRemoveButton.set("disabled", true); - }, - _addOption: function(newAddress) - { - // construct new option for list - var newOption = win.doc.createElement('option'); - newOption.innerHTML = newAddress; - newOption.value = newAddress; - return newOption; - }, - _changePermittedNodeList: function(value) - { - var hasSelection = this.permittedNodesList.get("value").length > 0; - this.permittedNodeRemoveButton.set("disabled", !hasSelection); - }, - _changePermittedNode: function(value) - { - var fieldIsEmpty = (this.permittedNode.get("value") == ""); - this.permittedNodeAddButton.set("disabled", fieldIsEmpty); - return true; - }, - _updatePermittedNodes: function() - { - var values = []; - var children = this.permittedNodesList.containerNode.children; - for (var i = 0; i < children.length; i++) - { - var child = children.item(i); - values.push(children.item(i).value); - } - this.permittedNodes.set("value", values); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js index f211d19d16..3bc3305e1f 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js @@ -28,7 +28,7 @@ define(["qpid/common/util", "dojo/query", "dojo/domReady!"], function BDB(data) { util.buildUI(data.containerNode, data.parent, "virtualhost/bdb_ha/show.html", fields, this); - this["permittedNodes"]= query(".permittedNodes", data.containerNode)[0]; + this[localTransactionSynchronizationPolicy]= query("." + localTransactionSynchronizationPolicy, data.containerNode)[0]; this[remoteTransactionSynchronizationPolicy]= query("."+ remoteTransactionSynchronizationPolicy, data.containerNode)[0]; } @@ -37,16 +37,6 @@ define(["qpid/common/util", "dojo/query", "dojo/domReady!"], { util.updateUI(data, fields, this); - var permittedNodesMarkup = ""; - if (data.permittedNodes) - { - for(var i=0;i<data.permittedNodes.length;i++) - { - permittedNodesMarkup+="<div>" + data.permittedNodes[i] + "</div>"; - } - } - this["permittedNodes"].innerHTML = permittedNodesMarkup ; - var localSyncPolicy = data[localTransactionSynchronizationPolicy] ? data[localTransactionSynchronizationPolicy].toLowerCase() : ""; var remoteSyncPolicy = data[remoteTransactionSynchronizationPolicy] ? data[remoteTransactionSynchronizationPolicy].toLowerCase() : ""; diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js index 30f47417aa..18853e63a7 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js @@ -67,7 +67,7 @@ define(["dojo/_base/xhr", this.addVirtualHostNodePermittedNodeRemoveButton.on("click", function(e){that._clickRemovePermittedNodeButton(e);}); // This will contain the serialised form that will go to the server - this.addVirtualHostNodeVirtualhostBlueprint = registry.byId("addVirtualHostNode.virtualhostBlueprint"); + this.addVirtualHostNodePermittedNodes = registry.byId("addVirtualHostNode.permittedNodes"); registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp); }, @@ -90,7 +90,7 @@ define(["dojo/_base/xhr", } } - this.addVirtualHostNodeVirtualhostBlueprint.set("value",json.stringify({"permittedNodes" : permittedNodes})); + this.addVirtualHostNodePermittedNodes.set("value", permittedNodes); }, _changePermittedNodeList: function(value) { diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js index f2f256cd89..99b9209d8a 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js @@ -22,8 +22,9 @@ define(["qpid/common/util", "dijit/registry", "dojo/store/Memory", "dojo/data/ObjectStore", + "dojo/_base/window", "dojo/domReady!"], - function (util, registry, Memory, ObjectStore) + function (util, registry, Memory, ObjectStore, win) { var fields = [ "storePath", "name", "groupName", "address", "designatedPrimary", "priority", "quorumOverride"]; @@ -58,6 +59,120 @@ define(["qpid/common/util", } var store = new Memory({data :overrideData, idProperty: "id" }); registry.byId("editVirtualHostNode.quorumOverride").set("store", new ObjectStore({objectStore: store})); + + var that = this; + this.permittedNodes = registry.byId("editVirtualHostNode.permittedNodes"); + this.permittedNodesList = registry.byId("editVirtualHostNode.permittedNodesList"); + this.permittedNodesList.on("change", function(value){that._changePermittedNodeList(value);}); + + // permitted node text field + this.permittedNode = registry.byId("editVirtualHostNode.permittedNode"); + this.permittedNode.on("change", function(value){that._changePermittedNode(value);}); + + // add and remove buttons & click handlers + this.permittedNodeAddButton = registry.byId("editVirtualHostNode.permittedNodeAdd"); + this.permittedNodeAddButton.set("disabled", true); + this.permittedNodeRemoveButton = registry.byId("editVirtualHostNode.permittedNodeRemove"); + this.permittedNodeRemoveButton.set("disabled", true); + this.permittedNodeAddButton.on("click", function(e){that._clickAddPermittedNodeButton(e);}); + this.permittedNodeRemoveButton.on("click", function(e){that._clickRemovePermittedNodeButton(e);}); + + var permittedNodes = data.data.permittedNodes; + for(var i=0; i<permittedNodes.length;i++) + { + var host = permittedNodes[i]; + var newOption = this._addOption(host); + // add new option to list + this.permittedNodesList.containerNode.appendChild(newOption); + } + }, + _clickAddPermittedNodeButton: function(e) + { + // check the text box is valid and not empty + if(this.permittedNode.isValid() && + this.permittedNode.value && + this.permittedNode.value != "") + { + // read value to add from text box + var newAddress = this.permittedNode.value; + + // clear UI value + this.permittedNode.set("value", ""); + this.permittedNodeAddButton.set("disabled", true); + + //check entry not already present in list + var alreadyPresent = false; + var children = this.permittedNodesList.containerNode.children; + var i; + for (i = 0; i < children.length; i++) + { + var child = children.item(i); + if (child.value == newAddress) + { + alreadyPresent = true; + break; + } + } + + if (!alreadyPresent) + { + var newOption = this._addOption(newAddress); + + // add new option to list + this.permittedNodesList.containerNode.appendChild(newOption); + this._updatePermittedNodes(); + } + } + }, + _clickRemovePermittedNodeButton: function(e) + { + var selectedValues = this.permittedNodesList.get("value"); + var v; + for (v in selectedValues) + { + var children = this.permittedNodesList.containerNode.children; + var i; + for (i = 0; i < children.length; i++) + { + var child = children.item(i); + if (child.value == selectedValues[v]) + { + this.permittedNodesList.containerNode.removeChild(child); + } + } + } + this._updatePermittedNodes(); + this.permittedNodeRemoveButton.set("disabled", true); + }, + _addOption: function(newAddress) + { + // construct new option for list + var newOption = win.doc.createElement('option'); + newOption.innerHTML = newAddress; + newOption.value = newAddress; + return newOption; + }, + _changePermittedNodeList: function(value) + { + var hasSelection = this.permittedNodesList.get("value").length > 0; + this.permittedNodeRemoveButton.set("disabled", !hasSelection); + }, + _changePermittedNode: function(value) + { + var fieldIsEmpty = (this.permittedNode.get("value") == ""); + this.permittedNodeAddButton.set("disabled", fieldIsEmpty); + return true; + }, + _updatePermittedNodes: function() + { + var values = []; + var children = this.permittedNodesList.containerNode.children; + for (var i = 0; i < children.length; i++) + { + var child = children.item(i); + values.push(children.item(i).value); + } + this.permittedNodes.set("value", values); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js index d914e16dc9..4997b16bc6 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js @@ -90,7 +90,7 @@ define(["dojo/_base/xhr", 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), @@ -158,6 +158,18 @@ define(["dojo/_base/xhr", BDBHA.prototype.update=function(data) { 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++) { diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html index 9d0b0ab860..f4bf0c3c03 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html @@ -45,45 +45,6 @@ </div> </div> - <div class="formBox clear"> - <fieldset> - <legend>Permitted group nodes</legend> - <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Permitted addresses*:</div> - <div class="formLabel-controlCell tableContainer-valueCell addPermittedNodeList"> - <select type="text" id="editVirtualHost.permittedNodesList" - data-dojo-type="dijit/form/MultiSelect" - data-dojo-props=" - multiple: true, - name: 'permittedNodeList', - readOnly : 'true', - excluded: true, - title: 'Enter permitted nodes'"> - </select> <!-- must use closing tag rather than shorthand - dojo bug? --> - <input type="hidden" id="editVirtualHost.permittedNodes" - data-dojo-type="dijit/form/ValidationTextBox" - name="permittedNodes"/> - </div> - <button data-dojo-type="dijit/form/Button" id="editVirtualHost.permittedNodeRemove" data-dojo-props="label: '-'" ></button> - </div> - - <div class="clear"></div> - <div class="clear"> - <div class="formLabel-labelCell tableContainer-labelCell">Address:</div> - <div class="formLabel-controlCell tableContainer-valueCell"> - <input type="text" id="editVirtualHost.permittedNode" - data-dojo-type="dijit/form/ValidationTextBox" - data-dojo-props=" - name: 'permittedNode', - placeHolder: 'host:port', - intermediateChanges: true, - title: 'Enter address of node to be permitted into the group', - promptMessage: 'Address of node to be permitted into the group'" /> - </div> - <button data-dojo-type="dijit/form/Button" id="editVirtualHost.permittedNodeAdd" data-dojo-props="label: '+'"></button> - </div> - </fieldset> - </div> <div class="clear"></div> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html index 0c419aabae..d96942cd2d 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html @@ -26,10 +26,6 @@ <div class="formLabel-labelCell">Store underfull size:</div> <div><span class="storeUnderfullSize"></span> bytes</div> </div> - <div class="clear"> - <div class="formLabel-labelCell">Permitted nodes:</div> - <div class="permittedNodes multiLineValue"></div> - </div> <div class="clear"></div> <br/> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html index c25bae3419..7f7fb53ed8 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html @@ -91,10 +91,10 @@ </fieldset> </div> - <input type="hidden" id="addVirtualHostNode.virtualhostBlueprint" + <input type="hidden" id="addVirtualHostNode.permittedNodes" data-dojo-type="dijit/form/ValidationTextBox" - data-dojo-props="name: 'virtualhostBlueprint'" - contextvar="true"/> + data-dojo-props="name: 'permittedNodes'" + /> <input type="hidden" id="addVirtualHostNode.helperAddress" data-dojo-type="dijit/form/ValidationTextBox" diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html index f163390fa2..e040420bdb 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html @@ -53,6 +53,47 @@ </div> </div> + + <div class="formBox clear"> + <fieldset> + <legend>Permitted group nodes</legend> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Permitted addresses*:</div> + <div class="formLabel-controlCell tableContainer-valueCell addPermittedNodeList"> + <select type="text" id="editVirtualHostNode.permittedNodesList" + data-dojo-type="dijit/form/MultiSelect" + data-dojo-props=" + multiple: true, + name: 'permittedNodeList', + readOnly : 'true', + excluded: true, + title: 'Enter permitted nodes'"> + </select> <!-- must use closing tag rather than shorthand - dojo bug? --> + <input type="hidden" id="editVirtualHostNode.permittedNodes" + data-dojo-type="dijit/form/ValidationTextBox" + name="permittedNodes"/> + </div> + <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.permittedNodeRemove" data-dojo-props="label: '-'" ></button> + </div> + + <div class="clear"></div> + <div class="clear"> + <div class="formLabel-labelCell tableContainer-labelCell">Address:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> + <input type="text" id="editVirtualHostNode.permittedNode" + data-dojo-type="dijit/form/ValidationTextBox" + data-dojo-props=" + name: 'permittedNode', + placeHolder: 'host:port', + intermediateChanges: true, + title: 'Enter address of node to be permitted into the group', + promptMessage: 'Address of node to be permitted into the group'" /> + </div> + <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.permittedNodeAdd" data-dojo-props="label: '+'"></button> + </div> + </fieldset> + </div> + <div class="clear"> <div class="formLabel-labelCell tableContainer-labelCell">Allow this node to operate solo: </div> <div class="formLabel-controlCell tableContainer-valueCell"> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html index 5a60b75c5c..690440cf7b 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html @@ -35,6 +35,10 @@ <div class="formLabel-labelCell">Address:</div> <div class="address">N/A</div> </div> + <div class="clear"> + <div class="formLabel-labelCell">Permitted nodes:</div> + <div class="permittedNodes multiLineValue"></div> + </div> <div class="clear designatedPrimaryContainer"> <div class="formLabel-labelCell">Allow this node to operate solo:</div> <div class="designatedPrimary">N/A</div> @@ -49,6 +53,7 @@ <span class="quorumOverride" >N/A</span> </div> </div> + <br/> <div class="clear"></div> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Group nodes'" class="membersGridPanel"> <div class="groupMembers"></div> |