[hornetq-commits] JBoss hornetq SVN: r10087 - in trunk/src/main/org/hornetq: jms/management/impl and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Dec 29 15:32:05 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-12-29 15:32:05 -0500 (Wed, 29 Dec 2010)
New Revision: 10087
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/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/management/impl/JMSQueueControlImpl.java
trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
Log:
tweaks on management
Modified: trunk/src/main/org/hornetq/core/management/impl/AbstractControl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/AbstractControl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/AbstractControl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -79,7 +79,7 @@
}
- abstract MBeanOperationInfo[] fillMBeanOperationInfo();
+ protected abstract MBeanOperationInfo[] fillMBeanOperationInfo();
@Override
public MBeanInfo getMBeanInfo()
Modified: trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -135,7 +135,7 @@
}
@Override
- MBeanOperationInfo[] fillMBeanOperationInfo()
+ protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
return MBeanInfoHelper.getMBeanOperationsInfo(AcceptorControl.class);
}
Modified: trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -209,7 +209,7 @@
}
@Override
- MBeanOperationInfo[] fillMBeanOperationInfo()
+ protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
return MBeanInfoHelper.getMBeanOperationsInfo(AddressControl.class);
}
Modified: trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -249,7 +249,7 @@
}
@Override
- MBeanOperationInfo[] fillMBeanOperationInfo()
+ protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
return MBeanInfoHelper.getMBeanOperationsInfo(BridgeControl.class);
}
Modified: trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -201,7 +201,7 @@
}
@Override
- MBeanOperationInfo[] fillMBeanOperationInfo()
+ protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
return MBeanInfoHelper.getMBeanOperationsInfo(BroadcastGroupControl.class);
}
Modified: trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -263,7 +263,7 @@
}
@Override
- MBeanOperationInfo[] fillMBeanOperationInfo()
+ protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
return MBeanInfoHelper.getMBeanOperationsInfo(ClusterConnectionControl.class);
}
Modified: trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -145,7 +145,7 @@
}
@Override
- MBeanOperationInfo[] fillMBeanOperationInfo()
+ protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
return MBeanInfoHelper.getMBeanOperationsInfo(DivertControl.class);
}
Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -1886,7 +1886,7 @@
}
@Override
- MBeanOperationInfo[] fillMBeanOperationInfo()
+ protected 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 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -831,7 +831,7 @@
}
@Override
- MBeanOperationInfo[] fillMBeanOperationInfo()
+ protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
return MBeanInfoHelper.getMBeanOperationsInfo(QueueControl.class);
}
Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -28,7 +28,6 @@
import org.hornetq.core.management.impl.MBeanInfoHelper;
import org.hornetq.core.messagecounter.MessageCounter;
import org.hornetq.core.messagecounter.impl.MessageCounterHelper;
-import org.hornetq.core.persistence.impl.journal.OperationContextImpl;
import org.hornetq.jms.client.HornetQDestination;
import org.hornetq.jms.client.HornetQMessage;
import org.hornetq.jms.client.SelectorTranslator;
Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-12-29 17:43:44 UTC (rev 10086)
+++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-12-29 20:32:05 UTC (rev 10087)
@@ -21,14 +21,13 @@
import java.util.concurrent.atomic.AtomicLong;
import javax.management.ListenerNotFoundException;
-import javax.management.MBeanInfo;
import javax.management.MBeanNotificationInfo;
+import javax.management.MBeanOperationInfo;
import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import javax.management.NotificationEmitter;
import javax.management.NotificationFilter;
import javax.management.NotificationListener;
-import javax.management.StandardMBean;
import org.hornetq.api.core.management.Parameter;
import org.hornetq.api.jms.JMSFactoryType;
@@ -38,6 +37,7 @@
import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.api.jms.management.TopicControl;
import org.hornetq.core.filter.Filter;
+import org.hornetq.core.management.impl.AbstractControl;
import org.hornetq.core.management.impl.MBeanInfoHelper;
import org.hornetq.core.server.ServerConsumer;
import org.hornetq.core.server.ServerSession;
@@ -55,7 +55,7 @@
* @version <tt>$Revision$</tt>
*
*/
-public class JMSServerControlImpl extends StandardMBean implements JMSServerControl, NotificationEmitter
+public class JMSServerControlImpl extends AbstractControl implements JMSServerControl, NotificationEmitter
{
// Constants -----------------------------------------------------
@@ -145,7 +145,7 @@
public JMSServerControlImpl(final JMSServerManager server) throws Exception
{
- super(JMSServerControl.class);
+ super(JMSServerControl.class, server.getHornetQServer().getStorageManager());
this.server = server;
broadcaster = new NotificationBroadcasterSupport();
}
@@ -688,22 +688,19 @@
}
}
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+ /* (non-Javadoc)
+ * @see org.hornetq.core.management.impl.AbstractControl#fillMBeanOperationInfo()
+ */
@Override
- public MBeanInfo getMBeanInfo()
+ protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
- MBeanInfo info = super.getMBeanInfo();
- return new MBeanInfo(info.getClassName(),
- info.getDescription(),
- info.getAttributes(),
- info.getConstructors(),
- MBeanInfoHelper.getMBeanOperationsInfo(JMSServerControl.class),
- info.getNotifications());
+ return MBeanInfoHelper.getMBeanOperationsInfo(JMSServerControl.class);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
// Private -------------------------------------------------------
private void sendNotification(final NotificationType type, final String message)
@@ -719,34 +716,6 @@
throw new IllegalStateException("HornetQ JMS Server is not started. it can not be managed yet");
}
}
-
- protected void clearIO()
- {
- // the storage manager could be null on the backup on certain components
- if (server.getHornetQServer().getStorageManager() != null)
- {
- server.getHornetQServer().getStorageManager().clearContext();
- }
- }
-
- protected void blockOnIO()
- {
- // the storage manager could be null on the backup on certain components
- if (server.getHornetQServer().getStorageManager() != null)
- {
- try
- {
- server.getHornetQServer().getStorageManager().waitOnOperations();
- server.getHornetQServer().getStorageManager().clearContext();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- }
-
// Inner classes -------------------------------------------------
public static enum NotificationType
More information about the hornetq-commits
mailing list