Author: robbie
Date: Mon Jul 13 10:23:22 2009
New Revision: 793533
URL: http://svn.apache.org/viewvc?rev=793533&view=rev
Log:
QPID-1944: expose Connection tabular/composite data key values through
management interface
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java?rev=793533&r1=793532&r2=793533&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
Mon Jul 13 10:23:22 2009
@@ -79,9 +79,7 @@
private String _name = null;
// openmbean data types for representing the channel attributes
- private static final String[] _channelAtttibuteNames =
- { "Channel Id", "Transactional", "Default Queue", "Unacknowledged
Message Count" };
- private static final String[] _indexNames = { _channelAtttibuteNames[0] };
+
private static final OpenType[] _channelAttributeTypes =
{ SimpleType.INTEGER, SimpleType.BOOLEAN, SimpleType.STRING,
SimpleType.INTEGER };
private static CompositeType _channelType = null; // represents the data
type for channel data
@@ -119,9 +117,9 @@
private static void init() throws OpenDataException
{
_channelType =
- new CompositeType("Channel", "Channel Details",
_channelAtttibuteNames, _channelAtttibuteNames,
+ new CompositeType("Channel", "Channel Details",
COMPOSITE_ITEM_NAMES, COMPOSITE_ITEM_DESCRIPTIONS,
_channelAttributeTypes);
- _channelsType = new TabularType("Channels", "Channels", _channelType,
_indexNames);
+ _channelsType = new TabularType("Channels", "Channels", _channelType,
TABULAR_UNIQUE_INDEX);
}
public String getClientId()
@@ -247,7 +245,7 @@
channel.getUnacknowledgedMessageMap().size()
};
- CompositeData channelData = new CompositeDataSupport(_channelType,
_channelAtttibuteNames, itemValues);
+ CompositeData channelData = new CompositeDataSupport(_channelType,
COMPOSITE_ITEM_NAMES, itemValues);
channelsList.put(channelData);
}
Modified:
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java?rev=793533&r1=793532&r2=793533&view=diff
==============================================================================
---
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
(original)
+++
qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
Mon Jul 13 10:23:22 2009
@@ -42,6 +42,12 @@
{
static final String TYPE = "Connection";
static final int VERSION = 1;
+
+ //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"};
+ String[] TABULAR_UNIQUE_INDEX = {COMPOSITE_ITEM_NAMES[0]};
@MBeanAttribute(name = "ClientId", description = "Client Id")
String getClientId();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
