QPID-5928: [Java Broker] Further enhancements and feedback changes for

initial implementation

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

5 files changed, 54 insertions, 102 deletions

diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
index d95d223e2d..9cf6bdea66 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
@@ -20,47 +20,60 @@
 define(["qpid/common/util", "dojo/query", "dojo/domReady!"],
   function (util, query)
   {
-    var fields = [ "storeUnderfullSize", "storeOverfullSize", "permittedNodes"];
-    var syncPolicies = ["sync", "no_sync", "write_no_sync"];
     var localTransactionSynchronizationPolicy = "localTransactionSynchronizationPolicy";
     var remoteTransactionSynchronizationPolicy = "remoteTransactionSynchronizationPolicy";
 
+    var fields = [ "storeUnderfullSize", "storeOverfullSize"];
+
     function BDB(data)
     {
         util.buildUI(data.containerNode, data.parent, "virtualhost/bdb_ha/show.html", fields, this);
-        for(var i=0; i<syncPolicies.length;i++)
-        {
-           var policyName = syncPolicies[i];
-           this[localTransactionSynchronizationPolicy + "-" + policyName]= query("." + localTransactionSynchronizationPolicy + "-" +  policyName, data.containerNode)[0];
-           this[remoteTransactionSynchronizationPolicy +"-" + policyName]= query("." + remoteTransactionSynchronizationPolicy + "-" +  policyName, data.containerNode)[0];
-        }
+        this["permittedNodes"]= query(".permittedNodes", data.containerNode)[0];
+        this[localTransactionSynchronizationPolicy]= query("." + localTransactionSynchronizationPolicy, data.containerNode)[0];
+        this[remoteTransactionSynchronizationPolicy]= query("."+ remoteTransactionSynchronizationPolicy, data.containerNode)[0];
     }
 
     BDB.prototype.update = function(data)
     {
         util.updateUI(data, fields, this);
+
+        var permittedNodesMarkup = "";
+        if (data.permittedNodes)
+        {
+            for(var i=0;i<data.permittedNodes.length;i++)
+            {
+                permittedNodesMarkup+="<div>" + data.permittedNodes[i] + "</div>";
+            }
+        }
+        this["permittedNodes"].innerHTML = permittedNodesMarkup ;
+
         var localSyncPolicy =  data[localTransactionSynchronizationPolicy].toLowerCase();
         var remoteSyncPolicy =  data[remoteTransactionSynchronizationPolicy].toLowerCase();
-        for(var i=0; i<syncPolicies.length;i++)
+
+        for(var i=0; i<this[localTransactionSynchronizationPolicy].children.length;i++)
         {
-           var policyName = syncPolicies[i];
-           if (policyName==localSyncPolicy)
-           {
-            this[localTransactionSynchronizationPolicy + "-" + policyName].checked = true
-           }
-           else
-           {
-            this[localTransactionSynchronizationPolicy + "-" + policyName].checked = false
-           }
+            var child = this[localTransactionSynchronizationPolicy].children[i];
+            if (child.className == localTransactionSynchronizationPolicy + "-" + localSyncPolicy)
+            {
+                child.style.display = "block";
+            }
+            else
+            {
+                child.style.display = "none";
+            }
+        }
 
-           if (policyName==remoteSyncPolicy)
-           {
-             this[remoteTransactionSynchronizationPolicy + "-" + policyName].checked = true
-           }
-           else
-           {
-             this[remoteTransactionSynchronizationPolicy + "-" + policyName].checked = false
-           }
+        for(var j=0; j<this[remoteTransactionSynchronizationPolicy].children.length;j++)
+        {
+            var child = this[remoteTransactionSynchronizationPolicy].children[j];
+            if (child.className == remoteTransactionSynchronizationPolicy + "-" + remoteSyncPolicy)
+            {
+                child.style.display = "block";
+            }
+            else
+            {
+                child.style.display = "none";
+            }
         }
     }
 
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 42e1617f38..a5a4147c9c 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
@@ -28,48 +28,28 @@
   </div>
   <div style="clear:both">
       <div class="formLabel-labelCell">Permitted Nodes:</div>
-      <div class="permittedNodes"></div>
+      <div class="permittedNodes multiLineValue"></div>
   </div>
   <div style="clear:both"></div>
   <br/>
 
   <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'High Availability Durability',  open: true">
-      <div>Before each transaction commit returns to the caller the following will be true:</div>
-      <div>
-           <div>At the master node, the node will have received the required minimum number of acknowledgements from the replica nodes and the transaction will have been:</div>
-          <div>
-              <input type="radio" disabled="true" class="localTransactionSynchronizationPolicy-sync" name="localTransactionSynchronizationPolicy" value="SYNC"/>
-              <label>written and synchronized to the disk [default - highest durability],</label>
-          </div>
-
-          <div>
-              <input type="radio" disabled="true" class="localTransactionSynchronizationPolicy-write_no_sync"  name="localTransactionSynchronizationPolicy" value="WRITE_NO_SYNC"/>
-              <label>written only; the synchronization will be performed later,</label>
-          </div>
-
-          <div>
-              <input type="radio" class="localTransactionSynchronizationPolicy-no_sync" disabled="true" name="localTransactionSynchronizationPolicy" value="NO_SYNC"/>
-              <label>write later; the transaction will be written and synchronized later [lowest durability],</label>
+      <div style="clear:both">
+          <div class="formLabel-labelCell">Local 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>
+            <span class="localTransactionSynchronizationPolicy-no_sync">NO_SYNC (write later; the transaction will be written and synchronized later; lowest durability)</span>
           </div>
       </div>
-      <div>
-          <div>At the required minimum number od replica nodes, the transaction will have been:</div>
-          <div>
-              <input type="radio" disabled="true" class="remoteTransactionSynchronizationPolicy-sync" name="remoteTransactionSynchronizationPolicy" value="SYNC"/>
-              <label>written and synchronized to the disk [default - highest durability],</label>
-          </div>
-
-          <div>
-              <input type="radio" disabled="true" class="remoteTransactionSynchronizationPolicy-write_no_sync"  name="remoteTransactionSynchronizationPolicy"  value="WRITE_NO_SYNC"/>
-              <label>written only; the synchronization will be performed later,</label>
-          </div>
-
-          <div>
-              <input type="radio" class="remoteTransactionSynchronizationPolicy-no_sync" disabled="true" name="remoteTransactionSynchronizationPolicy" value="NO_SYNC"/>
-              <label>write later; the transaction will be written and synchronized later [lowest durability],</label>
+      <div style="clear:both">
+          <div class="formLabel-labelCell">Remote 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>
+              <span class="remoteTransactionSynchronizationPolicy-no_sync">NO_SYNC (write later; the transaction will be written and synchronized later; lowest durability)</span>
           </div>
       </div>
   </div>
 
-
 </div>
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
index b47a0b0cf2..a12c910ab1 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
@@ -20,20 +20,6 @@
  -->
 <div>
     <div style="clear:both">
-      <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
-      <div class="formLabel-controlCell tableContainer-valueCell">
-          <input type="text" id="addVirtualHostNode.name"
-                          data-dojo-type="dijit/form/ValidationTextBox"
-                          data-dojo-props="
-                              name: 'name',
-                              placeHolder: 'virtual host node name',
-                              required: true,
-                              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">
       <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.storePath"
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
index fc1b979d70..de38b553e8 100644
--- 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
@@ -41,7 +41,7 @@
                     <input type="text" id="addVirtualHostNode.helperNodeName"
                            data-dojo-type="dijit/form/ValidationTextBox"
                            data-dojo-props="
-                                  name: 'name',
+                                  name: 'helperNodeName',
                                   placeHolder: 'node name from group',
                                   required: true,
                                   missingMessage: 'A node name must be supplied',
@@ -71,20 +71,6 @@
         <fieldset>
             <legend>New node details</legend>
             <div style="clear:both">
-                <div class="formLabel-labelCell tableContainer-labelCell">Node Name*:</div>
-                <div class="formLabel-controlCell tableContainer-valueCell">
-                    <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">Address*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text" id="addVirtualHostNode.address"
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 4517675835..02542a28ce 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
@@ -17,20 +17,7 @@
   ~ under the License.
   -->
 <div>
-    <div style="clear:both">
-      <div class="formLabel-labelCell tableContainer-labelCell">Node name*:</div>
-      <div class="formLabel-controlCell tableContainer-valueCell">
-          <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">Group name*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">