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

6 files changed, 38 insertions, 38 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index e4ea16fc5b..61b4b330d5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
@@ -182,7 +182,7 @@ public class VirtualHostConfiguration extends AbstractConfiguration
 
     public Long getMaximumQueueDepth()
     {
-        return getLongValue("queues.maximumQueueDepth", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH));
+        return getLongValue("queues.maximumQueueDepth", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES));
     }
 
     public Long getMaximumMessageSize()
@@ -192,7 +192,7 @@ public class VirtualHostConfiguration extends AbstractConfiguration
 
     public Long getMaximumMessageCount()
     {
-        return getLongValue("queues.maximumMessageCount", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_MESSAGE_COUNT));
+        return getLongValue("queues.maximumMessageCount", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES));
     }
 
     public Long getMinimumAlertRepeatGap()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
index 21a22d032d..2ecff163b7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -56,19 +56,19 @@ public interface Broker extends ConfiguredObject
     String DEFAULT_AUTHENTICATION_PROVIDER = "defaultAuthenticationProvider";
     String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost";
 
-    String ALERT_THRESHOLD_MESSAGE_AGE = "alertThresholdMessageAge";
-    String ALERT_THRESHOLD_MESSAGE_COUNT = "alertThresholdMessageCount";
-    String ALERT_THRESHOLD_QUEUE_DEPTH = "alertThresholdQueueDepth";
-    String ALERT_THRESHOLD_MESSAGE_SIZE = "alertThresholdMessageSize";
-    String ALERT_REPEAT_GAP = "alertRepeatGap";
-    String FLOW_CONTROL_SIZE_BYTES = "queueFlowControlSizeBytes";
-    String FLOW_CONTROL_RESUME_SIZE_BYTES = "queueFlowResumeSizeBytes";
-    String MAXIMUM_DELIVERY_ATTEMPTS = "maximumDeliveryAttempts";
-    String DEAD_LETTER_QUEUE_ENABLED = "deadLetterQueueEnabled";
-    String HOUSEKEEPING_CHECK_PERIOD = "housekeepingCheckPeriod";
-
-    String SESSION_COUNT_LIMIT = "sessionCountLimit";
-    String HEART_BEAT_DELAY = "heartBeatDelay";
+    String ALERT_THRESHOLD_MESSAGE_AGE = "queue.alertThresholdMessageAge";
+    String ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "queue.alertThresholdQueueDepthMessages";
+    String ALERT_THRESHOLD_QUEUE_DEPTH_BYTES = "queue.alertThresholdQueueDepthBytes";
+    String ALERT_THRESHOLD_MESSAGE_SIZE = "queue.alertThresholdMessageSize";
+    String ALERT_REPEAT_GAP = "queue.alertRepeatGap";
+    String FLOW_CONTROL_SIZE_BYTES = "queue.flowControlSizeBytes";
+    String FLOW_CONTROL_RESUME_SIZE_BYTES = "queue.flowResumeSizeBytes";
+    String MAXIMUM_DELIVERY_ATTEMPTS = "queue.maximumDeliveryAttempts";
+    String DEAD_LETTER_QUEUE_ENABLED = "queue.deadLetterQueueEnabled";
+    String HOUSEKEEPING_CHECK_PERIOD = "virtualhost.housekeepingCheckPeriod";
+
+    String SESSION_COUNT_LIMIT = "connection.sessionCountLimit";
+    String HEART_BEAT_DELAY = "connection.heartBeatDelay";
     String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod";
     String STATISTICS_REPORTING_RESET_ENABLED = "statisticsReportingResetEnabled";
     String STORE_TYPE = "storeType";
@@ -122,8 +122,8 @@ public interface Broker extends ConfiguredObject
                               DEFAULT_AUTHENTICATION_PROVIDER,
                               DEFAULT_VIRTUAL_HOST,
                               ALERT_THRESHOLD_MESSAGE_AGE,
