QPID-4677 : merged to QPID-4659 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1470440 13f79535-47bb-0310-9956-ffa450edef68

19 files changed, 167 insertions, 167 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 bc4932ea09..26907ea255 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
@@ -48,7 +48,7 @@ public class VirtualHostConfiguration extends AbstractConfiguration
         _broker = broker;
 
         // store value of this attribute for running life of virtual host since updating of this value has no run-time effect
-        _defaultHouseKeepingCheckPeriod = ((Number)_broker.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).longValue();
+        _defaultHouseKeepingCheckPeriod = ((Number)_broker.getAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD)).longValue();
         setConfiguration(config);
     }
 
@@ -177,37 +177,37 @@ public class VirtualHostConfiguration extends AbstractConfiguration
 
     public int getMaximumMessageAge()
     {
-        return getIntValue("queues.maximumMessageAge", getBrokerAttributeAsInt(Broker.ALERT_THRESHOLD_MESSAGE_AGE));
+        return getIntValue("queues.maximumMessageAge", getBrokerAttributeAsInt(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE));
     }
 
     public Long getMaximumQueueDepth()
     {
-        return getLongValue("queues.maximumQueueDepth", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES));
+        return getLongValue("queues.maximumQueueDepth", getBrokerAttributeAsLong(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES));
     }
 
     public Long getMaximumMessageSize()
     {
-        return getLongValue("queues.maximumMessageSize", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_MESSAGE_SIZE));
+        return getLongValue("queues.maximumMessageSize", getBrokerAttributeAsLong(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE));
     }
 
     public Long getMaximumMessageCount()
     {
-        return getLongValue("queues.maximumMessageCount", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES));
+        return getLongValue("queues.maximumMessageCount", getBrokerAttributeAsLong(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES));
     }
 
     public Long getMinimumAlertRepeatGap()
     {
-        return getLongValue("queues.minimumAlertRepeatGap", getBrokerAttributeAsLong(Broker.ALERT_REPEAT_GAP));
+        return getLongValue("queues.minimumAlertRepeatGap", getBrokerAttributeAsLong(Broker.QUEUE_ALERT_REPEAT_GAP));
     }
 
     public long getCapacity()
     {
-        return getLongValue("queues.capacity", getBrokerAttributeAsLong(Broker.FLOW_CONTROL_SIZE_BYTES));
+        return getLongValue("queues.capacity", getBrokerAttributeAsLong(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES));
     }
 
     public long getFlowResumeCapacity()
     {
-        return getLongValue("queues.flowResumeCapacity", getBrokerAttributeAsLong(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES));
+        return getLongValue("queues.flowResumeCapacity", getBrokerAttributeAsLong(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES));
     }
 
     public String[] getElementsProcessed()
@@ -267,7 +267,7 @@ public class VirtualHostConfiguration extends AbstractConfiguration
 
     public int getMaxDeliveryCount()
     {
-        return getIntValue("queues.maximumDeliveryCount", getBrokerAttributeAsInt(Broker.MAXIMUM_DELIVERY_ATTEMPTS));
+        return getIntValue("queues.maximumDeliveryCount", getBrokerAttributeAsInt(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS));
     }
 
     /**
@@ -275,7 +275,7 @@ public class VirtualHostConfiguration extends AbstractConfiguration
      */
     public boolean isDeadLetterQueueEnabled()
     {
-        return getBooleanValue("queues.deadLetterQueues", getBrokerAttributeAsBoolean(Broker.DEAD_LETTER_QUEUE_ENABLED));
+        return getBooleanValue("queues.deadLetterQueues", getBrokerAttributeAsBoolean(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED));
     }
 
     private long getBrokerAttributeAsLong(String name)
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 e83017d201..56f92ebb6a 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 = "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 QUEUE_ALERT_THRESHOLD_MESSAGE_AGE = "queue.alertThresholdMessageAge";
+    String QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "queue.alertThresholdQueueDepthMessages";
+    String QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES = "queue.alertThresholdQueueDepthBytes";
+    String QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE = "queue.alertThresholdMessageSize";
+    String QUEUE_ALERT_REPEAT_GAP = "queue.alertRepeatGap";
+    String QUEUE_FLOW_CONTROL_SIZE_BYTES = "queue.flowControlSizeBytes";
+    String QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES = "queue.flowResumeSizeBytes";
+    String QUEUE_MAXIMUM_DELIVERY_ATTEMPTS = "queue.maximumDeliveryAttempts";
+    String QUEUE_DEAD_LETTER_QUEUE_ENABLED = "queue.deadLetterQueueEnabled";
+    String VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD = "virtualhost.housekeepingCheckPeriod";
+
+    String CONNECTION_SESSION_COUNT_LIMIT = "connection.sessionCountLimit";
+    String CONNECTION_HEART_BEAT_DELAY = "connection.heartBeatDelay";
     String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod";
     String STATISTICS_REPORTING_RESET_ENABLED = "statisticsReportingResetEnabled";
     String STORE_TYPE = "storeType";
