From cb1fbd9ab2250ea775f7c1783339dfaf42dbd3bd Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Thu, 17 Jul 2014 10:24:52 +0000
Subject: QPID-5413: [Java Broker] Add VHN/VH creation dialog for BDB HA.

Work completed by Andrew MacBean <macbean@apache.org> and me.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1611314 13f79535-47bb-0310-9956-ffa450edef68
---
 .../js/qpid/management/virtualhost/bdb_ha/add.js   |  39 +++++++
 .../virtualhost/bdb_ha/addVirtualHost.js           |  51 ---------
 .../qpid/management/virtualhostnode/bdb_ha/add.js  |  77 +++++++-------
 .../bdb_ha/add/existinggroup/add.js                |  39 +++++++
 .../virtualhostnode/bdb_ha/add/newgroup/add.js     |  52 +++++++++
 .../java/resources/virtualhost/bdb_ha/add.html     |  78 +-------------
 .../java/resources/virtualhostnode/bdb_ha/add.html |  87 +++------------
 .../bdb_ha/add/existinggroup/add.html              | 117 +++++++++++++++++++++
 .../virtualhostnode/bdb_ha/add/newgroup/add.html   |  81 ++++++++++++++
 9 files changed, 385 insertions(+), 236 deletions(-)
 create mode 100644 qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js
 delete mode 100644 qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js
 create mode 100644 qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
 create mode 100644 qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
 create mode 100644 qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
 create mode 100644 qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html

(limited to 'qpid/java/bdbstore/src/main')

diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js
new file mode 100644
index 0000000000..093f63af35
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/add.js
@@ -0,0 +1,39 @@
+/*
+ * 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(["dojo/_base/xhr",
+        "dojo/parser",
+        "dojo/dom",
+        "dojo/dom-construct",
+        "dojo/json",
+        "dijit/registry",
+        "dojo/text!virtualhost/bdb_ha/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);
+        }
+    };
+  }
+);
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js
deleted file mode 100644
index 44ad5fa57a..0000000000
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- * 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(["dojo/_base/xhr",
-        "dojo/dom",
-        "dojo/dom-construct",
-        "dojo/_base/window",
-        "dijit/registry",
-        "dojo/parser",
-        "dojo/_base/array",
-        "dojo/domReady!"],
-    function (xhr, dom, construct, win, registry, parser, array) {
-        return {
-            show: function() {
-
-                var node = dom.byId("addVirtualHost.typeSpecificDiv");
-                var that = this;
-
-                array.forEach(registry.toArray(),
-                              function(item) {
-                                  if(item.id.substr(0,27) == "formAddVirtualHost.specific") {
-                                      item.destroyRecursive();
-                                  }
-                              });
-
-                xhr.get({url: "virtualhost/bdb_ha/add.html",
-                     sync: true,
-                     load:  function(data) {
-                                node.innerHTML = data;
-                                parser.parse(node);
-                     }});
-            }
-        };
-    });
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
index 83ae7e21cd..6431ddb6db 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
@@ -20,6 +20,7 @@
  */
 define(["dojo/_base/xhr",
         "dojo/parser",
+        "dojo/_base/array",
         "dojo/dom",
         "dojo/dom-construct",
         "dojo/json",
@@ -28,46 +29,48 @@ define(["dojo/_base/xhr",
         "dijit/form/ValidationTextBox",
         "dijit/form/RadioButton",
         "dojo/domReady!"],
-  function (xhr, parser, dom, domConstruct, json, registry, template)
+  function (xhr, parser, array, dom, domConstruct, json, registry, template)
   {
+      return {
+          show: function(data)
+          {
+              var that=this;
 
-    var nodeFields = ["address", "helperAddress", "joinGroup", "newGroup"];
+              this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+              parser.parse(this.containerNode);
 
-    return {
-        show: function(data)
-        {
-            var that = this;
-            this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
-            parser.parse(this.containerNode);
-            for(var i=0; i<nodeFields.length;i++)
-            {
-                var fieldName = nodeFields[i];
-                this[fieldName]= registry.byId("addVirtualHostNode." + fieldName);
-            }
+              // lookup field
+              this.groupChoice = registry.byId("addVirtualHostNode.group");
+              this.virtualHostNodeBdbhaTypeFieldsContainer = dom.byId("addVirtualHostNode.bdbha.typeFields");
 
-            this.helperAddressContainer = dom.byId("addVirtualHostNode.helperAddressContainer");
-            this.joinGroup.on("change",
-                    function(value)
-                    {
-                        that.helperAddressContainer.style.display = (this.checked ? "block" : "none");
-                    }
-            );
-            this.newGroup.on("change",
-                    function(value)
-                    {
-                        that.helperAddressContainer.style.display = (this.checked ? "none" :  "block");
-                    }
-            );
-            this.address.on("change",
-                    function(value)
-                    {
-                        if (that.newGroup.checked)
-                        {
-                            that.helperAddress.set("value", value );
-                        }
-                    }
-            );
-        }
-    };
+              // add callback
+              this.groupChoice.on("change", function(type){that._groupChoiceChanged(type, that.virtualHostNodeBdbhaTypeFieldsContainer, "qpid/management/virtualhostnode/bdb_ha/add/");});
+
+          },
+          _groupChoiceChanged: function(type, typeFieldsContainer, urlStem)
+          {
+              var widgets = registry.findWidgets(typeFieldsContainer);
+              array.forEach(widgets, function(item) { item.destroyRecursive();});
+              domConstruct.empty(typeFieldsContainer);
+
+              if (type)
+              {
+                  var that = this;
+                  require([urlStem + type.toLowerCase() + "/add"],
+                      function(TypeUI)
+                      {
+                          try
+                          {
+                              TypeUI.show({containerNode:typeFieldsContainer, parent: that});
+                          }
+                          catch(e)
+                          {
+                              console.warn(e);
+                          }
+                      }
+                  );
+              }
+          }
+      };
   }
 );
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
new file mode 100644
index 0000000000..c3a7824fa4
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
@@ -0,0 +1,39 @@
+/*
+ * 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(["dojo/_base/xhr",
+        "dojo/parser",
+        "dojo/dom",
+        "dojo/dom-construct",
+        "dojo/json",
+        "dijit/registry",
+        "dojo/text!virtualhostnode/bdb_ha/add/existinggroup/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);
+        }
+    };
+  }
+);
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
new file mode 100644
index 0000000000..de0b5567ec
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
@@ -0,0 +1,52 @@
+/*
+ * 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(["dojo/_base/xhr",
+        "dojo/parser",
+        "dojo/dom",
+        "dojo/dom-construct",
+        "dojo/json",
+        "dijit/registry",
+        "dojo/text!virtualhostnode/bdb_ha/add/newgroup/add.html",
+        "dijit/form/ValidationTextBox",
+        "dijit/form/CheckBox",
+        "dojo/domReady!"],
+  function (xhr, parser, dom, domConstruct, json, registry, template)
+  {
+    return {
+        show: function(data)
+        {
+          var that=this;
+
+          this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+          parser.parse(this.containerNode);
+
+          // lookup field
+          var virtualHostNodeAddress = registry.byId("addVirtualHostNode.address");
+          this.virtualHostNodeHelperAddress = registry.byId("addVirtualHostNode.helperAddress");
+
+          // add callback
+          virtualHostNodeAddress.on("change", function(address){that._addressChanged(address, that.virtualHostNodeHelperAddress);});
+        },
+        _addressChanged: function(address, virtualHostNodeHelperAddress)
+        {
+          virtualHostNodeHelperAddress.set("value", address);
+        }
+    };
+  }
+);
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
index c3b2a0f9b5..9e3056ec91 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
@@ -14,77 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<table class="tableContainer-table tableContainer-table-horiz">
-    <tr>
-        <td class="tableContainer-labelCell" style="width: 300px;"><strong>Path to store location*: </strong></td>
-        <td class="tableContainer-valueCell">
-            <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.storePath"
-                   required="true" name="storePath" placeholder="/path/to/message/store"/>
-        </td>
-    </tr>
-    <tr>
-        <td class="tableContainer-labelCell" style="width: 300px;"><strong>Node Name*: </strong></td>
-        <td class="tableContainer-valueCell">
-            <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.nodeName"
-                   required="true" name="name" placeholder="node name"/>
-        </td>
-    </tr>
-    <tr>
-        <td class="tableContainer-labelCell" style="width: 300px;"><strong>Replication Group*: </strong></td>
-        <td class="tableContainer-valueCell">
-            <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.groupName"
-                   required="true" name="groupName" placeholder="group name"/>
-        </td>
-    </tr>
-    <tr>
-        <td class="tableContainer-labelCell" style="width: 300px;"><strong>Node Address*: </strong></td>
-        <td class="tableContainer-valueCell">
-            <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.nodeAddress"
-                   required="true" name="address" data-dojo-props="regExp:'([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}', invalidMessage:'Must be of the form host:port'" placeholder="host:port"/>
-        </td>
-    </tr>
-    <tr>
-        <td class="tableContainer-labelCell" style="width: 300px;"><strong>Helper Address*: </strong></td>
-        <td class="tableContainer-valueCell">
-            <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.helperAddress"
-                   required="true" name="helperAddress" data-dojo-props="regExp:'([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}', invalidMessage:'Must be of the form host:port'" placeholder="host:port"/>
-        </td>
-    </tr>
-    <tr>
-            <td class="tableContainer-labelCell" style="width: 300px;"><strong>Durability: </strong></td>
-            <td class="tableContainer-valueCell">
-                <input dojoType="dijit/form/ValidationTextBox" id="formAddVirtualHost.specific.haDurability"
-                       name="haDurability" placeholder="NO_SYNC,NO_SYNC,SIMPLE_MAJORITY"/>
-            </td>
-    </tr>
-
-    <tr>
-        <td class="tableContainer-labelCell" style="width: 300px;"><strong>Coalesce local sync: </strong></td>
-        <td class="tableContainer-valueCell">
-            <input dojoType="dijit/form/CheckBox" id="formAddVirtualHost.specific.haCoalescingSync"
-                    checked="true" onchange="require(['dijit/registry', 'dojo/domReady!'],
-                                        function(registry){
-                                        var checkbox = registry.byId('formAddVirtualHost.specific.haCoalescingSync');
-                                        var hidden = registry.byId('formAddVirtualHost.specific.haCoalescingSyncHidden');
-                                        hidden.set('value', checkbox.get('checked'));
-                                        })"/>
-
-            <input dojoType="dijit/form/TextBox" id="formAddVirtualHost.specific.haCoalescingSyncHidden" type="hidden" name="coalescingSync" value="true"/>
-        </td>
-
-    </tr>
-
-    <tr>
-        <td class="tableContainer-labelCell" style="width: 300px;"><strong>Designated Primary: </strong></td>
-        <td class="tableContainer-valueCell">
-            <input dojoType="dijit/form/CheckBox" id="formAddVirtualHost.specific.haDesignatedPrimary"
-                   onchange="require(['dijit/registry', 'dojo/domReady!'],
-                                       function(registry){
-                                       var checkbox = registry.byId('formAddVirtualHost.specific.haDesignatedPrimary');
-                                       var hidden = registry.byId('formAddVirtualHost.specific.haDesignatedPrimaryHidden');
-                                       hidden.set('value', checkbox.get('checked'));
-                                       })"/>
-            <input dojoType="dijit/form/TextBox" id="formAddVirtualHost.specific.haDesignatedPrimaryHidden" type="hidden" name="designatedPrimary" value="false"/>
-        </td>
-    </tr>
-</table>
+<div>
+    <div style="clear:both"></div>
+    <div class="infoMessage">The virtualhost will have the same name as the group.</div>
+</div>
\ No newline at end of file
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
index d1792267a4..3f888405b0 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
@@ -20,84 +20,23 @@
  -->
 <div>
     <div style="clear:both">
-        <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node Group*:</div>
+        <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Create new group or join existing group*:</div>
         <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
           <div>
-            <input type="radio" data-dojo-type="dijit/form/RadioButton" name="group" id="addVirtualHostNode.newGroup" value="new" checked="checked" />
-            <label for="addVirtualHostNode.newGroup">New Group</label>
-            <input type="radio" data-dojo-type="dijit/form/RadioButton" name="group" id="addVirtualHostNode.joinGroup" value="join" />
-            <label for="addVirtualHostNode.joinGroup">Join Group</label>
+
+              <div data-dojo-type="dojo/store/Memory"
+                   data-dojo-id="groupStore"
+                   data-dojo-props="data: [{id: 'newgroup', name: 'New Group'}, {id: 'existinggroup', name: 'Existing Group'}]"></div>
+              <input data-dojo-type="dijit/form/FilteringSelect"
+                     data-dojo-props="store:groupStore,
+                                      searchAttr:'name',
+                                      required: true,
+                                      placeHolder: 'choose new or existing'"
+                     name="group"
+                     id="addVirtualHostNode.group" />
           </div>
         </div>
     </div>
-    <div style="clear:both">
-      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node Name*:</div>
-      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
-          <input type="text" id="addVirtualHostNode.nodeName"
-                          data-dojo-type="dijit/form/ValidationTextBox"
-                          data-dojo-props="
-                              name: 'name',
-                              placeHolder: 'unique node name per broker',
-                              required: true,
-                              missingMessage: 'A node name must be supplied',
-                              title: 'Enter a unique node name per broker',
-                              pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
-      </div>
-    </div>
-    <div style="clear:both">
-      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Virtual Host Name*:</div>
-      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
-          <input type="text" id="addVirtualHostNode.groupName"
-                          data-dojo-type="dijit/form/ValidationTextBox"
-                          data-dojo-props="
-                              name: 'groupName',
-                              placeHolder: 'virtual host name',
-                              required: true,
-                              missingMessage: 'A virtual host name must be supplied',
-                              title: 'Enter virtual host name',
-                              pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
-      </div>
-    </div>
-    <div style="clear:both">
-      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Address*:</div>
-      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
-          <input type="text" id="addVirtualHostNode.address"
-                          data-dojo-type="dijit/form/ValidationTextBox"
-                          data-dojo-props="
-                              name: 'address',
-                              placeHolder: 'host:port',
-                              required: true,
-                              missingMessage: 'Node host and port must be supplied',
-                              title: 'Enter address',
-                              pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
-      </div>
-    </div>
-    <div style="clear:both">
-      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div>
-      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
-          <input type="text" id="addVirtualHostNode.bdbHAstorePath"
-                          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 store path'" />
-      </div>
-    </div>
-    <div style="clear:both;display:none" id="addVirtualHostNode.helperAddressContainer">
-      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Existing node address from the group*:</div>
-      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
-          <input type="text" id="addVirtualHostNode.helperAddress"
-                          data-dojo-type="dijit/form/ValidationTextBox"
-                          data-dojo-props="
-                              name: 'helperAddress',
-                              placeHolder: 'host:port',
-                              required: true,
-                              missingMessage: 'Node host and port must be supplied',
-                              title: 'Enter address',
-                              pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
-      </div>
-    </div>
     <div style="clear:both"></div>
+    <div id="addVirtualHostNode.bdbha.typeFields"></div>
 </div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
new file mode 100644
index 0000000000..eca6a41bb8
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
@@ -0,0 +1,117 @@
+<!--
+  ~ 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 class="formBox">
+        <fieldset>
+            <legend>Existing details</legend>
+            <div style="clear:both">
+                <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Group Name*:</div>
+                <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+                    <input type="text" id="addVirtualHostNode.groupName"
+                           data-dojo-type="dijit/form/ValidationTextBox"
+                           data-dojo-props="
+                                  name: 'groupName',
+                                  placeHolder: 'group name',
+                                  required: true,
+                                  missingMessage: 'The group name must be supplied',
+                                  title: 'Enter the group name',
+                                  pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
+                </div>
+            </div>
+            <div style="clear:both">
+                <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node name from group*:</div>
+                <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+                    <input type="text" id="addVirtualHostNode.helperNodeName"
+                           data-dojo-type="dijit/form/ValidationTextBox"
+                           data-dojo-props="
+                                  name: 'name',
+                                  placeHolder: 'existing node name from the group',
+                                  required: true,
+                                  missingMessage: 'A node name must be supplied',
+                                  title: 'Enter a node name',
+                                  pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
+                </div>
+            </div>
+            <div style="clear:both">
+                <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node address of same node*:</div>
+                <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+                    <input type="text" id="addVirtualHostNode.helperAddress"
+                           data-dojo-type="dijit/form/ValidationTextBox"
+                           data-dojo-props="
+                                  name: 'helperAddress',
+                                  placeHolder: 'existing node address from the group',
+                                  required: true,
+                                  missingMessage: 'Node host and port must be supplied',
+                                  title: 'Enter address',
+                                  pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
+                </div>
+            </div>
+        </fieldset>
+    </div>
+
+
+    <div class="formBox">
+        <fieldset>
+            <legend>New node details</legend>
+            <div style="clear:both">
+                <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node Name*:</div>
+                <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+                    <input type="text" id="addVirtualHostNode.nodeName"
+                           data-dojo-type="dijit/form/ValidationTextBox"
+                           data-dojo-props="
+                              name: 'name',
+                              placeHolder: 'unique node name per broker',
+                              required: true,
+                              missingMessage: 'A node name must be supplied',
+                              title: 'Enter a unique node name per broker',
+                              pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
+                </div>
+            </div>
+            <div style="clear:both">
+                <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Address*:</div>
+                <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+                    <input type="text" id="addVirtualHostNode.address"
+                           data-dojo-type="dijit/form/ValidationTextBox"
+                           data-dojo-props="
+                              name: 'address',
+                              placeHolder: 'host:port',
+                              required: true,
+                              missingMessage: 'Node host and port must be supplied',
+                              title: 'Enter address',
+                              pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
+                </div>
+            </div>
+            <div style="clear:both">
+                <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div>
+                <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+                    <input type="text" id="addVirtualHostNode.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 store path'" />
+                </div>
+            </div>
+        </fieldset>
+     </div>
+     <div style="clear:both"></div>
+</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
new file mode 100644
index 0000000000..4d0edd5fc7
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
@@ -0,0 +1,81 @@
+<!--
+  ~ 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" style="float:left; width: 300px;">Node Name*:</div>
+      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+          <input type="text" id="addVirtualHostNode.nodeName"
+                          data-dojo-type="dijit/form/ValidationTextBox"
+                          data-dojo-props="
+                              name: 'name',
+                              placeHolder: 'unique node name per broker',
+                              required: true,
+                              missingMessage: 'A node name must be supplied',
+                              title: 'Enter a unique node name per broker',
+                              pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
+      </div>
+    </div>
+    <div style="clear:both">
+      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Group Name*:</div>
+      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+          <input type="text" id="addVirtualHostNode.groupName"
+                          data-dojo-type="dijit/form/ValidationTextBox"
+                          data-dojo-props="
+                              name: 'groupName',
+                              placeHolder: 'group name',
+                              required: true,
+                              missingMessage: 'A group name must be supplied',
+                              title: 'Enter a group name',
+                              pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
+      </div>
+    </div>
+    <div style="clear:both">
+      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Address*:</div>
+      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+          <input type="text" id="addVirtualHostNode.address"
+                          data-dojo-type="dijit/form/ValidationTextBox"
+                          data-dojo-props="
+                              name: 'address',
+                              placeHolder: 'host:port',
+                              required: true,
+                              missingMessage: 'Node host and port must be supplied',
+                              title: 'Enter address',
+                              pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" />
+      </div>
+    </div>
+    <div style="clear:both">
+      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div>
+      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+          <input type="text" id="addVirtualHostNode.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 store path'" />
+      </div>
+    </div>
+
+    <input type="hidden" id="addVirtualHostNode.helperAddress"
+           data-dojo-type="dijit/form/ValidationTextBox"
+           data-dojo-props="name: 'helperAddress'" />
+
+    <div style="clear:both"></div>
+</div>
-- 
cgit v1.2.1