-                              ALERT_THRESHOLD_MESSAGE_COUNT,
-                              ALERT_THRESHOLD_QUEUE_DEPTH,
+                              ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+                              ALERT_THRESHOLD_QUEUE_DEPTH_BYTES,
                               ALERT_THRESHOLD_MESSAGE_SIZE,
                               ALERT_REPEAT_GAP,
                               FLOW_CONTROL_SIZE_BYTES,
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java
index 6741b3328d..c6e33cbad5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java
@@ -57,16 +57,16 @@ public interface VirtualHost extends ConfiguredObject
                             XA_TRANSACTION_BRANCH_ENDS, XA_TRANSACTION_BRANCH_STARTS, XA_TRANSACTION_BRANCH_SUSPENDS,
                             QUEUE_COUNT, EXCHANGE_COUNT, CONNECTION_COUNT));
 
-    String ALERT_REPEAT_GAP = "alertRepeatGap";
-    String ALERT_THRESHOLD_MESSAGE_AGE = "alertThresholdMessageAge";
-    String ALERT_THRESHOLD_MESSAGE_SIZE = "alertThresholdMessageSize";
-    String ALERT_THRESHOLD_QUEUE_DEPTH_BYTES = "alertThresholdQueueDepthBytes";
-    String ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "alertThresholdQueueDepthMessages";
-    String DEAD_LETTER_QUEUE_ENABLED            = "deadLetterQueueEnabled";
+    String ALERT_REPEAT_GAP                     = "queue.alertRepeatGap";
+    String ALERT_THRESHOLD_MESSAGE_AGE          = "queue.alertThresholdMessageAge";
+    String ALERT_THRESHOLD_MESSAGE_SIZE         = "queue.alertThresholdMessageSize";
+    String ALERT_THRESHOLD_QUEUE_DEPTH_BYTES    = "queue.alertThresholdQueueDepthBytes";
+    String ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "queue.alertThresholdQueueDepthMessages";
+    String DEAD_LETTER_QUEUE_ENABLED            = "queue.deadLetterQueueEnabled";
     String HOUSEKEEPING_CHECK_PERIOD            = "housekeepingCheckPeriod";
-    String MAXIMUM_DELIVERY_ATTEMPTS            = "maximumDeliveryAttempts";
-    String QUEUE_FLOW_CONTROL_SIZE_BYTES        = "queueFlowControlSizeBytes";
-    String QUEUE_FLOW_RESUME_SIZE_BYTES         = "queueFlowResumeSizeBytes";
+    String MAXIMUM_DELIVERY_ATTEMPTS            = "queue.maximumDeliveryAttempts";
+    String QUEUE_FLOW_CONTROL_SIZE_BYTES        = "queue.flowControlSizeBytes";
+    String QUEUE_FLOW_RESUME_SIZE_BYTES         = "queue.flowResumeSizeBytes";
     String STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE = "storeTransactionIdleTimeoutClose";
     String STORE_TRANSACTION_IDLE_TIMEOUT_WARN  = "storeTransactionIdleTimeoutWarn";
     String STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE = "storeTransactionOpenTimeoutClose";
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
index 381d85d02f..fe6bc6eded 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
@@ -79,8 +79,8 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
     @SuppressWarnings("serial")
     public static final Map<String, Type> ATTRIBUTE_TYPES = Collections.unmodifiableMap(new HashMap<String, Type>(){{
         put(ALERT_THRESHOLD_MESSAGE_AGE, Long.class);
-        put(ALERT_THRESHOLD_MESSAGE_COUNT, Long.class);
-        put(ALERT_THRESHOLD_QUEUE_DEPTH, Long.class);
+        put(ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, Long.class);
+        put(ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, Long.class);
         put(ALERT_THRESHOLD_MESSAGE_SIZE, Long.class);
         put(ALERT_REPEAT_GAP, Long.class);
         put(FLOW_CONTROL_SIZE_BYTES, Long.class);
@@ -138,9 +138,9 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
         put(Broker.STATISTICS_REPORTING_RESET_ENABLED, DEFAULT_STATISTICS_REPORTING_RESET_ENABLED);
         put(Broker.ALERT_REPEAT_GAP, DEFAULT_ALERT_REPEAT_GAP);
         put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, DEFAULT_ALERT_THRESHOLD_MESSAGE_AGE);
-        put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, DEFAULT_ALERT_THRESHOLD_MESSAGE_COUNT);
+        put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, DEFAULT_ALERT_THRESHOLD_MESSAGE_COUNT);
         put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, DEFAULT_ALERT_THRESHOLD_MESSAGE_SIZE);