@@ -125,18 +125,18 @@ public interface Broker extends ConfiguredObject
                               UPDATED,
                               DEFAULT_AUTHENTICATION_PROVIDER,
                               DEFAULT_VIRTUAL_HOST,
-                              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,
-                              DEAD_LETTER_QUEUE_ENABLED,
-                              HOUSEKEEPING_CHECK_PERIOD,
-                              SESSION_COUNT_LIMIT,
-                              HEART_BEAT_DELAY,
+                              QUEUE_ALERT_THRESHOLD_MESSAGE_AGE,
+                              QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+                              QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES,
+                              QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE,
+                              QUEUE_ALERT_REPEAT_GAP,
+                              QUEUE_FLOW_CONTROL_SIZE_BYTES,
+                              QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES,
+                              QUEUE_MAXIMUM_DELIVERY_ATTEMPTS,
+                              QUEUE_DEAD_LETTER_QUEUE_ENABLED,
+                              VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD,
+                              CONNECTION_SESSION_COUNT_LIMIT,
+                              CONNECTION_HEART_BEAT_DELAY,
                               STATISTICS_REPORTING_PERIOD,
                               STATISTICS_REPORTING_RESET_ENABLED,
                               STORE_TYPE,
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 c6e33cbad5..d3d55f1880 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,12 +57,12 @@ 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                     = "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 QUEUE_ALERT_REPEAT_GAP                     = "queue.alertRepeatGap";
+    String QUEUE_ALERT_THRESHOLD_MESSAGE_AGE          = "queue.alertThresholdMessageAge";
+    String QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE         = "queue.alertThresholdMessageSize";
+    String QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES    = "queue.alertThresholdQueueDepthBytes";
+    String QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "queue.alertThresholdQueueDepthMessages";
+    String QUEUE_DEAD_LETTER_QUEUE_ENABLED            = "queue.deadLetterQueueEnabled";
     String HOUSEKEEPING_CHECK_PERIOD            = "housekeepingCheckPeriod";
     String MAXIMUM_DELIVERY_ATTEMPTS            = "queue.maximumDeliveryAttempts";
     String QUEUE_FLOW_CONTROL_SIZE_BYTES        = "queue.flowControlSizeBytes";
@@ -99,7 +99,7 @@ public interface VirtualHost extends ConfiguredObject
                             UPDATED,
                             SUPPORTED_EXCHANGE_TYPES,
                             SUPPORTED_QUEUE_TYPES,
-                            DEAD_LETTER_QUEUE_ENABLED,
+                            QUEUE_DEAD_LETTER_QUEUE_ENABLED,
                             HOUSEKEEPING_CHECK_PERIOD,
                             MAXIMUM_DELIVERY_ATTEMPTS,
                             QUEUE_FLOW_CONTROL_SIZE_BYTES,
@@ -110,11 +110,11 @@ public interface VirtualHost extends ConfiguredObject
                             STORE_TRANSACTION_IDLE_TIMEOUT_WARN,
                             STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE,
                             STORE_TRANSACTION_OPEN_TIMEOUT_WARN,
