You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2013/01/10 12:43:34 UTC
svn commit: r1431295 - in /activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console: command/BstatCommand.java command/QueryCommand.java util/JmxMBeansUtil.java

Author: dejanb
Date: Thu Jan 10 11:43:33 2013
New Revision: 1431295

URL: http://svn.apache.org/viewvc?rev=1431295&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4237 - new jmx and query and bstat commands

Modified:
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java?rev=1431295&r1=1431294&r2=1431295&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java (original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java Thu Jan 10 11:43:33 2013
@@ -73,12 +73,12 @@ public class BstatCommand extends QueryC
 
         // Build the predefined option
         queryTokens.add("--objname");
-        queryTokens.add("Type=*,BrokerName=" + brokerName);
+        queryTokens.add("type=*,brokerName=" + brokerName + ",*");
         queryTokens.add("-xQTopic=ActiveMQ.Advisory.*");
         queryTokens.add("--view");
-        queryTokens.add("Type,BrokerName,Destination,ConnectorName,EnqueueCount,"
+        queryTokens.add("BrokerName,Name,connectorName,networkConnectorName,destinationName,destinationType,EnqueueCount,"
                         + "DequeueCount,TotalEnqueueCount,TotalDequeueCount,Messages,"
-                        + "TotalMessages,ConsumerCount,TotalConsumerCount,DispatchQueueSize");
+                        + "TotalMessageCount,ConsumerCount,TotalConsumerCount,DispatchCount,Duplex,NetworkTTL");
 
         // Call the query command
         super.parseOptions(queryTokens);

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java?rev=1431295&r1=1431294&r2=1431295&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java (original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java Thu Jan 10 11:43:33 2013
@@ -31,12 +31,12 @@ public class QueryCommand extends Abstra
     private static final Properties PREDEFINED_OBJNAME_QUERY = new Properties();
 
     static {
-        PREDEFINED_OBJNAME_QUERY.setProperty("Broker", "Type=Broker,BrokerName=%1,*");
-        PREDEFINED_OBJNAME_QUERY.setProperty("Connection", "Type=Connection,Connection=%1,*");
-        PREDEFINED_OBJNAME_QUERY.setProperty("Connector", "Type=Connector,ConnectorName=%1,*");
-        PREDEFINED_OBJNAME_QUERY.setProperty("NetworkConnector", "Type=NetworkConnector,BrokerName=%1,*");
-        PREDEFINED_OBJNAME_QUERY.setProperty("Queue", "Type=Queue,Destination=%1,*");
-        PREDEFINED_OBJNAME_QUERY.setProperty("Topic", "Type=Topic,Destination=%1,*");
+        PREDEFINED_OBJNAME_QUERY.setProperty("Broker", "type=Broker,brokerName=%1");
+        PREDEFINED_OBJNAME_QUERY.setProperty("Connection", "type=Broker,connector=clientConnectors,connectionName=%1,*");
+        PREDEFINED_OBJNAME_QUERY.setProperty("Connector", "type=Broker,brokerName=*,connector=clientConnectors,connectorName=%1");
+        PREDEFINED_OBJNAME_QUERY.setProperty("NetworkConnector", "type=Broker,brokerName=%1,connector=networkConnectors,networkConnectorName=*");
+        PREDEFINED_OBJNAME_QUERY.setProperty("Queue", "type=Broker,brokerName=*,destinationType=Queue,destinationName=%1");
+        PREDEFINED_OBJNAME_QUERY.setProperty("Topic", "type=Broker,brokerName=*,destinationType=Topic,destinationName=%1,*");
     };
 
     protected String[] helpFile = new String[] {

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java?rev=1431295&r1=1431294&r2=1431295&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java (original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/util/JmxMBeansUtil.java Thu Jan 10 11:43:33 2013
@@ -117,7 +117,7 @@ public final class JmxMBeansUtil {
         // Use regular expressions to filter the query result
         // Retrieve the attributes needed
         // Retrieve the mbeans object name specified by the query
-        return new WildcardToRegExTransformFilter(new MBeansRegExQueryFilter(new MBeansAttributeQueryFilter(jmxConnection, attributes, new MBeansObjectNameQueryFilter(jmxConnection))));
+        return new MBeansAttributeQueryFilter(jmxConnection, attributes, new MBeansObjectNameQueryFilter(jmxConnection));
     }
 
     public static QueryFilter createMessageQueryFilter(MBeanServerConnection jmxConnection, ObjectName destName) {