From 9f22988ff2d01008ea0cd97d1b2fb8cb8bce96a1 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Fri, 29 Mar 2013 13:26:35 +0000 Subject: QPID-4677: Fix incorrect attribute names and update web management console UI affected by the changes in the attribute names git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1462471 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/resources/js/qpid/management/Broker.js | 91 ++++++++++++++-------- .../resources/js/qpid/management/VirtualHost.js | 10 +-- .../src/main/java/resources/showBroker.html | 58 ++++++++------ 3 files changed, 99 insertions(+), 60 deletions(-) (limited to 'qpid/java/broker-plugins/management-http/src/main') diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js index 6c2065fe9d..6c6ece0864 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js @@ -183,141 +183,154 @@ define(["dojo/_base/xhr", name: "peerStorePassword"}); } }, { - name: "alertThresholdQueueDepth", + name: "queue.alertThresholdQueueDepthMessages", createWidget: function(brokerData) { return new dijit.form.ValidationTextBox({ trim: "true", regexp: "[0-9]+", invalidMessage: "Invalid value", required: false, - value: brokerData.alertThresholdQueueDepth, + value: brokerData["queue.alertThresholdQueueDepthMessages"], placeholder: "Count of messages", - label: "Queue depth alert threshold:", - name: "alertThresholdQueueDepth" + label: "Queue depth messages alert threshold:", + name: "queue.alertThresholdQueueDepthMessages" }); } }, { - name: "alertThresholdMessageAge", + name: "queue.alertThresholdQueueDepthBytes", + createWidget: function(brokerData) { + return new dijit.form.ValidationTextBox({ + trim: "true", + regexp: "[0-9]+", + invalidMessage: "Invalid value", + required: false, + value: brokerData["queue.alertThresholdQueueDepthBytes"], + placeholder: "Number of bytes", + label: "Queue depth bytes alert threshold:", + name: "queue.alertThresholdQueueDepthBytes" + }); + } + }, { + name: "queue.alertThresholdMessageAge", createWidget: function(brokerData) { return new dijit.form.ValidationTextBox({ trim: "true", regexp: "[0-9]+", invalidMessage: "Invalid value", required: false, - value: brokerData.alertThresholdMessageAge, + value: brokerData["queue.alertThresholdMessageAge"], placeholder: "Time in ms", label: "Queue message age alert threshold:", - name: "alertThresholdMessageAge" + name: "queue.alertThresholdMessageAge" }); } }, { - name: "alertThresholdMessageSize", + name: "queue.alertThresholdMessageSize", createWidget: function(brokerData) { return new dijit.form.ValidationTextBox({ trim: "true", regexp: "[0-9]+", invalidMessage: "Invalid value", required: false, - value: brokerData.alertThresholdMessageSize, + value: brokerData["queue.alertThresholdMessageSize"], placeholder: "Size in bytes", label: "Queue message size alert threshold:", - name: "alertThresholdMessageSize" + name: "queue.alertThresholdMessageSize" }); } }, { - name: "alertRepeatGap", + name: "queue.alertRepeatGap", createWidget: function(brokerData) { return new dijit.form.ValidationTextBox({ trim: "true", regexp: "[0-9]+", invalidMessage: "Invalid value", required: false, - value: brokerData.alertThresholdMessageSize, - value: brokerData.alertRepeatGap, + value: brokerData["queue.alertRepeatGap"], placeholder: "Time in ms", label: "Queue alert repeat gap:", - name: "alertRepeatGap" + name: "queue.alertRepeatGap" }); } }, { - name: "maximumDeliveryAttempts", + name: "queue.maximumDeliveryAttempts", createWidget: function(brokerData) { return new dijit.form.ValidationTextBox({ trim: "true", regexp: "[0-9]+", invalidMessage: "Invalid value", required: false, - value: brokerData.maximumDeliveryAttempts, + value: brokerData["queue.maximumDeliveryAttempts"], placeholder: "Count of messages", label: "Queue maximum delivery retries:", - name: "maximumDeliveryAttempts" + name: "queue.maximumDeliveryAttempts" }); } }, { - name: "deadLetterQueueEnabled", + name: "queue.deadLetterQueueEnabled", createWidget: function(brokerData) { return new dijit.form.CheckBox({ required: false, - checked: brokerData.deadLetterQueueEnabled, + checked: brokerData["queue.deadLetterQueueEnabled"], value: "true", label: "Dead letter queue enabled:", - name: "deadLetterQueueEnabled", + name: "queue.deadLetterQueueEnabled", }); } }, { - name: "queueFlowControlSizeBytes", + name: "queue.flowControlSizeBytes", createWidget: function(brokerData) { return new dijit.form.ValidationTextBox({ trim: "true", regexp: "[0-9]+", invalidMessage: "Invalid value", required: false, - value: brokerData.queueFlowControlSizeBytes, + value: brokerData["queue.flowControlSizeBytes"], placeholder: "Size in bytes", label: "Queue flow capacity:", - name: "queueFlowControlSizeBytes", + name: "queue.flowControlSizeBytes", }); } }, { - name: "queueFlowResumeSizeBytes", + name: "queue.flowResumeSizeBytes", createWidget: function(brokerData) { return new dijit.form.ValidationTextBox({ trim: "true", regexp: "[0-9]+", invalidMessage: "Invalid value", required: false, - value: brokerData.queueFlowResumeSizeBytes, + value: brokerData["queue.flowResumeSizeBytes"], placeholder: "Size in bytes", label: "Queue flow resume capacity:", - name: "queueFlowResumeSizeBytes", + name: "queue.flowResumeSizeBytes", }); } }, { - name: "sessionCountLimit", + name: "connection.sessionCountLimit", createWidget: function(brokerData) { return new dijit.form.NumberSpinner({ invalidMessage: "Invalid value", required: false, - value: brokerData.sessionCountLimit, + value: brokerData["connection.sessionCountLimit"], smallDelta: 1, constraints: {min:1,max:65535,places:0, pattern: "#####"}, label: "Connection session limit:", - name: "sessionCountLimit" + name: "connection.sessionCountLimit" }); } }, { - name: "heartBeatDelay", + name: "connection.heartBeatDelay", createWidget: function(brokerData) { return new dijit.form.ValidationTextBox({ trim: "true", regexp: "[0-9]+", invalidMessage: "Invalid value", required: false, - value: brokerData.heartBeatDelay, + value: brokerData["connection.heartBeatDelay"], placeholder: "Time in ms", label: "Heart beat delay:", - name: "heartBeatDelay" + name: "connection.heartBeatDelay" }); } }, { @@ -344,6 +357,20 @@ define(["dojo/_base/xhr", name: "statisticsReportingResetEnabled" }); } + }, { + name: "virtualhost.housekeepingCheckPeriod", + createWidget: function(brokerData) { + return new dijit.form.ValidationTextBox({ + trim: "true", + regexp: "[0-9]+", + invalidMessage: "Invalid value", + required: false, + value: brokerData["virtualhost.housekeepingCheckPeriod"], + placeholder: "Time in ms", + label: "House keeping check period:", + name: "virtualhost.housekeepingCheckPeriod" + }); + } } ]; } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js index ceab5640d3..db24951921 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js @@ -263,28 +263,28 @@ define(["dojo/_base/xhr", // update alerting info - var alertRepeatGap = formatter.formatTime( thisObj.vhostData["alertRepeatGap"] ); + var alertRepeatGap = formatter.formatTime( thisObj.vhostData["queue.alertRepeatGap"] ); thisObj.alertRepeatGap.innerHTML = alertRepeatGap.value; thisObj.alertRepeatGapUnits.innerHTML = alertRepeatGap.units; - var alertMsgAge = formatter.formatTime( thisObj.vhostData["alertThresholdMessageAge"] ); + var alertMsgAge = formatter.formatTime( thisObj.vhostData["queue.alertThresholdMessageAge"] ); thisObj.alertThresholdMessageAge.innerHTML = alertMsgAge.value; thisObj.alertThresholdMessageAgeUnits.innerHTML = alertMsgAge.units; - var alertMsgSize = formatter.formatBytes( thisObj.vhostData["alertThresholdMessageSize"] ); + var alertMsgSize = formatter.formatBytes( thisObj.vhostData["queue.alertThresholdMessageSize"] ); thisObj.alertThresholdMessageSize.innerHTML = alertMsgSize.value; thisObj.alertThresholdMessageSizeUnits.innerHTML = alertMsgSize.units; - var alertQueueDepth = formatter.formatBytes( thisObj.vhostData["alertThresholdQueueDepthBytes"] ); + var alertQueueDepth = formatter.formatBytes( thisObj.vhostData["queue.alertThresholdQueueDepthBytes"] ); thisObj.alertThresholdQueueDepthBytes.innerHTML = alertQueueDepth.value; thisObj.alertThresholdQueueDepthBytesUnits.innerHTML = alertQueueDepth.units; - thisObj.alertThresholdQueueDepthMessages.innerHTML = thisObj.vhostData["alertThresholdQueueDepthMessages"]; + thisObj.alertThresholdQueueDepthMessages.innerHTML = thisObj.vhostData["queue.alertThresholdQueueDepthMessages"]; var stats = thisObj.vhostData[ "statistics" ]; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html index bdcff2b7e9..6d1adab992 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html @@ -93,50 +93,62 @@

-
-
-
Queue depth alert threshold:
-
+
+
+
Queue depth messages alert threshold:
+
-
+
+
Queue depth bytes alert threshold:
+
bytes +
+
Queue message age alert threshold:
-
ms +
ms
-
+
Queue message size alert threshold:
-
+
bytes
-
+
Queue alert repeat gap:
-
ms +
ms
-
+
Queue maximum delivery retries:
-
+
-
+
Dead letter queue enabled:
-
+
-
+
Queue flow capacity:
-
+
bytes
-
+
Queue flow resume capacity:
-
+
bytes

-
-
+
+
Connection session limit:
-
+
-
+
Heart beat delay:
-
ms +
ms +
+
+
+
+
+
+
House keeping check period:
+
ms
-- cgit v1.2.1