-                            ALERT_REPEAT_GAP,
-                            ALERT_THRESHOLD_MESSAGE_AGE,
-                            ALERT_THRESHOLD_MESSAGE_SIZE,
-                            ALERT_THRESHOLD_QUEUE_DEPTH_BYTES,
-                            ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+                            QUEUE_ALERT_REPEAT_GAP,
+                            QUEUE_ALERT_THRESHOLD_MESSAGE_AGE,
+                            QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE,
+                            QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES,
+                            QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
                             CONFIG_PATH));
 
     //children
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 2bf7938b47..97acac668b 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
@@ -77,21 +77,21 @@ 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_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);
-        put(FLOW_CONTROL_RESUME_SIZE_BYTES, Long.class);
-        put(HOUSEKEEPING_CHECK_PERIOD, Long.class);
-
-        put(DEAD_LETTER_QUEUE_ENABLED, Boolean.class);
+        put(QUEUE_ALERT_THRESHOLD_MESSAGE_AGE, Long.class);
+        put(QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, Long.class);
+        put(QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, Long.class);
+        put(QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE, Long.class);
+        put(QUEUE_ALERT_REPEAT_GAP, Long.class);
+        put(QUEUE_FLOW_CONTROL_SIZE_BYTES, Long.class);
+        put(QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, Long.class);
+        put(VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, Long.class);
+
+        put(QUEUE_DEAD_LETTER_QUEUE_ENABLED, Boolean.class);
         put(STATISTICS_REPORTING_RESET_ENABLED, Boolean.class);
 
-        put(MAXIMUM_DELIVERY_ATTEMPTS, Integer.class);
-        put(SESSION_COUNT_LIMIT, Integer.class);
-        put(HEART_BEAT_DELAY, Integer.class);
+        put(QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, Integer.class);
+        put(CONNECTION_SESSION_COUNT_LIMIT, Integer.class);
+        put(CONNECTION_HEART_BEAT_DELAY, Integer.class);
         put(STATISTICS_REPORTING_PERIOD, Integer.class);
 
         put(ACL_FILE, String.class);
@@ -143,18 +143,18 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
     private static final Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>(){{
         put(Broker.STATISTICS_REPORTING_PERIOD, DEFAULT_STATISTICS_REPORTING_PERIOD);
         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_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_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);
-        put(Broker.FLOW_CONTROL_SIZE_BYTES, DEFAULT_FLOW_CONTROL_SIZE_BYTES);
-        put(Broker.HOUSEKEEPING_CHECK_PERIOD, DEFAULT_HOUSEKEEPING_CHECK_PERIOD);
-        put(Broker.HEART_BEAT_DELAY, DEFAULT_HEART_BEAT_DELAY);
-        put(Broker.SESSION_COUNT_LIMIT, DEFAULT_SESSION_COUNT_LIMIT);
+        put(Broker.QUEUE_ALERT_REPEAT_GAP, DEFAULT_ALERT_REPEAT_GAP);
+        put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE, DEFAULT_ALERT_THRESHOLD_MESSAGE_AGE);
+        put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, DEFAULT_ALERT_THRESHOLD_MESSAGE_COUNT);
+        put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE, DEFAULT_ALERT_THRESHOLD_MESSAGE_SIZE);
+        put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, DEFAULT_ALERT_THRESHOLD_QUEUE_DEPTH);
+        put(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED, DEFAULT_DEAD_LETTER_QUEUE_ENABLED);
+        put(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, DEFAULT_MAXIMUM_DELIVERY_ATTEMPTS);
+        put(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, DEFAULT_FLOW_CONTROL_RESUME_SIZE_BYTES);
+        put(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES, DEFAULT_FLOW_CONTROL_SIZE_BYTES);
+        put(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, DEFAULT_HOUSEKEEPING_CHECK_PERIOD);
+        put(Broker.CONNECTION_HEART_BEAT_DELAY, DEFAULT_HEART_BEAT_DELAY);
+        put(Broker.CONNECTION_SESSION_COUNT_LIMIT, DEFAULT_SESSION_COUNT_LIMIT);
         put(Broker.NAME, DEFAULT_NAME);
         put(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE, DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE);
         put(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_WARN);
@@ -162,10 +162,10 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
         put(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN, DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_WARN);
     }});
 
