Author: bhupendrab
Date: Wed Mar 21 04:54:38 2007
New Revision: 520847
URL: http://svn.apache.org/viewvc?view=rev&rev=520847
Log:
QPID-420 Adding clientID, AuthorizedId and client version on management console
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?view=diff&rev=520847&r1=520846&r2=520847
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Wed Mar 21 04:54:38 2007
@@ -74,6 +74,8 @@
private AMQShortString _contextKey;
+ private AMQShortString _clientVersion = null;
+
private VirtualHost _virtualHost;
private final Map<Integer, AMQChannel> _channelMap = new HashMap<Integer,
AMQChannel>();
@@ -667,9 +669,16 @@
public void setClientProperties(FieldTable clientProperties)
{
_clientProperties = clientProperties;
- if ((_clientProperties != null) &&
(_clientProperties.getString(CLIENT_PROPERTIES_INSTANCE) != null))
+ if (_clientProperties != null)
{
- setContextKey(new
AMQShortString(_clientProperties.getString(CLIENT_PROPERTIES_INSTANCE)));
+ if (_clientProperties.getString(CLIENT_PROPERTIES_INSTANCE) !=
null)
+ {
+ setContextKey(new
AMQShortString(_clientProperties.getString(CLIENT_PROPERTIES_INSTANCE)));
+ }
+ if
(_clientProperties.getString(ClientProperties.version.toString()) != null)
+ {
+ _clientVersion = new
AMQShortString(_clientProperties.getString(ClientProperties.version.toString()));
+ }
}
}
@@ -745,5 +754,8 @@
{
return _authorizedID;
}
-
+ public String getClientVersion()
+ {
+ return _clientVersion == null ? null : _clientVersion.toString();
+ }
}
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java?view=diff&rev=520847&r1=520846&r2=520847
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
Wed Mar 21 04:54:38 2007
@@ -56,6 +56,7 @@
{
private AMQMinaProtocolSession _session = null;
private String _name = null;
+
//openmbean data types for representing the channel attributes
private final static String[] _channelAtttibuteNames = {"Channel Id",
"Transactional", "Default Queue", "Unacknowledged Message Count"};
private final static String[] _indexNames = {_channelAtttibuteNames[0]};
@@ -95,12 +96,26 @@
*/
private static void init() throws OpenDataException
{
-
_channelType = new CompositeType("Channel", "Channel Details",
_channelAtttibuteNames,
_channelAtttibuteNames,
_channelAttributeTypes);
_channelsType = new TabularType("Channels", "Channels", _channelType,
_indexNames);
}
+ public String getClientId()
+ {
+ return _session.getContextKey() == null ? null :
_session.getContextKey().toString();
+ }
+
+ public String getAuthorizedId()
+ {
+ return _session.getAuthorizedID();
+ }
+
+ public String getVersion()
+ {
+ return _session.getClientVersion() == null ? null :
_session.getClientVersion().toString();
+ }
+
public Date getLastIoTime()
{
return new Date(_session.getIOSession().getLastIoTime());
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java?view=diff&rev=520847&r1=520846&r2=520847
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
Wed Mar 21 04:54:38 2007
@@ -41,6 +41,15 @@
{
static final String TYPE = "Connection";
+ @MBeanAttribute(name = "ClientId", description = "Client Id")
+ String getClientId();
+
+ @MBeanAttribute(name = "AuthorizedId", description = "User Name")
+ String getAuthorizedId();
+
+ @MBeanAttribute(name = "Version", description = "Client Version")
+ String getVersion();
+
/**
* Tells the remote address of this connection.
* @return remote address
