QPID-4677: Rename broker and virtual host attribute constants to distiguish the global default settings for queues, connections and virtual hosts from own attributes

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

2 files changed, 27 insertions, 27 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index 05c3b538d9..144e64f0bf 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -60,8 +60,8 @@ public class Asserts
                 virtualHost.get(VirtualHost.DURABLE));
         assertEquals("Unexpected value of attribute " + VirtualHost.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
                 virtualHost.get(VirtualHost.LIFETIME_POLICY));
-        assertEquals("Unexpected value of attribute " + VirtualHost.DEAD_LETTER_QUEUE_ENABLED, Boolean.FALSE,
-                virtualHost.get(VirtualHost.DEAD_LETTER_QUEUE_ENABLED));
+        assertEquals("Unexpected value of attribute " + VirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED, Boolean.FALSE,
+                virtualHost.get(VirtualHost.QUEUE_DEAD_LETTER_QUEUE_ENABLED));
 
         @SuppressWarnings("unchecked")
         Collection<String> exchangeTypes = (Collection<String>) virtualHost.get(VirtualHost.SUPPORTED_EXCHANGE_TYPES);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
index e03275366e..a795063750 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
@@ -129,17 +129,17 @@ public class BrokerRestTest extends QpidRestTestCase
         Map<String, Object> invalidAttributes = new HashMap<String, Object>();
         invalidAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, "non-existing-provider");
         invalidAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, "non-existing-host");
-        invalidAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, -1000);
-        invalidAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, -2000);
-        invalidAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, -3000);
-        invalidAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, -4000);
-        invalidAttributes.put(Broker.ALERT_REPEAT_GAP, -5000);
-        invalidAttributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, -7000);
-        invalidAttributes.put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, -16000);
-        invalidAttributes.put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, -8);
-        invalidAttributes.put(Broker.HOUSEKEEPING_CHECK_PERIOD, -90000);
-        invalidAttributes.put(Broker.SESSION_COUNT_LIMIT, -10);
-        invalidAttributes.put(Broker.HEART_BEAT_DELAY, -11000);
+        invalidAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE, -1000);
+        invalidAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, -2000);
+        invalidAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, -3000);
+        invalidAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE, -4000);
+        invalidAttributes.put(Broker.QUEUE_ALERT_REPEAT_GAP, -5000);
+        invalidAttributes.put(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES, -7000);
+        invalidAttributes.put(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, -16000);
+        invalidAttributes.put(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, -8);
+        invalidAttributes.put(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, -90000);
+        invalidAttributes.put(Broker.CONNECTION_SESSION_COUNT_LIMIT, -10);
+        invalidAttributes.put(Broker.CONNECTION_HEART_BEAT_DELAY, -11000);
         invalidAttributes.put(Broker.STATISTICS_REPORTING_PERIOD, -12000);
         invalidAttributes.put(Broker.ACL_FILE, QpidTestCase.QPID_HOME + File.separator + "etc" + File.separator + "non-existing-acl.acl");
         invalidAttributes.put(Broker.KEY_STORE_PATH, QpidTestCase.QPID_HOME + File.separator + "etc" + File.separator + "non-existing-keystore.jks");
@@ -165,8 +165,8 @@ public class BrokerRestTest extends QpidRestTestCase
 
         // a special case when FLOW_CONTROL_RESUME_SIZE_BYTES > FLOW_CONTROL_SIZE_BYTES
         Map<String, Object> brokerAttributes = getValidBrokerAttributes();
-        brokerAttributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 1000);
-        brokerAttributes.put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, 2000);
+        brokerAttributes.put(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES, 1000);
+        brokerAttributes.put(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, 2000);
         int response = getRestTestHelper().submitRequest("/rest/broker", "PUT", brokerAttributes);
         assertEquals("Unexpected update response for flow resume size > flow size", 409, response);
     }
@@ -176,18 +176,18 @@ public class BrokerRestTest extends QpidRestTestCase
         Map<String, Object> brokerAttributes = new HashMap<String, Object>();
         brokerAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, ANONYMOUS_AUTHENTICATION_PROVIDER);
         brokerAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, TEST3_VIRTUALHOST);
-        brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, 1000);
-        brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 2000);
-        brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 3000);
-        brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, 4000);
-        brokerAttributes.put(Broker.ALERT_REPEAT_GAP, 5000);
-        brokerAttributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 7000);
-        brokerAttributes.put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, 6000);
-        brokerAttributes.put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, 8);
-        brokerAttributes.put(Broker.DEAD_LETTER_QUEUE_ENABLED, true);
-        brokerAttributes.put(Broker.HOUSEKEEPING_CHECK_PERIOD, 90000);
-        brokerAttributes.put(Broker.SESSION_COUNT_LIMIT, 10);
-        brokerAttributes.put(Broker.HEART_BEAT_DELAY, 11000);
+        brokerAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE, 1000);
+        brokerAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 2000);
+        brokerAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 3000);
+        brokerAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE, 4000);
+        brokerAttributes.put(Broker.QUEUE_ALERT_REPEAT_GAP, 5000);
+        brokerAttributes.put(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES, 7000);
+        brokerAttributes.put(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, 6000);
+        brokerAttributes.put(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, 8);
+        brokerAttributes.put(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED, true);
+        brokerAttributes.put(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, 90000);
+        brokerAttributes.put(Broker.CONNECTION_SESSION_COUNT_LIMIT, 10);
+        brokerAttributes.put(Broker.CONNECTION_HEART_BEAT_DELAY, 11000);
         brokerAttributes.put(Broker.STATISTICS_REPORTING_PERIOD, 12000);
         brokerAttributes.put(Broker.STATISTICS_REPORTING_RESET_ENABLED, true);
         brokerAttributes.put(Broker.ACL_FILE, QpidTestCase.QPID_HOME + File.separator + "etc" + File.separator + "broker_example.acl");