-    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, VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE,
+    private String[] POSITIVE_NUMERIC_ATTRIBUTES = { QUEUE_ALERT_THRESHOLD_MESSAGE_AGE, QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+            QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE, QUEUE_ALERT_REPEAT_GAP, QUEUE_FLOW_CONTROL_SIZE_BYTES,
+            QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, CONNECTION_SESSION_COUNT_LIMIT,
+            CONNECTION_HEART_BEAT_DELAY, STATISTICS_REPORTING_PERIOD, VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE,
             VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE,
             VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN};
 
@@ -1141,10 +1141,10 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat
                         + " cannot be set as a default as it does not exist");
             }
         }
-        Long queueFlowControlSize = (Long) convertedAttributes.get(FLOW_CONTROL_SIZE_BYTES);
+        Long queueFlowControlSize = (Long) convertedAttributes.get(QUEUE_FLOW_CONTROL_SIZE_BYTES);
         if (queueFlowControlSize != null && queueFlowControlSize > 0)
         {
-            Long queueFlowControlResumeSize = (Long) convertedAttributes.get(FLOW_CONTROL_RESUME_SIZE_BYTES);
+            Long queueFlowControlResumeSize = (Long) convertedAttributes.get(QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES);
             if (queueFlowControlResumeSize == null)
             {
                 throw new IllegalConfigurationException("Flow control resume size attribute is not specified with flow control size attribute");
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
index 50a83997be..09fc3a446f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
@@ -827,7 +827,7 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
         {
             // TODO
         }
-        else if(DEAD_LETTER_QUEUE_ENABLED.equals(name))
+        else if(QUEUE_DEAD_LETTER_QUEUE_ENABLED.equals(name))
         {
             return _virtualHost.getConfiguration().isDeadLetterQueueEnabled();
         }
@@ -871,23 +871,23 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
         {
             return _virtualHost.getConfiguration().getTransactionTimeoutOpenWarn();
         }
-        else if(ALERT_REPEAT_GAP.equals(name))
+        else if(QUEUE_ALERT_REPEAT_GAP.equals(name))
         {
             return _virtualHost.getConfiguration().getMinimumAlertRepeatGap();
         }
-        else if(ALERT_THRESHOLD_MESSAGE_AGE.equals(name))
+        else if(QUEUE_ALERT_THRESHOLD_MESSAGE_AGE.equals(name))
         {
             return _virtualHost.getConfiguration().getMaximumMessageAge();
         }
-        else if(ALERT_THRESHOLD_MESSAGE_SIZE.equals(name))
+        else if(QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE.equals(name))
         {
             return _virtualHost.getConfiguration().getMaximumMessageSize();
         }
-        else if(ALERT_THRESHOLD_QUEUE_DEPTH_BYTES.equals(name))
+        else if(QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES.equals(name))
         {
             return _virtualHost.getConfiguration().getMaximumQueueDepth();
         }
-        else if(ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES.equals(name))
+        else if(QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES.equals(name))
         {
             return _virtualHost.getConfiguration().getMaximumMessageCount();
         }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
index a5bb1c5459..6d73481e2f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
@@ -75,7 +75,7 @@ public class ServerConnectionDelegate extends ServerDelegate
 
         _broker = broker;
         _localFQDN = localFQDN;
-        _maxNoOfChannels = (Integer)broker.getAttribute(Broker.SESSION_COUNT_LIMIT);
+        _maxNoOfChannels = (Integer)broker.getAttribute(Broker.CONNECTION_SESSION_COUNT_LIMIT);
         _subjectCreator = subjectCreator;
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index cf9d312f3c..f283d73361 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
@@ -158,7 +158,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
     public AMQProtocolEngine(Broker broker, NetworkConnection network, final long connectionId)
     {
         _broker = broker;
-        _maxNoOfChannels = (Integer)broker.getAttribute(Broker.SESSION_COUNT_LIMIT);
+        _maxNoOfChannels = (Integer)broker.getAttribute(Broker.CONNECTION_SESSION_COUNT_LIMIT);
         _receivedLock = new ReentrantLock();
         _stateManager = new AMQStateManager(broker, this);
         _codecFactory = new AMQCodecFactory(true, this);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
index 0304cfbbf1..d319f080d2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionSecureOkMethodHandler.java
@@ -98,9 +98,9 @@ public class ConnectionSecureOkMethodHandler implements StateAwareMethodListener
                 stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
 
                 ConnectionTuneBody tuneBody =
-                        methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.SESSION_COUNT_LIMIT),
+                        methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.CONNECTION_SESSION_COUNT_LIMIT),
                                                                 BrokerProperties.FRAME_SIZE,
-                                                                (Integer)broker.getAttribute(Broker.HEART_BEAT_DELAY));
+                                                                (Integer)broker.getAttribute(Broker.CONNECTION_HEART_BEAT_DELAY));
                 session.writeFrame(tuneBody.generateFrame(0));
                 session.setAuthorizedSubject(authResult.getSubject());
                 disposeSaslServer(session);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
