From 81de16dca5f5b035a25ad87e9e3fbb4c45093e2f Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Wed, 5 Jun 2013 13:48:44 +0000 Subject: QPID-4908: Expose queue attributes MessageGroupKey and MessageGroupSharedGroups via queue MBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1489872 13f79535-47bb-0310-9956-ffa450edef68 --- .../management/common/mbeans/ManagedQueue.java | 35 +++++++++++++++++----- .../common/mbeans/ServerInformation.java | 2 +- 2 files changed, 28 insertions(+), 9 deletions(-) (limited to 'java/management') diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java index b00b28b2a9..e6f24c2c73 100644 --- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java +++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java @@ -89,6 +89,8 @@ public interface ManagedQueue static final String ATTR_FLOW_RESUME_CAPACITY = "FlowResumeCapacity"; static final String ATTR_EXCLUSIVE = "Exclusive"; static final String ATTR_ALT_EXCHANGE = "AlternateExchange"; + static final String ATTR_SHARED_MESSAGE_GROUP = "MessageGroupSharedGroups"; + static final String ATTR_MESSAGE_GROUP_KEY = "MessageGroupKey"; //All attribute names constant static final List QUEUE_ATTRIBUTES @@ -116,7 +118,9 @@ public interface ManagedQueue ATTR_FLOW_OVERFULL, ATTR_FLOW_RESUME_CAPACITY, ATTR_EXCLUSIVE, - ATTR_ALT_EXCHANGE + ATTR_ALT_EXCHANGE, + ATTR_SHARED_MESSAGE_GROUP, + ATTR_MESSAGE_GROUP_KEY )))); /** @@ -308,13 +312,6 @@ public interface ManagedQueue @MBeanAttribute(name="Description", description="Free text description of the queue") void setDescription(String string); - /** - * Gets the queue type - * @since Qpid JMX API 2.5 - */ - @MBeanAttribute(name="QueueType", description="Type of the queue e.g. standard, priority, etc") - String getQueueType(); - /** * Returns the current flow control FlowResumeCapacity of the queue in bytes. * @@ -385,6 +382,28 @@ public interface ManagedQueue */ String getAlternateExchange() throws IOException; + + /** + * Gets the queue type + * @since Qpid JMX API 2.5 + */ + @MBeanAttribute(name="QueueType", description="Type of the queue e.g. standard, priority, etc") + String getQueueType(); + + /** + * Gets the message group key + * @since Qpid JMX API 2.7 + */ + @MBeanAttribute(name="MessageGroupKey", description="Message header name to hold message group value") + String getMessageGroupKey(); + + /** + * Gets the message group key + * @since Qpid JMX API 2.7 + */ + @MBeanAttribute(name="MessageGroupSharedGroups", description="Indicates C++ compatibility mode, the Broker enforces a looser guarantee, nameley that all the currently unacknowledged messages in a group will be sent to the same consumer. This means that only one consumer can be processing messages from a particular group at a given time. When the consumer acknowledges all of its acquired messages, then the broker may pass the next pending message from that group to a different consumer") + boolean isMessageGroupSharedGroups(); + //********** Operations *****************// diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java index 43249ea004..b1519a27b6 100644 --- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java +++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java @@ -46,7 +46,7 @@ public interface ServerInformation * Qpid JMX API 1.1 can be assumed. */ int QPID_JMX_API_MAJOR_VERSION = 2; - int QPID_JMX_API_MINOR_VERSION = 6; + int QPID_JMX_API_MINOR_VERSION = 7; /** -- cgit v1.2.1