[jboss-cvs] JBoss Messaging SVN: r1938 - in trunk: src/main/org/jboss/jms/server and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 9 22:00:45 EST 2007
Author: ovidiu.feodorov at jboss.com
Date: 2007-01-09 22:00:40 -0500 (Tue, 09 Jan 2007)
New Revision: 1938
Modified:
trunk/src/etc/xmdesc/Queue-xmbean.xml
trunk/src/etc/xmdesc/ServerPeer-xmbean.xml
trunk/src/main/org/jboss/jms/server/ServerPeerMBean.java
trunk/src/main/org/jboss/jms/server/destination/QueueMBean.java
trunk/src/main/org/jboss/jms/server/destination/QueueService.java
trunk/tests/src/org/jboss/test/messaging/jms/server/destination/QueueManagementTest.java
Log:
Fixed JMX screwups:
- Turned getMessageCounters(), getMessageStatistics(), getMessageCounterAsHTML() to JMX attribute,
as JBoss XMBean parser doesn't seem to like it as an operation.
- Changed getMessageCounterAsHTML() to listMessageCounterAsHTML to handle it consistently
as a JMX operation
- Changed getMessageCounterHistoryAsHTML() to listMessageCounterHistoryAsHTML to handle it
consistently as a JMX operation
Modified: trunk/src/etc/xmdesc/Queue-xmbean.xml
===================================================================
--- trunk/src/etc/xmdesc/Queue-xmbean.xml 2007-01-10 02:38:01 UTC (rev 1937)
+++ trunk/src/etc/xmdesc/Queue-xmbean.xml 2007-01-10 03:00:40 UTC (rev 1938)
@@ -256,13 +256,13 @@
<operation>
<description>Get the message counter as HTML</description>
- <name>getMessageCounterAsHTML</name>
+ <name>listMessageCounterAsHTML</name>
<return-type>java.lang.String</return-type>
</operation>
<operation>
<description>Get the message counter history as HTML</description>
- <name>getMessageCounterHistoryAsHTML</name>
+ <name>listMessageCounterHistoryAsHTML</name>
<return-type>java.lang.String</return-type>
</operation>
Modified: trunk/src/etc/xmdesc/ServerPeer-xmbean.xml
===================================================================
--- trunk/src/etc/xmdesc/ServerPeer-xmbean.xml 2007-01-10 02:38:01 UTC (rev 1937)
+++ trunk/src/etc/xmdesc/ServerPeer-xmbean.xml 2007-01-10 03:00:40 UTC (rev 1938)
@@ -186,8 +186,20 @@
<description>The default max number of messages per day in message counter history</description>
<name>DefaultMessageCounterHistoryDayLimit</name>
<type>int</type>
- </attribute>
+ </attribute>
+ <attribute access="read-only" getMethod="getMessageCounters">
+ <description>The message counters</description>
+ <name>MessageCounters</name>
+ <type>java.util.List</type>
+ </attribute>
+
+ <attribute access="read-only" getMethod="getMessageStatistics">
+ <description>The message statistics</description>
+ <name>MessageStatistics</name>
+ <type>java.util.List</type>
+ </attribute>
+
<!-- Managed operations -->
<operation>
@@ -324,22 +336,6 @@
<operation>
<description>
- Get all message counters
- </description>
- <name>getMessageCounters</name>
- <return-type>java.util.List</return-type>
- </operation>
-
- <operation>
- <description>
- Get all message statistics
- </description>
- <name>getMessageStatistics</name>
- <return-type>java.util.List</return-type>
- </operation>
-
- <operation>
- <description>
List all message counters in HTML
</description>
<name>listMessageCountersAsHTML</name>
Modified: trunk/src/main/org/jboss/jms/server/ServerPeerMBean.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeerMBean.java 2007-01-10 02:38:01 UTC (rev 1937)
+++ trunk/src/main/org/jboss/jms/server/ServerPeerMBean.java 2007-01-10 03:00:40 UTC (rev 1938)
@@ -88,8 +88,7 @@
ObjectName getDefaultExpiryQueue();
void setDefaultExpiryQueue(ObjectName on);
-
-
+
int getQueuedExecutorPoolSize();
void setQueuedExecutorPoolSize(int poolSize);
@@ -122,13 +121,15 @@
String createQueue(String name, String jndiName) throws Exception;
- String createQueue(String name, String jndiName, int fullSize, int pageSize, int downCacheSize) throws Exception;
+ String createQueue(String name, String jndiName, int fullSize, int pageSize, int downCacheSize)
+ throws Exception;
boolean destroyQueue(String name) throws Exception;
String createTopic(String name, String jndiName) throws Exception;
- String createTopic(String name, String jndiName, int fullSize, int pageSize, int downCacheSize) throws Exception;
+ String createTopic(String name, String jndiName, int fullSize, int pageSize, int downCacheSize)
+ throws Exception;
boolean destroyTopic(String name) throws Exception;
Modified: trunk/src/main/org/jboss/jms/server/destination/QueueMBean.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/QueueMBean.java 2007-01-10 02:38:01 UTC (rev 1937)
+++ trunk/src/main/org/jboss/jms/server/destination/QueueMBean.java 2007-01-10 03:00:40 UTC (rev 1938)
@@ -67,7 +67,7 @@
List listNonDurableMessages(String selector) throws Exception;
- String getMessageCounterAsHTML();
+ String listMessageCounterAsHTML();
- String getMessageCounterHistoryAsHTML();
+ String listMessageCounterHistoryAsHTML();
}
Modified: trunk/src/main/org/jboss/jms/server/destination/QueueService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/QueueService.java 2007-01-10 02:38:01 UTC (rev 1937)
+++ trunk/src/main/org/jboss/jms/server/destination/QueueService.java 2007-01-10 03:00:40 UTC (rev 1938)
@@ -248,7 +248,7 @@
return (MessageStatistics)stats.get(0);
}
- public String getMessageCounterAsHTML()
+ public String listMessageCounterAsHTML()
{
return super.listMessageCounterAsHTML(new MessageCounter[] { getMessageCounter() });
}
@@ -391,7 +391,7 @@
((ManagedQueue)destination).getMessageCounter().resetCounter();
}
- public String getMessageCounterHistoryAsHTML()
+ public String listMessageCounterHistoryAsHTML()
{
return super.listMessageCounterHistoryAsHTML(new MessageCounter[] { getMessageCounter() });
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/destination/QueueManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/destination/QueueManagementTest.java 2007-01-10 02:38:01 UTC (rev 1937)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/destination/QueueManagementTest.java 2007-01-10 03:00:40 UTC (rev 1938)
@@ -762,11 +762,11 @@
ServerManagement.invoke(destObjectName, "resetMessageCounterHistory", null, null);
- String html = (String)ServerManagement.invoke(destObjectName, "getMessageCounterHistoryAsHTML", null, null);
+ String html = (String)ServerManagement.invoke(destObjectName, "listMessageCounterHistoryAsHTML", null, null);
assertNotNull(html);
- html = (String)ServerManagement.invoke(destObjectName, "getMessageCounterAsHTML", null, null);
+ html = (String)ServerManagement.invoke(destObjectName, "listMessageCounterAsHTML", null, null);
assertNotNull(html);
More information about the jboss-cvs-commits
mailing list