index f2e1ea0568..9350327346 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionStartOkMethodHandler.java
@@ -112,9 +112,9 @@ public class ConnectionStartOkMethodHandler implements StateAwareMethodListener<
 
                     stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
 
-                    ConnectionTuneBody tuneBody = methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.SESSION_COUNT_LIMIT),
+                    ConnectionTuneBody tuneBody = methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.CONNECTION_SESSION_COUNT_LIMIT),
                                                                                           BrokerProperties.FRAME_SIZE,
-                                                                                          (Integer)broker.getAttribute(Broker.HEART_BEAT_DELAY));
+                                                                                          (Integer)broker.getAttribute(Broker.CONNECTION_HEART_BEAT_DELAY));
                     session.writeFrame(tuneBody.generateFrame(0));
                     break;
                 case CONTINUE:
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
index 0bb65479ce..7b149df191 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
@@ -69,14 +69,14 @@ public class QueueConfigurationTest extends TestCase
     public void testMaxDeliveryCount() throws Exception
     {
         // broker MAXIMUM_DELIVERY_ATTEMPTS attribute is not set
-        when(_broker.getAttribute(Broker.MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(null);
+        when(_broker.getAttribute(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(null);
 
         // Check default value
         QueueConfiguration qConf = new QueueConfiguration("test", _emptyConf);
         assertEquals("Unexpected default server configuration for max delivery count ", 0, qConf.getMaxDeliveryCount());
 
         // set broker MAXIMUM_DELIVERY_ATTEMPTS attribute to 2
-        when(_broker.getAttribute(Broker.MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(2);
+        when(_broker.getAttribute(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(2);
 
         // Check that queue inherits the MAXIMUM_DELIVERY_ATTEMPTS value from broker
         qConf = new QueueConfiguration("test", _emptyConf);
@@ -100,14 +100,14 @@ public class QueueConfigurationTest extends TestCase
     public void testIsDeadLetterQueueEnabled() throws Exception
     {
         // enable dead letter queues broker wide
-        when(_broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
+        when(_broker.getAttribute(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
 
         // Check that queue inherits the broker setting
         QueueConfiguration qConf = new QueueConfiguration("test", _emptyConf);
         assertTrue("Unexpected queue configuration for dead letter enabled attribute", qConf.isDeadLetterQueueEnabled());
 
         // broker DEAD_LETTER_QUEUE_ENABLED is not set
-        when(_broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(null);
+        when(_broker.getAttribute(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED)).thenReturn(null);
 
         // Check that queue dead letter queue is not enabled
         qConf = new QueueConfiguration("test", _emptyConf);
@@ -191,14 +191,14 @@ public class QueueConfigurationTest extends TestCase
     public void testGetMinimumAlertRepeatGap() throws Exception
     {
         // set broker attribute ALERT_REPEAT_GAP to 10
-        when(_broker.getAttribute(Broker.ALERT_REPEAT_GAP)).thenReturn(10);
+        when(_broker.getAttribute(Broker.QUEUE_ALERT_REPEAT_GAP)).thenReturn(10);
 
         // check that broker level setting is available on queue configuration
         QueueConfiguration qConf = new QueueConfiguration("test", _emptyConf);
         assertEquals(10, qConf.getMinimumAlertRepeatGap());
 
         // remove configuration for ALERT_REPEAT_GAP on broker level
-        when(_broker.getAttribute(Broker.ALERT_REPEAT_GAP)).thenReturn(null);
+        when(_broker.getAttribute(Broker.QUEUE_ALERT_REPEAT_GAP)).thenReturn(null);
 
         // Check default value
         qConf = new QueueConfiguration("test", _emptyConf);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
index b3b637c81e..de6d036f29 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
@@ -52,7 +52,7 @@ public class VirtualHostConfigurationTest extends QpidTestCase
         _configXml.addProperty("virtualhosts.virtualhost(-1)."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
         _virtualHostRegistry = new VirtualHostRegistry();
         _broker = mock(Broker.class);
-        when(_broker.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).thenReturn(30000l);
+        when(_broker.getAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD)).thenReturn(30000l);
     }
 
     @Override
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 facd4e63ef..3a41b61961 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
@@ -90,19 +90,19 @@ public class BrokerRecovererTest extends TestCase
         Map<String, Object> attributes = new HashMap<String, Object>();
         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_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);
-        attributes.put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, 3l);
-        attributes.put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, 2);
-        attributes.put(Broker.DEAD_LETTER_QUEUE_ENABLED, true);
-        attributes.put(Broker.HOUSEKEEPING_CHECK_PERIOD, 1l);
+        attributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE, 9l);
+        attributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 8l);
+        attributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 7l);
+        attributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE, 6l);
+        attributes.put(Broker.QUEUE_ALERT_REPEAT_GAP, 5l);
+        attributes.put(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES, 5l);
+        attributes.put(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, 3l);
+        attributes.put(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, 2);
+        attributes.put(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED, true);
+        attributes.put(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, 1l);
         attributes.put(Broker.ACL_FILE, "/path/to/acl");
-        attributes.put(Broker.SESSION_COUNT_LIMIT, 1000);
-        attributes.put(Broker.HEART_BEAT_DELAY, 2000);
+        attributes.put(Broker.CONNECTION_SESSION_COUNT_LIMIT, 1000);
+        attributes.put(Broker.CONNECTION_HEART_BEAT_DELAY, 2000);
         attributes.put(Broker.STATISTICS_REPORTING_PERIOD, 4000);
         attributes.put(Broker.STATISTICS_REPORTING_RESET_ENABLED, true);
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
index adb1f81a43..713cd25adb 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
@@ -45,7 +45,7 @@ public class VirtualHostRecovererTest extends TestCase
         SecurityManager securityManager = mock(SecurityManager.class);
         ConfigurationEntry entry = mock(ConfigurationEntry.class);
         Broker parent = mock(Broker.class);
-        when(parent.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).thenReturn(3000l);
+        when(parent.getAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD)).thenReturn(3000l);
         when(parent.getSecurityManager()).thenReturn(securityManager);
 
         VirtualHostRecoverer recoverer = new VirtualHostRecoverer(statisticsGatherer);
@@ -69,7 +69,7 @@ public class VirtualHostRecovererTest extends TestCase
         SecurityManager securityManager = mock(SecurityManager.class);
         ConfigurationEntry entry = mock(ConfigurationEntry.class);
         Broker parent = mock(Broker.class);
-        when(parent.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).thenReturn(3000l);
+        when(parent.getAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD)).thenReturn(3000l);
         when(parent.getSecurityManager()).thenReturn(securityManager);
 
         VirtualHostRecoverer recoverer = new VirtualHostRecoverer(statisticsGatherer);
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 013daefce4..adb4472694 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
@@ -61,19 +61,19 @@ public abstract class ConfigurationEntryStoreTestCase extends QpidTestCase
         _brokerAttributes = new HashMap<String, Object>();
         _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_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);
-        _brokerAttributes.put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, 3);
-        _brokerAttributes.put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, 2);
-        _brokerAttributes.put(Broker.DEAD_LETTER_QUEUE_ENABLED, true);
-        _brokerAttributes.put(Broker.HOUSEKEEPING_CHECK_PERIOD, 1);
+        _brokerAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE, 9);
+        _brokerAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 8);
+        _brokerAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 7);
+        _brokerAttributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE, 6);
+        _brokerAttributes.put(Broker.QUEUE_ALERT_REPEAT_GAP, 5);
+        _brokerAttributes.put(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES, 5);
+        _brokerAttributes.put(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, 3);
+        _brokerAttributes.put(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, 2);
+        _brokerAttributes.put(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED, true);
+        _brokerAttributes.put(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, 1);
         _brokerAttributes.put(Broker.ACL_FILE, "/path/to/acl");
