QPID-6407: Edit dialogue for BDB HA does not faithfully populate attributes node priority or required number of nodes

Merged from trunk with command:

svn merge -c 1661693  https://svn.apache.org/repos/asf/qpid/trunk



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

14 files changed, 35 insertions, 60 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
index f1a3887777..076a27a3ae 100644
--- 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
@@ -22,7 +22,7 @@ define(["dijit/registry", "qpid/common/util", "dojo/domReady!"],
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null,
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhost/sizemonitoring/edit.html",
               function()
               {
                   registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
index c94795e31c..ebe6b6822a 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
@@ -22,7 +22,7 @@ define(["qpid/common/util", "qpid/common/metadata", "dijit/registry", "dojo/domR
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null,
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhost/bdb_ha/edit.html",
               function()
               {
                   registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
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
index 20d63378a7..4c70b4a22d 100644
--- 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
@@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"],
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data,
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html",
               function()
               {
                 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_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
index 3a50f98293..e3d69577dc 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
@@ -26,14 +26,11 @@ define(["qpid/common/util",
         "dojo/domReady!"],
    function (util, registry, Memory, ObjectStore, win)
    {
-       var fields = [ "storePath", "name", "groupName", "address",
-                      "designatedPrimary", "priority",  "quorumOverride"];
-
        return {
            show: function(data)
            {
               var that = this;
-              util.buildEditUI(data.containerNode, "virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, data.data,
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/bdb_ha/edit.html",
                 function(){that._postParse(data);});
            },
            _postParse: function(data)
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 0faae4323e..cfff12dcf2 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
@@ -117,11 +117,11 @@
             <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: '1', name: 'Default'},
                                                       {id: '2', name: 'High'},
                                                       {id: '3', name: 'Highest'}
                                                    ]"></div>
-            <input id="editVirtualHostNode.priority" data-dojo-type="dijit/form/FilteringSelect" value="1"
+            <input id="editVirtualHostNode.priority" data-dojo-type="dijit/form/FilteringSelect"
                    data-dojo-props="
                                 name: 'priority',
                                 required: false,
@@ -135,9 +135,9 @@
         <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>
+                 data-dojo-props="data: [{id: '0', name: 'Majority'}]"></div>
             <input type="text" id="editVirtualHostNode.quorumOverride"
-                   data-dojo-type="dijit/form/FilteringSelect" value="0"
+                   data-dojo-type="dijit/form/FilteringSelect"
                    data-dojo-props="
                                 name: 'quorumOverride',
                                 required: false,
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
index b98254f54b..c1018313b8 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
@@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"],
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null,
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhost/sizemonitoring/edit.html",
               function()
               {
                   registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
index 2ab6dcc22b..a7f5d05719 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
@@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"],
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data,
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html",
               function()
               {
                 registry.byId("editVirtualHostNode.storePath").set("disabled", data.data.state != "STOPPED");
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
index 22823b675a..4a2a3763bd 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
@@ -29,12 +29,12 @@ define(["qpid/common/util",
    function (util, poolTypeJsonString, array, json, string, Memory, dom, domConstruct, registry)
    {
 
-       var fieldNames = ["connectionUrl", "username", "connectionPoolType"];
        return {
            show: function(data)
            {
               var that = this;
-              util.buildEditUI(data.containerNode, "virtualhost/jdbc/edit.html", "editVirtualHost.", fieldNames, data.data, function(){that._postParse(data)});
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhost/jdbc/edit.html",
+                function(){that._postParse(data)});
            },
            _postParse: function(data)
            {
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
index 5586cf6c07..cccfa95d4c 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
@@ -28,13 +28,11 @@ define(["qpid/common/util",
         "dojo/domReady!"],
    function (util, poolTypeJsonString, array, json, string, Memory, dom, domConstruct, registry)
    {
-        var fieldNames = ["connectionUrl", "username", "connectionPoolType"];
         return {
             show: function(data)
             {
                 var that = this;
-                util.buildEditUI(data.containerNode, "virtualhostnode/jdbc/edit.html", "editVirtualHostNode.",
-                                 fieldNames, data.data, function(){ that._postParse(data);});
+                util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/jdbc/edit.html", function(){ that._postParse(data);});
             },
             _postParse: function(data)
             {
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
index cee18f7185..59597845a2 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
@@ -19,31 +19,34 @@
 <div class="dijitHidden">
   <div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Virtual Host'" id="editVirtualHostNodeDialog">
       <form id="editVirtualHostNodeForm" method="post" data-dojo-type="dijit/form/Form">
-        <div id="editVirtualHostNode.contentPane">
-          <div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host Node restart.</div>
-          <div class="clear">
-              <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
-              <div class="formLabel-controlCell tableContainer-valueCell">
-                  <input type="text" id="editVirtualHostNode.name"
-                         data-dojo-type="dijit/form/ValidationTextBox"
-                         data-dojo-props="
+          <div id="editVirtualHostNode.allFields">
+              <div id="editVirtualHostNode.contentPane">
+                  <div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host Node restart.</div>
+                  <div class="clear">
+                      <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
+                      <div class="formLabel-controlCell tableContainer-valueCell">
+                          <input type="text" id="editVirtualHostNode.name"
+                                 data-dojo-type="dijit/form/ValidationTextBox"
+                                 data-dojo-props="
                               name: 'name',
                               placeHolder: 'name',
                               required: true,
                               missingMessage: 'Name must be supplied',
                               disabled: true,
                               title: 'Enter virtual host name'" />
-              </div>
-          </div>
+                      </div>
+                  </div>
 
-          <div id="editVirtualHostNode.typeFields"></div>
+                  <div id="editVirtualHostNode.typeFields"></div>
 
-          <div class="clear"></div>
+                  <div class="clear"></div>
 
-          <div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 'Context variables',  open: false">
-                  <div id="editVirtualHostNode.context" ></div>
+                  <div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 'Context variables',  open: false">
+                      <div id="editVirtualHostNode.context" ></div>
+                  </div>
+              </div>
           </div>
-        </div>
+
         <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
               <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.saveButton" data-dojo-props="label: 'Save'">Save</button>
               <button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
index 43f4d1dc84..3938b74762 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
@@ -565,29 +565,6 @@ define(["dojo/_base/xhr",
 
            }
 
-           util.buildEditUI = function(containerNode, htmlTemplateLocation, fieldNamePrefix, fieldNames, data, postParseCallback)
-           {
-               this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation, function()
-               {
-
-                if (fieldNames)
-                {
-                   for(var i = 0; i < fieldNames.length; i++)
-                   {
-                     var fieldName = fieldNames[i];
-                     var widget = registry.byId(fieldNamePrefix + fieldName);
-                     widget.set("value", data[fieldName]);
-                   }
-                }
-
-                if (postParseCallback && typeof postParseCallback == "function")
-                {
-                    postParseCallback();
-                }
-
-               });
-           }
-
            util.updateUI = function(data, fieldNames, obj)
            {
              for(var i=0; i<fieldNames.length;i++)
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
index 8638164d9f..b5a7edab2d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
@@ -57,6 +57,7 @@ define(["dojo/_base/xhr",
       _postParse: function()
       {
         var that=this;
+        this.allFieldsContainer = dom.byId("editVirtualHostNode.allFields");
         this.typeFieldsContainer = dom.byId("editVirtualHostNode.typeFields");
         this.dialog = registry.byId("editVirtualHostNodeDialog");
         this.saveButton = registry.byId("editVirtualHostNode.saveButton");
@@ -164,7 +165,7 @@ define(["dojo/_base/xhr",
                     TypeUI.show({containerNode:that.typeFieldsContainer, parent: that, data: actualData, effectiveData: effectiveData});
                     that.form.connectChildren();
 
-                    util.applyMetadataToWidgets(that.allFieldsContainer, "VirtualHostNode", actualData.type);
+                    util.applyToWidgets(that.allFieldsContainer, "VirtualHostNode", actualData.type, actualData);
                 }
                 catch(e)
                 {
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
index 9672426384..3a305fb016 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
@@ -20,11 +20,10 @@
 define(["dijit/registry", "qpid/common/util", "dojo/domReady!"],
    function (registry, util)
    {
-       var fieldNames = ["storeUnderfullSize", "storeOverfullSize"];
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhost/providedstore/edit.html", "editVirtualHost.", fieldNames, data.data,
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhost/providedstore/edit.html",
               function()
               {
                   registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
index 20d63378a7..4c70b4a22d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
@@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"],
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data,
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html",
               function()
               {
                 registry.byId("editVirtualHostNode.storePath").set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED"));