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

5 files changed, 64 insertions, 89 deletions

diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js b/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js
new file mode 100644
index 0000000000..aa7bd8c582
--- /dev/null
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js
@@ -0,0 +1,38 @@
+/*
+ * 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/memory/add.html",
+        "dijit/form/ValidationTextBox",
+        "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/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js b/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
deleted file mode 100644
index 3a9b23274d..0000000000
--- a/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
+++ /dev/null
@@ -1,56 +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/_base/event",
-        "dojo/_base/json",
-        "dojo/string",
-        "dojo/store/Memory",
-        "dijit/form/FilteringSelect",
-        "dojo/domReady!"],
-    function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) {
-        return {
-            show: function() {
-                var node = dom.byId("addVirtualHost.storeSpecificDiv");
-                var that = this;
-
-                array.forEach(registry.toArray(),
-                              function(item) {
-                                  if(item.id.substr(0,33) == "formAddVirtualHost.specific.store") {
-                                      item.destroyRecursive();
-                                  }
-                              });
-
-                xhr.get({url: "virtualhost/store/memory/add.html",
-                     sync: true,
-                     load:  function(data) {
-                                node.innerHTML = data;
-                                parser.parse(node);
-
-                     }});
-            }
-        };
-    });
diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
new file mode 100644
index 0000000000..bfb5037b09
--- /dev/null
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
@@ -0,0 +1,21 @@
+<!--
+  ~ 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>
+</div>
diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html
deleted file mode 100644
index 2666129a1f..0000000000
--- a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html
+++ /dev/null
@@ -1,17 +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.
-  -->
-
diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
index ebcf53e0b2..bd1d320902 100644
--- a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
@@ -20,29 +20,18 @@
  -->
 <div>
     <div style="clear:both">
-      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Virtual Host Node Name*:</div>
+      <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
-          <input type="text" id="addVirtualHostNode.derbyNodeName"
+          <input type="text" id="addVirtualHostNode.name"
                           data-dojo-type="dijit/form/ValidationTextBox"
                           data-dojo-props="
                               name: 'name',
-                              placeHolder: 'node name',
+                              placeHolder: 'virtual host node name',
                               required: true,
-                              missingMessage: 'A node name must be supplied',
-                              title: 'Enter node name',
+                              missingMessage: 'A virtual host node name must be supplied',
+                              title: 'Enter virtual host node name',
                               pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
       </div>
     </div>
-    <div style="clear:both;display:none">
-      <div class="formLabel-labelCell" style="float:left; width: 300px;">Combined store:</div>
-      <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
-          <input type="text" id="addVirtualHostNode.derbyMessageStoreProvider"
-                          data-dojo-type="dijit/form/CheckBox"
-                          data-dojo-props="
-                              name: 'messageStoreProvider',
-                              required: true,
-                              checked: true" />
-      </div>
-    </div>
     <div style="clear:both"></div>
 </div>