-        _brokerAttributes.put(Broker.SESSION_COUNT_LIMIT, 1000);
-        _brokerAttributes.put(Broker.HEART_BEAT_DELAY, 2000);
+        _brokerAttributes.put(Broker.CONNECTION_SESSION_COUNT_LIMIT, 1000);
+        _brokerAttributes.put(Broker.CONNECTION_HEART_BEAT_DELAY, 2000);
         _brokerAttributes.put(Broker.STATISTICS_REPORTING_PERIOD, 4000);
         _brokerAttributes.put(Broker.STATISTICS_REPORTING_RESET_ENABLED, true);
 
@@ -172,19 +172,19 @@ public abstract class ConfigurationEntryStoreTestCase extends QpidTestCase
         Map<String, Object> attributes = new HashMap<String, Object>();
         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_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);
-        attributes.put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, 13);
-        attributes.put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, 12);
-        attributes.put(Broker.DEAD_LETTER_QUEUE_ENABLED, false);
-        attributes.put(Broker.HOUSEKEEPING_CHECK_PERIOD, 11);
+        attributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE, 19);
+        attributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 18);
+        attributes.put(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 17);
+        attributes.put(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE, 16);
+        attributes.put(Broker.QUEUE_ALERT_REPEAT_GAP, 15);
+        attributes.put(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES, 15);
+        attributes.put(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES, 13);
+        attributes.put(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS, 12);
+        attributes.put(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED, false);
+        attributes.put(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD, 11);
         attributes.put(Broker.ACL_FILE, "/path/to/acl1");