-        put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, DEFAULT_ALERT_THRESHOLD_QUEUE_DEPTH);
+        put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, DEFAULT_ALERT_THRESHOLD_QUEUE_DEPTH);
         put(Broker.DEAD_LETTER_QUEUE_ENABLED, DEFAULT_DEAD_LETTER_QUEUE_ENABLED);
         put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, DEFAULT_MAXIMUM_DELIVERY_ATTEMPTS);
         put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, DEFAULT_FLOW_CONTROL_RESUME_SIZE_BYTES);
@@ -151,8 +151,8 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
         put(Broker.NAME, DEFAULT_NAME);
     }});
 
-    private String[] POSITIVE_NUMERIC_ATTRIBUTES = { ALERT_THRESHOLD_MESSAGE_AGE, ALERT_THRESHOLD_MESSAGE_COUNT,
-            ALERT_THRESHOLD_QUEUE_DEPTH, ALERT_THRESHOLD_MESSAGE_SIZE, ALERT_REPEAT_GAP, FLOW_CONTROL_SIZE_BYTES,
+    private String[] POSITIVE_NUMERIC_ATTRIBUTES = { ALERT_THRESHOLD_MESSAGE_AGE, ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+            ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, ALERT_THRESHOLD_MESSAGE_SIZE, ALERT_REPEAT_GAP, FLOW_CONTROL_SIZE_BYTES,
             FLOW_CONTROL_RESUME_SIZE_BYTES, MAXIMUM_DELIVERY_ATTEMPTS, HOUSEKEEPING_CHECK_PERIOD, SESSION_COUNT_LIMIT,
             HEART_BEAT_DELAY, STATISTICS_REPORTING_PERIOD };
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
index 79dcf0cac4..facd4e63ef 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
@@ -91,8 +91,8 @@ public class BrokerRecovererTest extends TestCase
         attributes.put(Broker.DEFAULT_VIRTUAL_HOST, "test");
         attributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, "authenticationProvider1");
         attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, 9l);
-        attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, 8l);
-        attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, 7l);
+        attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 8l);
+        attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 7l);
         attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, 6l);
         attributes.put(Broker.ALERT_REPEAT_GAP, 5l);
         attributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 5l);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
index 9d7f6a9cc1..013daefce4 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
@@ -62,8 +62,8 @@ public abstract class ConfigurationEntryStoreTestCase extends QpidTestCase
         _brokerAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, "test");
         _brokerAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, "authenticationProvider1");
         _brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, 9);
-        _brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, 8);
-        _brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, 7);
+        _brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 8);
+        _brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 7);
         _brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, 6);
         _brokerAttributes.put(Broker.ALERT_REPEAT_GAP, 5);
         _brokerAttributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 5);
@@ -173,8 +173,8 @@ public abstract class ConfigurationEntryStoreTestCase extends QpidTestCase
         attributes.put(Broker.DEFAULT_VIRTUAL_HOST, "test");
         attributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, "authenticationProvider1");
         attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, 19);
-        attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, 18);
-        attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, 17);
+        attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 18);
+        attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 17);
         attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, 16);
         attributes.put(Broker.ALERT_REPEAT_GAP, 15);
         attributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 15);