[hornetq-commits] JBoss hornetq SVN: r8665 - in trunk/src/main/org/hornetq: jms/server/management/impl and 1 other directory.

Author: jmesnil Date: 2009-12-10 10:52:25 -0500 (Thu, 10 Dec 2009) New Revision: 8665 Modified: trunk/src/main/org/hornetq/core/management/impl/AbstractControl.java trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSQueueControlImpl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSTopicControlImpl.java Log: readded JMX MBeanOperationInfo to provide meaningful parameters name to JMX clients Modified: trunk/src/main/org/hornetq/core/management/impl/AbstractControl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/AbstractControl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/AbstractControl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -13,6 +13,8 @@ package org.hornetq.core.management.impl; +import javax.management.MBeanInfo; +import javax.management.MBeanOperationInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; @@ -77,6 +79,20 @@ } + abstract MBeanOperationInfo[] fillMBeanOperationInfo(); + + @Override + public MBeanInfo getMBeanInfo() + { + MBeanInfo info = super.getMBeanInfo(); + return new MBeanInfo(info.getClassName(), + info.getDescription(), + info.getAttributes(), + info.getConstructors(), + fillMBeanOperationInfo(), + info.getNotifications()); + } + // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- Modified: trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -15,8 +15,11 @@ import java.util.Map; +import javax.management.MBeanOperationInfo; + import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.management.AcceptorControl; +import org.hornetq.core.management.AddressControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.remoting.spi.Acceptor; @@ -130,6 +133,12 @@ blockOnIO(); } } + + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(AcceptorControl.class); + } // Public -------------------------------------------------------- Modified: trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -16,6 +16,8 @@ import java.util.Iterator; import java.util.Set; +import javax.management.MBeanOperationInfo; + import org.hornetq.core.logging.Logger; import org.hornetq.core.management.AddressControl; import org.hornetq.core.paging.PagingManager; @@ -241,6 +243,12 @@ blockOnIO(); } } + + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(AddressControl.class); + } // Package protected --------------------------------------------- Modified: trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -13,7 +13,10 @@ package org.hornetq.core.management.impl; +import javax.management.MBeanOperationInfo; + import org.hornetq.core.config.cluster.BridgeConfiguration; +import org.hornetq.core.management.AddressControl; import org.hornetq.core.management.BridgeControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.Bridge; @@ -250,6 +253,12 @@ blockOnIO(); } } + + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(BridgeControl.class); + } // Public -------------------------------------------------------- Modified: trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -13,7 +13,10 @@ package org.hornetq.core.management.impl; +import javax.management.MBeanOperationInfo; + import org.hornetq.core.config.cluster.BroadcastGroupConfiguration; +import org.hornetq.core.management.AddressControl; import org.hornetq.core.management.BroadcastGroupControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.BroadcastGroup; @@ -208,6 +211,12 @@ } } + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(BroadcastGroupControl.class); + } + // Public -------------------------------------------------------- // Package protected --------------------------------------------- Modified: trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -16,7 +16,10 @@ import java.util.List; import java.util.Map; +import javax.management.MBeanOperationInfo; + import org.hornetq.core.config.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.management.AddressControl; import org.hornetq.core.management.ClusterConnectionControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.ClusterConnection; @@ -278,6 +281,12 @@ } } + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(ClusterConnectionControl.class); + } + // Public -------------------------------------------------------- // Package protected --------------------------------------------- Modified: trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -13,8 +13,11 @@ package org.hornetq.core.management.impl; +import javax.management.MBeanOperationInfo; + import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.config.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.management.AddressControl; import org.hornetq.core.management.DiscoveryGroupControl; import org.hornetq.core.persistence.StorageManager; @@ -147,7 +150,14 @@ } } + + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(DiscoveryGroupControl.class); + } + // Public -------------------------------------------------------- // Package protected --------------------------------------------- Modified: trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -13,6 +13,8 @@ package org.hornetq.core.management.impl; +import javax.management.MBeanOperationInfo; + import org.hornetq.core.config.cluster.DivertConfiguration; import org.hornetq.core.management.DivertControl; import org.hornetq.core.persistence.StorageManager; @@ -141,7 +143,14 @@ blockOnIO(); } } + + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(DivertControl.class); + } + // Public -------------------------------------------------------- // Package protected --------------------------------------------- Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -26,6 +26,7 @@ import javax.management.ListenerNotFoundException; import javax.management.MBeanNotificationInfo; +import javax.management.MBeanOperationInfo; import javax.management.NotificationBroadcasterSupport; import javax.management.NotificationEmitter; import javax.management.NotificationFilter; @@ -1208,4 +1209,10 @@ return configuration.isWildcardRoutingEnabled(); } + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(HornetQServerControl.class); + } + } Modified: trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -16,6 +16,8 @@ import java.util.List; import java.util.Map; +import javax.management.MBeanOperationInfo; + import org.hornetq.core.exception.HornetQException; import org.hornetq.core.filter.Filter; import org.hornetq.core.filter.impl.FilterImpl; @@ -700,6 +702,12 @@ } } + @Override + MBeanOperationInfo[] fillMBeanOperationInfo() + { + return MBeanInfoHelper.getMBeanOperationsInfo(QueueControl.class); + } + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -15,11 +15,14 @@ import java.util.List; +import javax.management.MBeanInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; +import org.hornetq.core.management.impl.MBeanInfoHelper; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.management.ConnectionFactoryControl; +import org.hornetq.jms.server.management.JMSQueueControl; /** * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> @@ -167,6 +170,18 @@ return cf.isAutoGroup(); } + @Override + public MBeanInfo getMBeanInfo() + { + MBeanInfo info = super.getMBeanInfo(); + return new MBeanInfo(info.getClassName(), + info.getDescription(), + info.getAttributes(), + info.getConstructors(), + MBeanInfoHelper.getMBeanOperationsInfo(ConnectionFactoryControl.class), + info.getNotifications()); + } + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSQueueControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSQueueControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSQueueControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -15,12 +15,14 @@ import java.util.Map; +import javax.management.MBeanInfo; import javax.management.StandardMBean; import org.hornetq.core.exception.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.MessageCounterInfo; import org.hornetq.core.management.QueueControl; +import org.hornetq.core.management.impl.MBeanInfoHelper; import org.hornetq.core.messagecounter.MessageCounter; import org.hornetq.core.messagecounter.impl.MessageCounterHelper; import org.hornetq.jms.HornetQQueue; @@ -336,6 +338,18 @@ coreQueueControl.resume(); } + @Override + public MBeanInfo getMBeanInfo() + { + MBeanInfo info = super.getMBeanInfo(); + return new MBeanInfo(info.getClassName(), + info.getDescription(), + info.getAttributes(), + info.getConstructors(), + MBeanInfoHelper.getMBeanOperationsInfo(JMSQueueControl.class), + info.getNotifications()); + } + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -19,6 +19,7 @@ import java.util.concurrent.atomic.AtomicLong; import javax.management.ListenerNotFoundException; +import javax.management.MBeanInfo; import javax.management.MBeanNotificationInfo; import javax.management.Notification; import javax.management.NotificationBroadcasterSupport; @@ -29,6 +30,7 @@ import org.hornetq.core.client.management.impl.ManagementHelper; import org.hornetq.core.config.TransportConfiguration; +import org.hornetq.core.management.impl.MBeanInfoHelper; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.management.ConnectionFactoryControl; import org.hornetq.jms.server.management.JMSQueueControl; @@ -779,6 +781,18 @@ return server.listSessions(connectionID); } + @Override + public MBeanInfo getMBeanInfo() + { + MBeanInfo info = super.getMBeanInfo(); + return new MBeanInfo(info.getClassName(), + info.getDescription(), + info.getAttributes(), + info.getConstructors(), + MBeanInfoHelper.getMBeanOperationsInfo(JMSServerControl.class), + info.getNotifications()); + } + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSTopicControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSTopicControlImpl.java 2009-12-10 15:25:39 UTC (rev 8664) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSTopicControlImpl.java 2009-12-10 15:52:25 UTC (rev 8665) @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; +import javax.management.MBeanInfo; import javax.management.StandardMBean; import org.hornetq.core.exception.HornetQException; @@ -26,10 +27,12 @@ import org.hornetq.core.management.HornetQServerControl; import org.hornetq.core.management.QueueControl; import org.hornetq.core.management.ResourceNames; +import org.hornetq.core.management.impl.MBeanInfoHelper; import org.hornetq.core.server.management.ManagementService; import org.hornetq.jms.HornetQTopic; import org.hornetq.jms.client.HornetQMessage; import org.hornetq.jms.client.SelectorTranslator; +import org.hornetq.jms.server.management.JMSQueueControl; import org.hornetq.jms.server.management.TopicControl; import org.hornetq.utils.Pair; import org.hornetq.utils.json.JSONArray; @@ -347,6 +350,18 @@ } } + @Override + public MBeanInfo getMBeanInfo() + { + MBeanInfo info = super.getMBeanInfo(); + return new MBeanInfo(info.getClassName(), + info.getDescription(), + info.getAttributes(), + info.getConstructors(), + MBeanInfoHelper.getMBeanOperationsInfo(TopicControl.class), + info.getNotifications()); + } + // Inner classes ------------------------------------------------- private enum DurabilityType