-        attributes.put(Broker.SESSION_COUNT_LIMIT, 11000);
-        attributes.put(Broker.HEART_BEAT_DELAY, 12000);
+        attributes.put(Broker.CONNECTION_SESSION_COUNT_LIMIT, 11000);
+        attributes.put(Broker.CONNECTION_HEART_BEAT_DELAY, 12000);
         attributes.put(Broker.STATISTICS_REPORTING_PERIOD, 14000);
         attributes.put(Broker.STATISTICS_REPORTING_RESET_ENABLED, false);
         ConfigurationEntry updatedBrokerEntry = new ConfigurationEntry(_brokerId, Broker.class.getSimpleName(), attributes,
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
index a77a0e9fcc..1699d414ae 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java
@@ -61,7 +61,7 @@ public class StoreConfigurationChangeListenerTest extends QpidTestCase
     {
         notifyBrokerStarted();
         Broker broker = mock(Broker.class);
-        _listener.attributeSet(broker, Broker.FLOW_CONTROL_SIZE_BYTES, null, 1);
+        _listener.attributeSet(broker, Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES, null, 1);
         verify(_store).save(any(ConfigurationEntry.class));
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 0f82345271..eee6f315d0 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
@@ -58,8 +58,8 @@ public class AMQQueueFactoryTest extends QpidTestCase
         Broker broker = BrokerTestHelper.createBrokerMock();
         if (getName().equals("testDeadLetterQueueDoesNotInheritDLQorMDCSettings"))
         {
-            when(broker.getAttribute(Broker.MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(5);
-            when(broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
+            when(broker.getAttribute(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(5);
+            when(broker.getAttribute(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
         }
 
         _virtualHost = BrokerTestHelper.createVirtualHost(new VirtualHostConfiguration(getName(), configXml, broker));
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
index 5c7ba6e8be..860928e380 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
@@ -70,8 +70,8 @@ public class BrokerTestHelper
         SubjectCreator subjectCreator = mock(SubjectCreator.class);
         when(subjectCreator.getMechanisms()).thenReturn("");
         Broker broker = mock(Broker.class);
-        when(broker.getAttribute(Broker.SESSION_COUNT_LIMIT)).thenReturn(1);
-        when(broker.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).thenReturn(10000l);
+        when(broker.getAttribute(Broker.CONNECTION_SESSION_COUNT_LIMIT)).thenReturn(1);
+        when(broker.getAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD)).thenReturn(10000l);
         when(broker.getId()).thenReturn(UUID.randomUUID());
         when(broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(subjectCreator);
         RootMessageLogger rootMessageLogger = CurrentActor.get().getRootMessageLogger();
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");