QPID-5413: [Java Broker] Add virtualhostnode/virtualhost creation dialogue

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

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

3 files changed, 83 insertions, 12 deletions

diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js
index f051116868..ccdcf643fb 100644
--- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js
@@ -33,18 +33,18 @@ define(["dojo/_base/xhr",
         "dojo/domReady!"],
     function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) {
         return {
-            show: function() {
-                var node = dom.byId("addVirtualHost.poolSpecificDiv");
+            show: function(poolSpecificDivId, formFieldPrefix, htmlUrl) {
+                var node = dom.byId(poolSpecificDivId);
                 var that = this;
 
                 array.forEach(registry.toArray(),
                               function(item) {
-                                  if(item.id.substr(0,39) == "formAddVirtualHost.specific.store.pool.") {
+                                  if(item.id.substr(0,formFieldPrefix.length) == formFieldPrefix) {
                                       item.destroyRecursive();
                                   }
                               });
 
-                xhr.get({url: "virtualhost/store/pool/bonecp/add.html",
+                xhr.get({url: htmlUrl,
                      sync: true,
                      load:  function(data) {
                                 node.innerHTML = data;
diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
index 5b053849a3..c9405991a6 100644
--- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
@@ -19,22 +19,37 @@
   <tr>
       <td class="tableContainer-labelCell" style="width: 300px;"><strong>Partition Count:  </strong></td>
       <td class="tableContainer-valueCell">
-          <input data-dojo-type="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.parititions"
-                                             name="partitionCount" value="4" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+          <input data-dojo-type="dijit/form/NumberSpinner"
+                                             id="formAddVirtualHost.qpid.jdbcstore.bonecp.partitionCount"
+                                             name="qpid.jdbcstore.bonecp.partitionCount"
+                                             value="4"
+                                             smallDelta="1"
+                                             constraints="{min:1,max:1000,places:0}"
+                                             contextvar="true"/>
       </td>
   </tr>
   <tr>
-      <td class="tableContainer-labelCell" style="width: 300px;"><strong>Min Conn per Partition:  </strong></td>
+      <td class="tableContainer-labelCell" style="width: 300px;"><strong>Minimum connections per Partition:</strong></td>
       <td class="tableContainer-valueCell">
-          <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.minConn"
-                 name="minConnectionsPerPartition" value="5" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+          <input dojoType="dijit/form/NumberSpinner"
+                                             id="formAddVirtualHost.qpid.jdbcstore.bonecp.minConnectionsPerPartition"
+                                             name="qpid.jdbcstore.bonecp.minConnectionsPerPartition"
+                                             value="5"
+                                             smallDelta="1"
+                                             constraints="{min:1,max:1000,places:0}"
+                                             contextvar="true"/>
       </td>
   </tr>
   <tr>
-      <td class="tableContainer-labelCell" style="width: 300px;"><strong>Max Conn per Partition:  </strong></td>
+      <td class="tableContainer-labelCell" style="width: 300px;"><strong>Maximum connections per Partition:  </strong></td>
       <td class="tableContainer-valueCell">
-          <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.maxCon"
-                 name="maxConnectionsPerPartition" value="10" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+          <input dojoType="dijit/form/NumberSpinner"
+                                             id="formAddVirtualHost.qpid.jdbcstore.bonecp.maxConnectionsPerPartition"
+                                             name="qpid.jdbcstore.bonecp.maxConnectionsPerPartition"
+                                             value="10"
+                                             smallDelta="1"
+                                             constraints="{min:1,max:1000,places:0}"
+                                             contextvar="true"/>
       </td>
   </tr>
 
diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html
new file mode 100644
index 0000000000..5958af5e6c
--- /dev/null
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html
@@ -0,0 +1,56 @@
+<!--
+  ~ 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.
+  -->
+<table class="tableContainer-table tableContainer-table-horiz">
+
+  <tr>
+      <td class="tableContainer-labelCell" style="width: 300px;"><strong>Partition Count:  </strong></td>
+      <td class="tableContainer-valueCell">
+          <input data-dojo-type="dijit/form/NumberSpinner"
+                                             id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.partitionCount"
+                                             name="qpid.jdbcstore.bonecp.partitionCount"
+                                             value="4"
+                                             smallDelta="1"
+                                             constraints="{min:1,max:1000,places:0}"
+                                             contextvar="true"/>
+      </td>
+  </tr>
+  <tr>
+      <td class="tableContainer-labelCell" style="width: 300px;"><strong>Minimum connections per Partition:</strong></td>
+      <td class="tableContainer-valueCell">
+          <input dojoType="dijit/form/NumberSpinner"
+                                             id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.minConnectionsPerPartition"
+                                             name="qpid.jdbcstore.bonecp.minConnectionsPerPartition"
+                                             value="5"
+                                             smallDelta="1"
+                                             constraints="{min:1,max:1000,places:0}"
+                                             contextvar="true"/>
+      </td>
+  </tr>
+  <tr>
+      <td class="tableContainer-labelCell" style="width: 300px;"><strong>Maximum connections per Partition:  </strong></td>
+      <td class="tableContainer-valueCell">
+          <input dojoType="dijit/form/NumberSpinner"
+                                             id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.maxConnectionsPerPartition"
+                                             name="qpid.jdbcstore.bonecp.maxConnectionsPerPartition"
+                                             value="10"
+                                             smallDelta="1"
+                                             constraints="{min:1,max:1000,places:0}"
+                                             contextvar="true"/>
+      </td>
+  </tr>
+
+</table>