qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macb...@apache.org
Subject svn commit: r1614644 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/virtualhost/bdb_ha/ bdbstore/src/main/java/resources/virtualhostnode/bdb/ bdbstore/src/main/java/r...
Date Wed, 30 Jul 2014 12:57:05 GMT
Author: macbean
Date: Wed Jul 30 12:57:04 2014
New Revision: 1614644

URL: http://svn.apache.org/r1614644
Log:
QPID-5928: [Java Broker] Further enhancements and feedback changes for
initial implementation

Modified:
    qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
    qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html
    qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
    qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
    qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
    qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
    qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
    qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
(original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
Wed Jul 30 12:57:04 2014
@@ -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 child = this[localTransactionSynchronizationPolicy].children[i];
+            if (child.className == localTransactionSynchronizationPolicy + "-" + localSyncPolicy)
+            {
+                child.style.display = "block";
+            }
+            else
+            {
+                child.style.display = "none";
+            }
+        }
+
+        for(var j=0; j<this[remoteTransactionSynchronizationPolicy].children.length;j++)
         {
-           var policyName = syncPolicies[i];
-           if (policyName==localSyncPolicy)
-           {
-            this[localTransactionSynchronizationPolicy + "-" + policyName].checked = true
-           }
-           else
-           {
-            this[localTransactionSynchronizationPolicy + "-" + policyName].checked = false
-           }
-
-           if (policyName==remoteSyncPolicy)
-           {
-             this[remoteTransactionSynchronizationPolicy + "-" + policyName].checked = true
-           }
-           else
-           {
-             this[remoteTransactionSynchronizationPolicy + "-" + policyName].checked = false
-           }
+            var child = this[remoteTransactionSynchronizationPolicy].children[j];
+            if (child.className == remoteTransactionSynchronizationPolicy + "-" + remoteSyncPolicy)
+            {
+                child.style.display = "block";
+            }
+            else
+            {
+                child.style.display = "none";
+            }
         }
     }
 

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html Wed
Jul 30 12:57:04 2014
@@ -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>

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html Wed
Jul 30 12:57:04 2014
@@ -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"

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
(original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
Wed Jul 30 12:57:04 2014
@@ -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"

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
(original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
Wed Jul 30 12:57:04 2014
@@ -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">

Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
Wed Jul 30 12:57:04 2014
@@ -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"

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
(original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
Wed Jul 30 12:57:04 2014
@@ -47,6 +47,7 @@ define(["dojo/_base/xhr",
             var poolTypesStore = new Memory({ data: poolTypesData });
             var poolTypeControl = registry.byId("addVirtualHost.connectionPoolType");
             poolTypeControl.set("store", poolTypesStore);
+            poolTypeControl.set("value", "NONE");
 
             var poolTypeFieldsDiv = dom.byId("addVirtualHost.poolSpecificDiv");
             poolTypeControl.on("change",

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
(original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
Wed Jul 30 12:57:04 2014
@@ -49,6 +49,7 @@ define(["dojo/_base/xhr",
             var poolTypesStore = new Memory({ data: poolTypesData });
             var poolTypeControl = registry.byId("addVirtualHostNode.connectionPoolType");
             poolTypeControl.set("store", poolTypesStore);
+            poolTypeControl.set("value", "NONE");
 
             var poolTypeFieldsDiv = dom.byId("addVirtualHostNode.poolSpecificDiv");
             poolTypeControl.on("change",

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
Wed Jul 30 12:57:04 2014
@@ -73,4 +73,5 @@
 
     <div style="clear:both"></div>
     <div id="addVirtualHost.poolSpecificDiv"></div>
+    <div class="infoMessage">The virtual host will have the same name as the node.</div>
 </div>

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
Wed Jul 30 12:57:04 2014
@@ -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">JDBC Url*:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.connectionUrl"

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
Wed Jul 30 12:57:04 2014
@@ -28,6 +28,20 @@
               <fieldset>
                 <legend>Virtual Host Node</legend>
                     <div style="clear:both">
+                      <div class="formLabel-labelCell tableContainer-labelCell">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">Type*:</div>
                         <div class="tableContainer-valueCell formLabel-controlCell">
                             <select id="addVirtualHostNode.type" data-dojo-type="dijit/form/FilteringSelect"

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
Wed Jul 30 12:57:04 2014
@@ -218,4 +218,12 @@ div .messages {
     display: none
 }
 
-
+.alignLeft {
+    float: left;
+}
+.alignRight {
+    float: right;
+}
+.multiLineValue {
+    display: inline-block;
+}

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
Wed Jul 30 12:57:04 2014
@@ -101,12 +101,32 @@ define(["dojo/_base/xhr",
                              "PUT", {desiredState: "STOPPED"});
                  }
                });
+
+            this.vhostsGrid = new UpdatableStore([], query(".virtualHost", containerNode)[0],
+            [
+              { name: "Name", field: "name", width: "40%"},
+              { name: "State", field: "state", width: "30%"},
+              { name: "Type", field: "type", width: "30%"}
+            ], function(obj) {
+                    connect.connect(obj.grid, "onRowDblClick", obj.grid,
+                        function(evt){
+                            var idx = evt.rowIndex,
+                            theItem = this.getItem(idx);
+                            that.showVirtualHost(theItem);
+                        });
+                    }, {height: 200, canSort : function(col) {return false;} });
+
              this.vhostNodeUpdater = new Updater(containerNode, this.modelObj, this);
              this.vhostNodeUpdater.update();
 
              updater.add( this.vhostNodeUpdater );
            }
 
+           VirtualHostNode.prototype.showVirtualHost=function(item)
+           {
+             this.controller.show("virtualhost", item.name, this.modelObj, item.id);
+           }
+
            VirtualHostNode.prototype.close = function()
            {
                updater.remove( this.vhostNodeUpdater );
@@ -178,6 +198,11 @@ define(["dojo/_base/xhr",
              {
                this.details.update(data);
              }
+
+             if (data.virtualhosts)
+             {
+                this.virtualHostNode.vhostsGrid.update(data.virtualhosts);
+             }
            }
 
            return VirtualHostNode;

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
Wed Jul 30 12:57:04 2014
@@ -107,6 +107,7 @@ define(["dojo/_base/xhr",
 
         this.virtualHostForm.reset();
         this.virtualHostType.set("value", null);
+
         this.dialog.show();
       },
       destroy: function()
@@ -170,14 +171,12 @@ define(["dojo/_base/xhr",
         }
         else
         {
-          if (this.virtualHostType.value == "BDB_HA")
+          if (this.virtualHostTypeStore.get("BDB_HA"))
           {
-            if (this.virtualHostTypeStore.get("BDB_HA"))
-            {
-              this.virtualHostTypeStore.remove("BDB_HA");
-            }
-            this.virtualHostType.set("value", "");
+            this.virtualHostTypeStore.remove("BDB_HA");
           }
+          this.virtualHostType.set("value", "");
+
           this.virtualHostType.set("disabled", false);
         }
       },

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
Wed Jul 30 12:57:04 2014
@@ -33,6 +33,11 @@ define(["dojo/_base/xhr",
         {
             this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
             parser.parse(this.containerNode);
+
+            if (data.parent.virtualHostNodeType.value == "JDBC")
+            {
+                dom.byId("addVirtualHost.diskFlowControls").style.display = "none";
+            }
         }
     };
   }

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
Wed Jul 30 12:57:04 2014
@@ -22,14 +22,37 @@
 
 <div class="virtualhost">
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host Attributes',
 open: true">
-        <div style="clear:both">
-            <div class="formLabel-labelCell">Name:</div>
-            <div class="name" style="float:left;"></div>
+        <div class="alignLeft">
+            <div style="clear:both">
+                <div class="formLabel-labelCell">Name:</div>
+                <div class="name" style="float:left;"></div>
+            </div>
+            <div style="clear:both">
+                <div class="formLabel-labelCell">Type:</div>
+                <div class="type" style="float:left;"></div>
+            </div>
         </div>
-        <div style="clear:both">
-            <div class="formLabel-labelCell">Type:</div>
-            <div class="type" style="float:left;"></div>
+        <div class="alignRight">
+            <div>
+                <div class="formLabel-labelCell">Inbound:</div>
+                <div class="alignRight">
+                    <span class="msgInRate"></span>
+                    <span> msg/s</span>
+                    <span class="bytesInRate"></span>
+                    <span class="bytesInRateUnits"></span>
+                </div>
+            </div>
+            <div>
+                <div class="formLabel-labelCell">Outbound:</div>
+                <div class="alignRight">
+                    <span class="msgOutRate"></span>
+                    <span> msg/s</span>
+                    <span class="bytesOutRate"></span>
+                    <span class="bytesOutRateUnits"></span>
+                </div>
+            </div>
         </div>
+        <div style="clear:both"></div>
         <div style="clear:both">
             <div class="formLabel-labelCell">State:</div>
             <div class="state" style="float:left;"></div>
@@ -55,22 +78,18 @@
             <div style="clear:both">
                 <div class="formLabel-labelCell">Idle timeout before a warning (ms)
:</div>
                 <div class="storeTransactionIdleTimeoutWarn" style="float:left;"></div>
-                <div class="formLabel-description">The time a transaction can be idle
for after which a warning alert will be issued</div>
             </div>
             <div style="clear:both">
                 <div class="formLabel-labelCell">Idle timeout before closing (ms) :</div>
                 <div class="storeTransactionIdleTimeoutClose" style="float:left;"></div>
-                <div class="formLabel-description">The time a transaction can be idle
for before the connection it is on is closed</div>
             </div>
             <div style="clear:both">
                 <div class="formLabel-labelCell" >Open timeout before warning (ms)
:</div>
                 <div class="storeTransactionOpenTimeoutWarn" style="float:left;"></div>
-                <div class="formLabel-description">The time a transaction can be open
for after which a warning alert will be issued</div>
             </div>
             <div style="clear:both">
                 <div class="formLabel-labelCell">Open timeout before closing (ms) :</div>
                 <div class="storeTransactionOpenTimeoutClose" style="float:left;"></div>
-                <div class="formLabel-description">The time a transaction can be open
for before the connection it is on is closed</div>
             </div>
             <div style="clear:both"></div>
         </div>
@@ -99,30 +118,6 @@
     </div>
 
     <br/>
-
-    <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Statistics',  open:
true">
-        <div style="clear:both">
-            <div class="formLabel-labelCell">Inbound:</div>
-            <div style="float:left;">
-                <span class="msgInRate"></span>
-                <span> msg/s</span>
-                <span class="bytesInRate"></span>
-                <span class="bytesInRateUnits"></span>
-            </div>
-        </div>
-        <div style="clear:both">
-            <div class="formLabel-labelCell">Outbound:</div>
-            <div style="float:left;">
-                <span class="msgOutRate"></span>
-                <span> msg/s</span>
-                <span class="bytesOutRate"></span>
-                <span class="bytesOutRateUnits"></span>
-            </div>
-        </div>
-        <div style="clear:both"></div>
-    </div>
-
-    <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Exchanges'">
         <div class="exchanges"></div>
         <button data-dojo-type="dijit.form.Button" class="addExchangeButton">Add Exchange</button>

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html
Wed Jul 30 12:57:04 2014
@@ -45,5 +45,8 @@
       <button data-dojo-type="dijit.form.Button" class="deleteNodeButton" data-dojo-props="iconClass:
'dijitIconDelete'">Delete</button>
     </div>
     <br/>
+    <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host'" class="virtualHostGridPanel"
style="clear:both">
+        <div class="virtualHost"></div>
+    </div>
 </div>
 

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
Wed Jul 30 12:57:04 2014
@@ -18,6 +18,7 @@
   -->
 
 <div>
+  <div id="addVirtualHost.diskFlowControls">
     <div style="clear:both">
         <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
@@ -44,5 +45,7 @@
                               constraints:{min:0,places:0}" />
         </div>
     </div>
+   </div>
     <div style="clear:both"></div>
+    <div class="infoMessage">The virtual host will have the same name as the node.</div>
 </div>

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
Wed Jul 30 12:57:04 2014
@@ -58,4 +58,5 @@
         </div>
     </div>
     <div style="clear:both"></div>
+    <div class="infoMessage">The virtual host will have the same name as the node.</div>
 </div>

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
Wed Jul 30 12:57:04 2014
@@ -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.jsonNodeName"
-                          data-dojo-type="dijit/form/ValidationTextBox"
-                          data-dojo-props="
-                              name: 'name',
-                              placeHolder: 'node name',
-                              required: true,
-                              missingMessage: 'A node name must be supplied',
-                              title: 'Enter 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.jsonStorePath"

Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
Wed Jul 30 12:57:04 2014
@@ -18,4 +18,5 @@
   -->
 <div>
     <div style="clear:both"></div>
+    <div class="infoMessage">The virtual host will have the same name as the node.</div>
 </div>

Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html?rev=1614644&r1=1614643&r2=1614644&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
(original)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
Wed Jul 30 12:57:04 2014
@@ -19,19 +19,5 @@
  -
  -->
 <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>
 </div>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message