summaryrefslogtreecommitdiff
path: root/java/management/common/src
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2009-11-06 15:56:14 +0000
committerRobert Gemmell <robbie@apache.org>2009-11-06 15:56:14 +0000
commit2485a810b69073d87ebce4ede2a2c988252cad53 (patch)
treeb5adcae169a953221630487cdd91d132d7f6f3bc /java/management/common/src
parente4f475fa2dd2715647e40ef1b36508dc35e40097 (diff)
downloadqpid-python-2485a810b69073d87ebce4ede2a2c988252cad53.tar.gz
QPID-2178: expand the return from channels() to indicate whether the channel is blocked
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@833446 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/management/common/src')
-rw-r--r--java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java7
-rw-r--r--java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java2
2 files changed, 5 insertions, 4 deletions
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
index d977877f4c..5b02c20b7f 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
+++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
@@ -41,12 +41,13 @@ import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParame
public interface ManagedConnection
{
static final String TYPE = "Connection";
- static final int VERSION = 1;
+ static final int VERSION = 2;
//TabularType and contained CompositeType key/description information
//For compatibility reasons, DONT MODIFY the existing key values if expanding the set.
- String[] COMPOSITE_ITEM_NAMES = {"Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count"};
- String[] COMPOSITE_ITEM_DESCRIPTIONS = {"Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count"};
+ //"Flow Blocked" added in Qpid JMX API 1.5
+ String[] COMPOSITE_ITEM_NAMES = {"Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count", "Flow Blocked"};
+ String[] COMPOSITE_ITEM_DESCRIPTIONS = {"Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count", "Flow Blocked"};
String[] TABULAR_UNIQUE_INDEX = {COMPOSITE_ITEM_NAMES[0]};
@MBeanAttribute(name = "ClientId", description = "Client Id")
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 5819631dba..68ecd670c2 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
@@ -43,7 +43,7 @@ public interface ServerInformation
* Qpid JMX API 1.1 can be assumed.
*/
int QPID_JMX_API_MAJOR_VERSION = 1;
- int QPID_JMX_API_MINOR_VERSION = 4;
+ int QPID_JMX_API_MINOR_VERSION = 5;
/**