From d8292ff375e754f994b379b06938e2549e087e9f Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 9 May 2013 09:55:17 +0000
Subject: QPID-4823: add missing entry to AddQueue dialog for setting the
 'alertThresholdQueueDepthBytes' attribute

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1480581 13f79535-47bb-0310-9956-ffa450edef68
---
 .../management-http/src/main/java/resources/addQueue.html     | 11 ++++++++++-
 .../src/main/java/resources/js/qpid/management/addQueue.js    |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/broker-plugins/management-http/src/main/java/resources/addQueue.html b/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
index 90a0af7ea9..76123296b1 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
@@ -115,7 +115,16 @@
                     <!-- x-qpid-maximum-message-count -->
                     <tr>
                         <td valign="top"><strong>Queue Depth:  </strong></td>
-                        <td><input type="text" required="false" name="alertThresholdQueueDepthMessages" id="formAddQueue.maximumMessageCount" placeholder="Count of messages"
+                        <td><input type="text" required="false" name="alertThresholdQueueDepthMessages" id="formAddQueue.maximumMessageCount" placeholder="Number of messages"
+                            dojoType="dijit.form.ValidationTextBox"
+                            trim="true"
+                            regexp="[0-9]+"
+                            invalidMessage= "Invalid value" /></td>
+                    </tr>
+                    <!-- x-qpid-maximum-queue-depth -->
+                    <tr>
+                        <td valign="top"><strong>Queue Depth:  </strong></td>
+                        <td><input type="text" required="false" name="alertThresholdQueueDepthBytes" id="formAddQueue.maximumQueueDepth" placeholder="Total message size in bytes"
                             dojoType="dijit.form.ValidationTextBox"
                             trim="true"
                             regexp="[0-9]+"
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
index 53f82aff48..b1357f8c98 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
+++ b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
@@ -63,6 +63,7 @@ define(["dojo/_base/xhr",
                 queueFlowResumeSizeBytes:         parseInt,
                 alertThresholdMessageSize:        parseInt,
                 alertThresholdQueueDepthMessages: parseInt,
+                alertThresholdQueueDepthBytes:    parseInt,
                 maximumDeliveryAttempts:          parseInt,
                 alertThresholdMessageAge:         parseInt,
                 alertRepeatGap:                   parseInt
-- 
cgit v1.2.1