QPID-4167: Fix setting of queue attributes via web management console and rest interfaces. Also import Subscription into the bundle to resolve CDNFExcept ion when viewing a queue with Consumers.

Work by Oleksandr Rudyy, Keith Wall and myself.


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

4 files changed, 60 insertions, 43 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
index a83c388bb4..4912d8eb5d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
@@ -94,7 +94,7 @@
                         <td><input type="text" required="false" name="queueFlowControlSizeBytes" id="formAddQueue.capacity" placeholder="Size in bytes"
                             dojoType="dijit.form.ValidationTextBox"
                             trim="true"
-                            regexp="(^[0-9]+(b|K(b)?|M(b)?|G(b)?)?$)"
+                            regexp="[0-9]+"
                             invalidMessage= "Invalid value"/></td>
                     </tr>
                     <!-- x-qpid-flow-resume-capacity -->
@@ -103,7 +103,7 @@
                         <td><input type="text" required="false" name="queueFlowResumeSizeBytes" id="formAddQueue.flowResumeCapacity" placeholder="Size in bytes"
                             dojoType="dijit.form.ValidationTextBox"
                             trim="true"
-                            regexp="(^[0-9]+(b|K(b)?|M(b)?|G(b)?)?$)"
+                            regexp="[0-9]+"
                             invalidMessage= "Invalid value"/></td>
                     </tr>
                 </table>
@@ -111,27 +111,28 @@
             <br/>
             <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Settings', open: false">
                 <table cellpadding="0" cellspacing="2">
+                    <!-- x-qpid-maximum-message-count -->
                     <tr>
-                        <td valign="top"><strong>Maximum Message Age:  </strong></td>
-                        <td><input type="text" required="false" name="alertThresholdMessageAge" id="formAddQueue.maximumMessageAge" placeholder="Time in ms"
+                        <td valign="top"><strong>Queue Depth:  </strong></td>
+                        <td><input type="text" required="false" name="alertThresholdQueueDepthMessages" id="formAddQueue.maximumMessageCount" placeholder="Count of messages"
                             dojoType="dijit.form.ValidationTextBox"
                             trim="true"
-                            regexp="(^[0-9]+(s(ec(ond(s)?)?)?|m(in(ute)?(s)?)?|h|d|w|M|y)?$)"
+                            regexp="[0-9]+"
                             invalidMessage= "Invalid value" /></td>
                     </tr>
-                    <!-- x-qpid-maximum-message-size -->
+                    <!-- x-qpid-maximum-message-age -->
                     <tr>
-                        <td valign="top"><strong>Maximum Message Size:  </strong></td>
-                        <td><input type="text" required="false" name="alertThresholdMessageSize" id="formAddQueue.maximumMessageSize" placeholder="Size in bytes"
+                        <td valign="top"><strong>Message Age:  </strong></td>
+                        <td><input type="text" required="false" name="alertThresholdMessageAge" id="formAddQueue.maximumMessageAge" placeholder="Time in ms"
                             dojoType="dijit.form.ValidationTextBox"
                             trim="true"
-                            regexp="(^[0-9]+(b|K(b)?|M(b)?|G(b)?)?$)"
+                            regexp="[0-9]+"
                             invalidMessage= "Invalid value"  /></td>
                     </tr>
-                    <!-- x-qpid-maximum-message-count -->
+                    <!-- x-qpid-maximum-message-size -->
                     <tr>
-                        <td valign="top"><strong>Maximum Number in Queue:  </strong></td>
-                        <td><input type="text" required="false" name="alertThresholdQueueDepthMessages" id="formAddQueue.maximumMessageCount" placeholder="Count of messages"
+                        <td valign="top"><strong>Message Size:  </strong></td>
+                        <td><input type="text" required="false" name="alertThresholdMessageSize" id="formAddQueue.maximumMessageSize" placeholder="Size in bytes"
                             dojoType="dijit.form.ValidationTextBox"
                             trim="true"
                             regexp="[0-9]+"
@@ -143,7 +144,7 @@
                         <td><input type="text" required="false" name="alertRepeatGap" id="formAddQueue.minimumAlertRepeatGap" placeholder="Time in ms"
                             dojoType="dijit.form.ValidationTextBox"
                             trim="true"
-                            regexp="(^[0-9]+(s(ec(ond(s)?)?)?|m(in(ute)?(s)?)?|h|d|w|M|y)?$)"
+                            regexp="[0-9]+"
                             invalidMessage= "Invalid value" /></td>
                     </tr>
                 </table>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
