QPID-5928: [Java Broker] Add UI into web management console for editing of virtual host nodes and virtual hosts

The work is done by Andrew MacBean and Alex Rudyy.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1615187 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 486 insertions, 290 deletions

diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
new file mode 100644
index 0000000000..5438eda926
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+define(["qpid/common/util", "dojo/domReady!"],
+   function (util)
+   {
+       var fieldNames = ["storeUnderfullSize", "storeOverfullSize", "storePath"];
+       return {
+           show: function(data)
+           {
+              util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", fieldNames, data.data);
+           }
+       };
+   }
+);
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
new file mode 100644
index 0000000000..bc62654c56
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+define(["qpid/common/util", "dijit/registry", "dojo/_base/window", "dojo/domReady!"],
+   function (util, registry, win)
+   {
+       var fieldNames = ["storeUnderfullSize", "storeOverfullSize"];
+       return {
+           show: function(data)
+           {
+              util.buildEditUI(data.containerNode, "virtualhost/bdb_ha/edit.html", "editVirtualHost.", fieldNames, data.data);
+
+              var widget = registry.byId("editVirtualHost.localTransactionSynchronizationPolicy-" + data.data["localTransactionSynchronizationPolicy"]);
+              if (widget)
+              {
+                widget.set("checked", true);
+              }
+              widget = registry.byId("editVirtualHost.remoteTransactionSynchronizationPolicy-" + data.data["remoteTransactionSynchronizationPolicy"]);
+              if (widget)
+              {
+                widget.set("checked", true);
+              }
+
+              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/virtualhostnode/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
new file mode 100644
index 0000000000..35ecbec315
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * 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.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data);
+              registry.byId("editVirtualHostNode.storePath").set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
+           }
+       };
+   }
+);
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/show.js
index b7f29f9469..bef6a4214d 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/show.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/show.js
@@ -25,11 +25,13 @@ define(["qpid/common/util", "dojo/domReady!"],
 
     function BdbNode(data)
     {
+       this.parent = data.parent;
        util.buildUI(data.containerNode, data.parent, "virtualhostnode/bdb/show.html", fieldNames, this);
     }
 
     BdbNode.prototype.update=function(data)
     {
+       this.parent.editNodeButton.set("disabled", !(data.state == "STOPPED" || data.state == "ERRORED"));
        util.updateUI(data, fieldNames, this);
     };
 
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 02996046e3..f2f256cd89 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
@@ -18,163 +18,47 @@
  * under the License.
  *
  */
-define(["dojo/_base/xhr",
-        "dojo/_base/array",
-        "dojo/_base/event",
-        "dojo/_base/lang",
-        "dojo/_base/window",
-        "dojo/dom",
-        "dojo/dom-construct",
+define(["qpid/common/util",
         "dijit/registry",
-        "dojo/parser",
-        'dojo/json',
-        "dojo/query",
         "dojo/store/Memory",
         "dojo/data/ObjectStore",
-        "dojo/text!virtualhostnode/bdb_ha/edit.html",
-        "dijit/Dialog",
-        "dijit/form/CheckBox",
-        "dijit/form/FilteringSelect",
-        "dijit/form/ValidationTextBox",
-        "dijit/form/Button",
-        "dijit/form/Form",
-        "dojox/validate/us",
-        "dojox/validate/web",
         "dojo/domReady!"],
-  function (xhr, array, event, lang, win, dom, domConstruct, registry, parser, json, query, Memory, ObjectStore, template)
-  {
-    var fields = [ "storePath", "name", "groupName", "address",
-                   "designatedPrimary", "priority",  "quorumOverride"];
+   function (util, registry, Memory, ObjectStore)
+   {
+       var fields = [ "storePath", "name", "groupName", "address",
+                      "designatedPrimary", "priority",  "quorumOverride"];
 
-    var bdbHaNodeEditor =
-    {
-      init: function()
-      {
-        var that=this;
-        this.containerNode = domConstruct.create("div", {innerHTML: template});
-        parser.parse(this.containerNode);
-        this.dialog = registry.byId("editBDBHANodeDialog")
-        this.saveButton = registry.byId("editBDBHANode.saveButton");
-        this.cancelButton = registry.byId("editBDBHANode.cancelButton");
-        this.cancelButton.on("click", function(e){that._cancel(e);});
-        this.saveButton.on("click", function(e){that._save(e);});
-        for(var i = 0; i < fields.length; i++)
-        {
-            var fieldName = fields[i];
-            this[fieldName] = registry.byId("editBDBHANode." + fieldName);
-        }
-        this.form = registry.byId("editBDBHANodeForm");
-      },
-      show: function(nodeName)
-      {
-        var that=this;
-        this.nodeName = nodeName;
-        this.query = "api/latest/virtualhostnode/" + encodeURIComponent(nodeName);
-        xhr.get(
-            {
-              url: this.query,
-              sync: true,
-              handleAs: "json",
-              load: function(data)
+       return {
+           show: function(data)
+           {
+              var node = data.data;
+              util.buildEditUI(data.containerNode, "virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, node);
+              if ( !(data.data.state == "ERRORED" || data.data.state == "STOPPED"))
               {
-                that._show(data[0]);
+                  registry.byId("editVirtualHostNode.storePath").set("disabled", true);
               }
-            }
-        );
-      },
-      destroy: function()
-      {
-        if (this.dialog)
-        {
-            this.dialog.destroyRecursive();
-            this.dialog = null;
-        }
 
-        if (this.containerNode)
-        {
-            domConstruct.destroy(this.containerNode);
-            this.containerNode = null;
-        }
-      },
-      _cancel: function(e)
-      {
-          this.dialog.hide();
-      },
-      _save: function(e)
-      {
-        event.stop(e);
-        if(this.form.validate())
-        {
-          var data = {};
-          for(var i = 0; i < fields.length; i++)
-          {
-              var fieldName = fields[i];
-              var widget = this[fieldName];
-              if (!widget.get("disabled"))
+              var overrideData = [{id: '0', name: 'Majority', selected: '1'}];
+              if (node.remotereplicationnodes && node.remotereplicationnodes.length>1)
               {
-                  data[fieldName] = widget.hasOwnProperty("checked")? widget.get("checked"):widget.get("value");
+                  registry.byId("editVirtualHostNode.designatedPrimary").set("disabled", true);
+                  registry.byId("editVirtualHostNode.priority").set("disabled", false);
+                  registry.byId("editVirtualHostNode.quorumOverride").set("disabled", false);
+                  var overrideLimit = Math.floor((node.remotereplicationnodes.length + 1)/2);
+                  for(var i = 1; i <= overrideLimit; i++)
+                  {
+                    overrideData.push({id: i, name: i + ""});
+                  }
               }
-          }
-          var success = false,failureReason=null;
-          xhr.put({
-              url: this.query,
-              sync: true,
-              handleAs: "json",
-              headers: { "Content-Type": "application/json"},
-              putData: json.stringify(data),
-              load: function(x) {success = true; },
-              error: function(error) {success = false; failureReason = error;}
-          });
-
-          if(success === true)
-          {
-              this.dialog.hide();
-          }
-          else
-          {
-              alert("Error:" + failureReason);
-          }
-          }
-          else
-          {
-              alert('Form contains invalid data.  Please correct first');
-          }
-        },
-        _show:function(node)
-        {
-          for(var i = 0; i < fields.length; i++)
-          {
-            var fieldName = fields[i];
-            this[fieldName].set("value", node[fieldName]);
-          }
-
-          var overrideData = [{id: '0', name: 'Majority', selected: '1'}];
-
-          if (node.remotereplicationnodes && node.remotereplicationnodes.length>1)
-          {
-            this["designatedPrimary"].set("disabled", true);
-            this["priority"].set("disabled", false);
-            this["quorumOverride"].set("disabled", false);
-            var overrideLimit = Math.floor((node.remotereplicationnodes.length + 1)/2);
-            for(var i = 1; i <= overrideLimit; i++)
-            {
-              overrideData.push({id: i, name: i + ""});
-            }
-          }
-          else
-          {
-            this["designatedPrimary"].set("disabled", false);
-            this["priority"].set("disabled", true);
-            this["quorumOverride"].set("disabled", true);
-          }
-          var store = new Memory({data :overrideData, idProperty: "id" });
-          this["quorumOverride"].set("store", new ObjectStore({objectStore: store}));
-          this.dialog.show();
-        }
-    };
-
-    bdbHaNodeEditor.init();
-
-    return bdbHaNodeEditor;
-  }
-);
\ No newline at end of file
+              else
+              {
+                  registry.byId("editVirtualHostNode.designatedPrimary").set("disabled", false);
+                  registry.byId("editVirtualHostNode.priority").set("disabled", true);
+                  registry.byId("editVirtualHostNode.quorumOverride").set("disabled", true);
+              }
+              var store = new Memory({data :overrideData, idProperty: "id" });
+              registry.byId("editVirtualHostNode.quorumOverride").set("store", new ObjectStore({objectStore: store}));
+           }
+       };
+   }
+);
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 43cb2a1992..f927b81c9d 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
@@ -27,10 +27,9 @@ define(["dojo/_base/xhr",
         "dojox/grid/EnhancedGrid",
         "qpid/common/UpdatableStore",
         "qpid/management/UserPreferences",
-        "qpid/management/virtualhostnode/bdb_ha/edit",
         "qpid/common/util",
         "dojo/domReady!"],
-  function (xhr, connect, entities, query, json, registry, EnhancedGrid, UpdatableStore, UserPreferences, edit, util)
+  function (xhr, connect, entities, query, json, registry, EnhancedGrid, UpdatableStore, UserPreferences, util)
   {
     var priorityNames = {'_0': 'Never', '_1': 'Default', '_2': 'Normal', '_3': 'High'};
     var nodeFields = ["storePath", "groupName", "role", "address", "designatedPrimary", "priority", "quorumOverride"];
@@ -154,18 +153,11 @@ define(["dojo/_base/xhr",
             }
           }
       );
-      this.parent.editNodeButton.set("disabled", false);
-      this.parent.editNodeButton.domNode.style.display = "inline";
-      this.parent.editNodeButton.on("click",
-          function(e)
-          {
-            edit.show(that.data.name);
-          }
-      );
     }
 
     BDBHA.prototype.update=function(data)
     {
+      this.parent.editNodeButton.set("disabled", false);
       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
new file mode 100644
index 0000000000..2df0ebb0fd
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html
@@ -0,0 +1,131 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<div>
+
+    <div style="clear:both">
+        <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size (bytes):</div>
+        <div class="tableContainer-valueCell formLabel-controlCell">
+            <input data-dojo-type="dijit/form/NumberSpinner"
+                   id="editVirtualHost.storeOverfullSize"
+                   data-dojo-props="
+                              name: 'storeOverfullSize',
+                              placeHolder: 'size in bytes',
+                              required: false,
+                              title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages',
+                              constraints:{min:0,places:0}"/>
+        </div>
+    </div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size (bytes):</div>
+        <div class="tableContainer-valueCell formLabel-controlCell">
+            <input data-dojo-type="dijit/form/NumberSpinner"
+                   id="editVirtualHost.storeUnderfullSize"
+                   data-dojo-props="
+                              name: 'storeUnderfullSize',
+                              placeHolder: 'size in bytes',
+                              required: false,
+                              title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages',
+                              constraints:{min:0,places:0}"/>
+        </div>
+    </div>
+
+     <div class="formBox" style="clear:both">
+        <fieldset>
+            <legend>Permitted group nodes</legend>
+            <div style="clear:both">
+                <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 style="clear:both"></div>
+            <div style="clear:both">
+                <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',
+                                      title: 'Enter address',
+                                      intermediateChanges: true,
+                                      pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
+                </div>
+                <button data-dojo-type="dijit/form/Button" id="editVirtualHost.permittedNodeAdd" data-dojo-props="label: '+'"></button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div style="clear:both"></div>
+
+    <div class="formBox" style="clear:both">
+        <fieldset>
+        <legend>High availability durability</legend>
+        <div>
+            <div class="haOptionLabel">Master transaction sync policy</div>
+            <div>
+                <input data-dojo-type="dijit/form/RadioButton" type="radio" name="localTransactionSynchronizationPolicy" value="SYNC" id="editVirtualHost.localTransactionSynchronizationPolicy-SYNC"/>
+                <label>SYNC (the transaction will be written and synchronized to the disk; highest durability)</label>
+            </div>
+
+            <div>
+                <input data-dojo-type="dijit/form/RadioButton" type="radio" name="localTransactionSynchronizationPolicy" value="WRITE_NO_SYNC" id="editVirtualHost.localTransactionSynchronizationPolicy-WRITE_NO_SYNC"/>
+                <label>WRITE_NO_SYNC (the transaction will be written only; the synchronization will be performed later)</label>
+            </div>
+
+            <div>
+                <input data-dojo-type="dijit/form/RadioButton" type="radio" name="localTransactionSynchronizationPolicy" value="NO_SYNC" id="editVirtualHost.localTransactionSynchronizationPolicy-NO_SYNC"/>
+                <label>NO_SYNC (write later; the transaction will be written and synchronized later; lowest durability)</label>
+            </div>
+        </div>
+        <br/>
+        <div>
+            <div class="haOptionLabel">Replica transaction sync policy</div>
+            <div>
+                <input data-dojo-type="dijit/form/RadioButton" type="radio" name="remoteTransactionSynchronizationPolicy" value="SYNC"  id="editVirtualHost.remoteTransactionSynchronizationPolicy-SYNC"/>
+                <label>SYNC (the transaction will be written and synchronized to the disk; highest durability)</label>
+            </div>
+
+            <div>
+                <input data-dojo-type="dijit/form/RadioButton" type="radio" name="remoteTransactionSynchronizationPolicy"  value="WRITE_NO_SYNC"  id="editVirtualHost.remoteTransactionSynchronizationPolicy-WRITE_NO_SYNC"/>
+                <label>WRITE_NO_SYNC (the transaction will be written only; the synchronization will be performed later)</label>
+            </div>
+
+            <div>
+                <input data-dojo-type="dijit/form/RadioButton" type="radio" name="remoteTransactionSynchronizationPolicy" value="NO_SYNC"  id="editVirtualHost.remoteTransactionSynchronizationPolicy-NO_SYNC"/>
+                <label>NO_SYNC (write later; the transaction will be written and synchronized later; lowest durability)</label>
+            </div>
+        </div>
+        </fieldset>
+    </div>
+
+</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 a5a4147c9c..35ab0a0bcf 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
@@ -19,15 +19,15 @@
 
 <div>
   <div style="clear:both">
-      <div class="formLabel-labelCell">Store Overfull Limit:</div>
+      <div class="formLabel-labelCell">Store overfull size:</div>
       <div><span class="storeOverfullSize" ></span> bytes</div>
   </div>
   <div style="clear:both">
-      <div class="formLabel-labelCell">Store Underfull Limit:</div>
+      <div class="formLabel-labelCell">Store underfull size:</div>
       <div><span class="storeUnderfullSize"></span> bytes</div>
   </div>
   <div style="clear:both">
-      <div class="formLabel-labelCell">Permitted Nodes:</div>
+      <div class="formLabel-labelCell">Permitted nodes:</div>
       <div class="permittedNodes multiLineValue"></div>
   </div>
   <div style="clear:both"></div>
@@ -35,7 +35,7 @@
 
   <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'High Availability Durability',  open: true">
       <div style="clear:both">
-          <div class="formLabel-labelCell">Local Transaction Sync Policy:</div>
+          <div class="formLabel-labelCell">Master transaction sync policy:</div>
           <div class="localTransactionSynchronizationPolicy">
             <span class="localTransactionSynchronizationPolicy-sync">SYNC (the transaction will be written and synchronized to the disk; highest durability)</span>
             <span class="localTransactionSynchronizationPolicy-write_no_sync">WRITE_NO_SYNC (the transaction will be written only; the synchronization will be performed later)</span>
@@ -43,7 +43,7 @@
           </div>
       </div>
       <div style="clear:both">
-          <div class="formLabel-labelCell">Remote Transaction Sync Policy:</div>
+          <div class="formLabel-labelCell">Replica transaction sync policy:</div>
           <div class="remoteTransactionSynchronizationPolicy">
               <span class="remoteTransactionSynchronizationPolicy-sync">SYNC (the transaction will be written and synchronized to the disk; highest durability)</span>
               <span class="remoteTransactionSynchronizationPolicy-write_no_sync">WRITE_NO_SYNC (the transaction will be written only; the synchronization will be performed later)</span>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html
index 29efa712e7..a93a11086c 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html
@@ -16,7 +16,7 @@
   -->
 <div>
   <div style="clear:both">
-    <div class="formLabel-labelCell">Store Path:</div>
+    <div class="formLabel-labelCell">Configuration store path:</div>
     <div class="storePath"></div>
   </div>
   <div style="clear:both"></div>
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 02542a28ce..642482bd4f 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
@@ -73,9 +73,7 @@
                                       title: 'Enter permitted nodes'">
                     </select> <!-- must use closing tag rather than shorthand - dojo bug? -->
                 </div>
-                <div class="formBoxButtons">
-                    <button data-dojo-type="dijit/form/Button" id="addVirtualHostNode.permittedNodeRemove" data-dojo-props="label: '-'" ></button>
-                </div>
+                <button data-dojo-type="dijit/form/Button" id="addVirtualHostNode.permittedNodeRemove" data-dojo-props="label: '-'" ></button>
             </div>
 
             <div style="clear:both"></div>
@@ -91,9 +89,7 @@
                                       intermediateChanges: true,
                                       pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
                 </div>
-                <div class="formBoxButtons">
-                    <button data-dojo-type="dijit/form/Button" id="addVirtualHostNode.permittedNodeAdd" data-dojo-props="label: '+'"></button>
-                </div>
+                <button data-dojo-type="dijit/form/Button" id="addVirtualHostNode.permittedNodeAdd" data-dojo-props="label: '+'"></button>
             </div>
         </fieldset>
     </div>
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 94b9451057..026de1aa14 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
@@ -14,120 +14,96 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<div class="dijitHidden">
-  <div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit BDB HA Virtual Host Node'" id="editBDBHANodeDialog">
-      <form id="editBDBHANodeForm" method="post" data-dojo-type="dijit/form/Form">
-          <table class="tableContainer-table tableContainer-table-horiz">
-            <tr>
-                <td class="tableContainer-labelCell"><strong>Path to store location*: </strong></td>
-                <td class="tableContainer-valueCell">
-                    <input type="text" id="editBDBHANode.storePath"
-                          data-dojo-type="dijit/form/ValidationTextBox"
-                          data-dojo-props="
-                            name: 'storePath',
-                            placeHolder: '/path/to/message/store',
-                            required: true,
-                            disabled: true,
-                            missingMessage: 'A store path must be supplied',
-                            title: 'Enter path to the store folder'" />
-                </td>
-            </tr>
-            <tr>
-                <td class="tableContainer-labelCell"><strong>Node Name*: </strong></td>
-                <td class="tableContainer-valueCell">
-                    <input type="text" id="editBDBHANode.name"
-                            data-dojo-type="dijit/form/ValidationTextBox"
-                            data-dojo-props="
-                                name: 'name',
-                                placeHolder: 'Node Name',
-                                required: true,
-                                disabled: true,
-                                missingMessage: 'A node name must be supplied',
-                                title: 'Enter node name',
-                                pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
-                </td>
-            </tr>
-            <tr>
-                <td class="tableContainer-labelCell"><strong>Replication Group*: </strong></td>
-                <td class="tableContainer-valueCell">
-                    <input type="text" id="editBDBHANode.groupName"
-                            data-dojo-type="dijit/form/ValidationTextBox"
-                            data-dojo-props="
-                                name: 'groupName',
-                                placeHolder: 'Group Name',
-                                required: true,
-                                disabled: true,
-                                missingMessage: 'A group name must be supplied',
-                                title: 'Enter group name',
-                                pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
-                </td>
-            </tr>
-            <tr>
-                <td class="tableContainer-labelCell"><strong>Address*: </strong></td>
-                <td class="tableContainer-valueCell">
-                    <input type="text" id="editBDBHANode.address"
-                            data-dojo-type="dijit/form/ValidationTextBox"
-                            data-dojo-props="
-                                name: 'address',
-                                placeHolder: 'host:port',
-                                disabled: true,
-                                required: true,
-                                missingMessage: 'A Host and Port must be supplied',
-                                invalidMessage: 'Must be of the form host:port',
-                                title: 'Enter Host and Port name',
-                                pattern: '^([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}$'" />
-                </td>
-            </tr>
-            <tr>
-                <td class="tableContainer-labelCell"><strong>Allow this node to operate solo: </strong></td>
-                <td class="tableContainer-valueCell">
-                    <input type="checkbox" id="editBDBHANode.designatedPrimary" checked="checked"
-                            data-dojo-type="dijit/form/CheckBox"
-                            data-dojo-props="
-                                name: 'designatedPrimary',
+<div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell tableContainer-labelCell">Replication Group*:</div>
+        <div class="formLabel-controlCell tableContainer-valueCell">
+            <input type="text" id="editVirtualHostNode.groupName"
+                   data-dojo-type="dijit/form/ValidationTextBox"
+                   data-dojo-props="
+                                    name: 'groupName',
+                                    placeHolder: 'Group Name',
+                                    required: true,
+                                    disabled: true,
+                                    missingMessage: 'A group name must be supplied',
+                                    title: 'Enter group name',
+                                    pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
+        </div>
+    </div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell tableContainer-labelCell">Address*:</div>
+        <div class="formLabel-controlCell tableContainer-valueCell">
+            <input type="text" id="editVirtualHostNode.address"
+                   data-dojo-type="dijit/form/ValidationTextBox"
+                   data-dojo-props="
+                                    name: 'address',
+                                    placeHolder: 'host:port',
+                                    required: true,
+                                    disabled: true,
+                                    missingMessage: 'A Host and Port must be supplied',
+                                    invalidMessage: 'Must be of the form host:port',
+                                    title: 'Enter Host and Port name',
+                                    pattern: '^([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}$'" />
+        </div>
+    </div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path*:</div>
+        <div class="formLabel-controlCell tableContainer-valueCell">
+            <input type="text" id="editVirtualHostNode.storePath"
+                   data-dojo-type="dijit/form/ValidationTextBox"
+                   data-dojo-props="
+                                  name: 'storePath',
+                                  placeHolder: 'path/to/store',
+                                  required: true,
+                                  missingMessage: 'Store path must be supplied',
+                                  title: 'Enter configuration store path'" />
+        </div>
+    </div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell tableContainer-labelCell">Allow this node to operate solo: </div>
+        <div class="formLabel-controlCell tableContainer-valueCell">
+            <input type="checkbox" id="editVirtualHostNode.designatedPrimary" checked="checked"
+                   data-dojo-type="dijit/form/CheckBox"
+                   data-dojo-props="
+                                    name: 'designatedPrimary',
+                                    required: false,
+                                    title: 'Designate node as primary. It is applicable only to 2-nodes cluster'" />
+        </div>
+    </div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell tableContainer-labelCell">Election priority of this node: </div>
+        <div class="formLabel-controlCell tableContainer-valueCell">
+            <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodePriorityStore"
+                 data-dojo-props="data: [
+                                                      {id: '0', name: 'Never'},
+                                                      {id: '1', name: 'Default', selected: '1'},
+                                                      {id: '2', name: 'Normal'},
+                                                      {id: '3', name: 'High'}
+                                                   ]"></div>
+            <input id="editVirtualHostNode.priority" data-dojo-type="dijit/form/FilteringSelect" value="1"
+                   data-dojo-props="
+                                name: 'priority',
                                 required: false,
-                                title: 'Designate node as primary. It is applicable only to 2-nodes cluster'" />
-                </td>
-            </tr>
-            <tr>
-                <td class="tableContainer-labelCell"><strong>Election priority of this node: </strong></td>
-                <td class="tableContainer-valueCell">
-                    <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodePriorityStore"
-                        data-dojo-props="data: [
-                                                  {id: '0', name: 'Never'},
-                                                  {id: '1', name: 'Default', selected: '1'},
-                                                  {id: '2', name: 'Normal'},
-                                                  {id: '3', name: 'High'}
-                                               ]"></div>
-                    <input id="editBDBHANode.priority" data-dojo-type="dijit/form/FilteringSelect" value="1"
-                        data-dojo-props="
-                            name: 'priority',
-                            required: false,
-                            title: 'Select node priority for election as a Master',
-                            store: nodePriorityStore,
-                            searchAttr: 'name'" />
-                </td>
-            </tr>
-            <tr>
-                <td class="tableContainer-labelCell"><strong>Required minimum number of nodes: </strong></td>
-                <td class="tableContainer-valueCell">
-                     <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodeQuorumOverrideStore"
-                        data-dojo-props="data: [{id: '0', name: 'Majority', selected: '1'}]"></div>
-                    <input type="text" id="editBDBHANode.quorumOverride"
-                        data-dojo-type="dijit/form/FilteringSelect" value="0"
-                        data-dojo-props="
-                            name: 'quorumOverride',
-                            required: false,
-                            title: 'Enter quorum override. 0 signifies simple majority',
-                            store: nodeQuorumOverrideStore,
-                            searchAttr: 'name'" />
-                </td>
-            </tr>
-          </table>
-          <div class="dijitDialogPaneActionBar">
-              <button data-dojo-type="dijit/form/Button" id="editBDBHANode.saveButton" data-dojo-props="label: 'Save'" type="submit">Save</button>
-              <button data-dojo-type="dijit/form/Button" id="editBDBHANode.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
-          </div>
-      </form>
-  </div>
-</div>
+                                title: 'Select node priority for election as a Master',
+                                store: nodePriorityStore,
+                                searchAttr: 'name'" />
+        </div>
+    </div>
+    <div style="clear:both">
+        <div class="formLabel-labelCell tableContainer-labelCell">Required minimum number of nodes: </div>
+        <div class="formLabel-controlCell tableContainer-valueCell">
+            <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodeQuorumOverrideStore"
+                 data-dojo-props="data: [{id: '0', name: 'Majority', selected: '1'}]"></div>
+            <input type="text" id="editVirtualHostNode.quorumOverride"
+                   data-dojo-type="dijit/form/FilteringSelect" value="0"
+                   data-dojo-props="
+                                name: 'quorumOverride',
+                                required: false,
+                                title: 'Enter quorum override. 0 signifies simple majority',
+                                store: nodeQuorumOverrideStore,
+                                searchAttr: 'name'" />
+        </div>
+    </div>
+
+    <div style="clear:both"></div>
+</div>
\ No newline at end of file
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 cfd5804c01..7583eee9d4 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
@@ -20,11 +20,11 @@
  -->
 <div>
   <div style="clear:both">
-      <div class="formLabel-labelCell">Group Name:</div>
+      <div class="formLabel-labelCell">Group name:</div>
       <div class="groupName"></div>
   </div>
   <div style="clear:both">
-       <div class="formLabel-labelCell">Store Path:</div>
+       <div class="formLabel-labelCell">Configuration store path:</div>
        <div class="storePath"></div>
   </div>
   <div style="clear:both">