index 1843552f46..3fabc409be 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
@@ -58,6 +58,16 @@ define(["dojo/_base/xhr",
                 sorted: "sortkey"
             };
 
+        var fieldConverters = {
+                queueFlowControlSizeBytes:        parseInt,
+                queueFlowResumeSizeBytes:         parseInt,
+                alertThresholdMessageSize:        parseInt,
+                alertThresholdQueueDepthMessages: parseInt,
+                maximumDeliveryAttempts:          parseInt,
+                alertThresholdMessageAge:         parseInt,
+                alertRepeatGap:                   parseInt
+            }
+
         var convertToQueue = function convertToQueue(formValues)
             {
                 var newQueue = {};
@@ -74,7 +84,14 @@ define(["dojo/_base/xhr",
                         } else if (!typeSpecificFields.hasOwnProperty(propName) ||
                                         formValues.type === typeSpecificFields[ propName ]) {
                             if(formValues[ propName ] !== "") {
-                                newQueue[ propName ] = formValues[propName];
+                                if (fieldConverters.hasOwnProperty(propName))
+                                {
+                                    newQueue[ propName ] = fieldConverters[propName](formValues[propName]);
+                                }
+                                else
+                                {
+                                    newQueue[ propName ] = formValues[propName];
+                                }
                             }
                         }
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
index f4960055b0..9d156f817b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
@@ -69,33 +69,31 @@
     </div>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Thresholds', open: false">
-        <span style="">Max. Queue Size:</span>
+        <span style="">Queue Depth:</span>
         <span class="alertThresholdQueueDepthMessages"
-              style="position:absolute; left:8em; width:8em; text-align:right"></span>
-        <span style="position:absolute; left:16.2em">msgs</span>
+              style="position:absolute; left:4em; width:8em; text-align:right"></span>
+        <span style="position:absolute; left:12.2em">msgs</span>
 
+        <span style="position:absolute; left:21em">Queue Depth:</span>
         <span class="alertThresholdQueueDepthBytes"
-              style="position:absolute; left:20em; width:8em; text-align:right"></span>
-        <span class="alertThresholdQueueDepthBytesUnits" style="position:absolute; left:28.2em"></span>
+              style="position:absolute; left:22em; width:8em; text-align:right"></span>
+        <span class="alertThresholdQueueDepthBytesUnits" style="position:absolute; left:30.2em"></span>
         <br>
-        <span style="">Max. Message Age:</span>
+        <span style="">Message Age:</span>
         <span class="alertThresholdMessageAge"
-              style="position:absolute; left:8em; width:8em; text-align:right"></span>
-        <span class="alertThresholdMessageAgeUnits" style="position:absolute; left:16.2em"></span>
+              style="position:absolute; left:4em; width:8em; text-align:right"></span>
+        <span class="alertThresholdMessageAgeUnits" style="position:absolute; left:12.2em"></span>
 
-        <span style="position:absolute; left:21em">Size: </span>
+        <span style="position:absolute; left:21em">Message Size: </span>
         <span class="alertThresholdMessageSize"
-              style="position:absolute; left:23em; width:5em; text-align:right"></span>
-        <span class="alertThresholdMessageSizeUnits" style="position:absolute; left:28.2em"></span>
+              style="position:absolute; left:25em; width:5em; text-align:right"></span>
+        <span class="alertThresholdMessageSizeUnits" style="position:absolute; left:30.2em"></span>
         <br/>
         <br/>
         <span style="">Alert frequency:</span>
         <span class="alertRepeatGap"
-              style="position:absolute; left:8em; width:8em; text-align:right"></span>
-        <span class="alertRepeatGapUnits" style="position:absolute; left:16.2em"></span>
-
-
-
+              style="position:absolute; left:4em; width:8em; text-align:right"></span>
+        <span class="alertRepeatGapUnits" style="position:absolute; left:12.2em"></span>
     </div>
 
     <div class="dijitDialogPaneActionBar">
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
index f4d998458f..73c912e0d4 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
@@ -57,30 +57,31 @@
     </div>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Thresholds', open: false">
-        <span style="">Max. Queue Size:</span>
+        <span style="">Queue Depth:</span>
         <span class="alertThresholdQueueDepthMessages"
-              style="position:absolute; left:8em; width:8em; text-align:right"></span>
-        <span style="position:absolute; left:16.2em">msgs</span>
+              style="position:absolute; left:4em; width:8em; text-align:right"></span>
+        <span style="position:absolute; left:12.2em">msgs</span>
 
+        <span style="position:absolute; left:21em">Queue Depth:</span>
         <span class="alertThresholdQueueDepthBytes"
-              style="position:absolute; left:20em; width:8em; text-align:right"></span>
-        <span class="alertThresholdQueueDepthBytesUnits" style="position:absolute; left:28.2em"></span>
+              style="position:absolute; left:22em; width:8em; text-align:right"></span>
+        <span class="alertThresholdQueueDepthBytesUnits" style="position:absolute; left:30.2em"></span>
         <br>
-        <span style="">Max. Message Age:</span>
+        <span style="">Message Age:</span>
         <span class="alertThresholdMessageAge"
-              style="position:absolute; left:8em; width:8em; text-align:right"></span>
-        <span class="alertThresholdMessageAgeUnits" style="position:absolute; left:16.2em"></span>
+              style="position:absolute; left:4em; width:8em; text-align:right"></span>
+        <span class="alertThresholdMessageAgeUnits" style="position:absolute; left:12.2em"></span>
 
-        <span style="position:absolute; left:21em">Size: </span>
+        <span style="position:absolute; left:21em">Message Size: </span>
         <span class="alertThresholdMessageSize"
-              style="position:absolute; left:23em; width:5em; text-align:right"></span>
-        <span class="alertThresholdMessageSizeUnits" style="position:absolute; left:28.2em"></span>
+              style="position:absolute; left:25em; width:5em; text-align:right"></span>
+        <span class="alertThresholdMessageSizeUnits" style="position:absolute; left:30.2em"></span>
         <br/>
         <br/>
         <span style="">Alert frequency:</span>
         <span class="alertRepeatGap"
-              style="position:absolute; left:8em; width:8em; text-align:right"></span>
-        <span class="alertRepeatGapUnits" style="position:absolute; left:16.2em"></span>
+              style="position:absolute; left:4em; width:8em; text-align:right"></span>
+        <span class="alertRepeatGapUnits" style="position:absolute; left:12.2em"></span>
     </div>
 </div>