[jboss-cvs] JBoss Messaging SVN: r6843 - trunk/src/main/org/jboss/messaging/core/management.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 18 10:59:09 EDT 2009
Author: jmesnil
Date: 2009-05-18 10:59:09 -0400 (Mon, 18 May 2009)
New Revision: 6843
Modified:
trunk/src/main/org/jboss/messaging/core/management/ClusterConnectionControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java
trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/ObjectNames.java
Log:
code cleanup
* removed unused import, dead code, etc.
Modified: trunk/src/main/org/jboss/messaging/core/management/ClusterConnectionControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/ClusterConnectionControlMBean.java 2009-05-18 14:49:51 UTC (rev 6842)
+++ trunk/src/main/org/jboss/messaging/core/management/ClusterConnectionControlMBean.java 2009-05-18 14:59:09 UTC (rev 6843)
@@ -22,7 +22,6 @@
package org.jboss.messaging.core.management;
-import javax.management.openmbean.TabularData;
/**
* A ClusterConnectionControlMBean
Modified: trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java 2009-05-18 14:49:51 UTC (rev 6842)
+++ trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java 2009-05-18 14:59:09 UTC (rev 6843)
@@ -22,20 +22,9 @@
package org.jboss.messaging.core.management;
-import static javax.management.openmbean.SimpleType.BOOLEAN;
-import static javax.management.openmbean.SimpleType.INTEGER;
-import static javax.management.openmbean.SimpleType.LONG;
-import static javax.management.openmbean.SimpleType.STRING;
-
import java.text.DateFormat;
import java.util.Date;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.OpenType;
-
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.messagecounter.MessageCounter;
import org.jboss.messaging.utils.json.JSONObject;
@@ -53,51 +42,7 @@
private static final Logger log = Logger.getLogger(MessageCounterInfo.class);
private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
-
- public static final CompositeType TYPE;
-
- private static final String MESSAGE_TYPE_NAME = "MessageCounterInfo";
-
- private static final String[] ITEM_NAMES = new String[] { "name",
- "subscription",
- "durable",
- "count",
- "countDelta",
- "depth",
- "depthDelta",
- "lastAddTimestamp",
- "updateTimestamp" };
-
- private static final String[] ITEM_DESCRIPTIONS = new String[] { "Name of the Queue",
- "Name of the subscription",
- "Is the queue durable?",
- "Message count",
- "Message count delta",
- "Depth",
- "Depth delta",
- "Timestamp of the last added messagg",
- "Timestamp of the last update" };
-
- private static final OpenType[] TYPES;
-
- static
- {
- try
- {
- TYPES = new OpenType[] { STRING, STRING, BOOLEAN, LONG, LONG, INTEGER, INTEGER, STRING, STRING };
- TYPE = new CompositeType(MESSAGE_TYPE_NAME,
- "Information for a MessageCounter",
- ITEM_NAMES,
- ITEM_DESCRIPTIONS,
- TYPES);
- }
- catch (OpenDataException e)
- {
- log.error("Unable to create open types for a MessageCounter", e);
- throw new IllegalStateException(e);
- }
- }
-
+
// Attributes ----------------------------------------------------
private final String name;
@@ -155,45 +100,6 @@
updateTimestamp);
}
- public static CompositeData toCompositeData(MessageCounter counter)
- {
- String lassAddTimestamp = DATE_FORMAT.format(new Date(counter.getLastAddedMessageTime()));
- String updateTimestamp = DATE_FORMAT.format(new Date(counter.getLastUpdate()));
- MessageCounterInfo info = new MessageCounterInfo(counter.getDestinationName(),
- counter.getDestinationSubscription(),
- counter.isDestinationDurable(),
- counter.getCount(),
- counter.getCountDelta(),
- counter.getMessageCount(),
- counter.getMessageCountDelta(),
- lassAddTimestamp,
- updateTimestamp);
- return info.toCompositeData();
- }
-
- public static MessageCounterInfo from(CompositeData data)
- {
- String name = (String)data.get("name");
- String subscription = (String)data.get("subscription");
- boolean durable = (Boolean)data.get("durable");
- long count = (Long)data.get("count");
- long countDelta = (Long)data.get("countDelta");
- int depth = (Integer)data.get("depth");
- int depthDelta = (Integer)data.get("depthDelta");
- String lastAddTimestamp = (String)data.get("lastAddTimestamp");
- String updateTimestamp = (String)data.get("updateTimestamp");
-
- return new MessageCounterInfo(name,
- subscription,
- durable,
- count,
- countDelta,
- depth,
- depthDelta,
- lastAddTimestamp,
- updateTimestamp);
- }
-
// Constructors --------------------------------------------------
public MessageCounterInfo(final String name,
@@ -219,28 +125,6 @@
// Public --------------------------------------------------------
- public CompositeData toCompositeData()
- {
- try
- {
-
- return new CompositeDataSupport(TYPE, ITEM_NAMES, new Object[] { name,
- subscription,
- durable,
- count,
- countDelta,
- depth,
- depthDelta,
- lastAddTimestamp,
- udpateTimestamp });
- }
- catch (OpenDataException e)
- {
- log.error("Unable to create a CompositeData from a MessageCounter", e);
- return null;
- }
- }
-
public String getName()
{
return name;
@@ -285,6 +169,7 @@
{
return udpateTimestamp;
}
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java 2009-05-18 14:49:51 UTC (rev 6842)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java 2009-05-18 14:59:09 UTC (rev 6843)
@@ -96,6 +96,38 @@
public String getPagingDirectory();
+ boolean isPersistDeliveryCountBeforeDelivery();
+
+ long getQueueActivationTimeout();
+
+ long getConnectionTTLOverride();
+
+ String getManagementAddress();
+
+ String getManagementNotificationAddress();
+
+ long getManagementRequestTimeout();
+
+ int getIDCacheSize();
+
+ boolean isPersistIDCache();
+
+ int getPagingGlobalWatermarkSize();
+
+ String getLargeMessagesDirectory();
+
+ boolean isWildcardRoutingEnabled();
+
+ long getTransactionTimeout();
+
+ long getTransactionTimeoutScanPeriod();
+
+ long getMessageExpiryScanPeriod();
+
+ long getMessageExpiryThreadPriority();
+
+ Object[] getConnectors() throws Exception;
+
// Operations ----------------------------------------------------
@Operation(desc = "Create a queue with the specified address", impact = ACTION)
@@ -163,38 +195,7 @@
String[] listSessions(@Parameter(desc = "a connection ID", name = "connectionID")
String connectionID) throws Exception;
- Object[] getConnectors() throws Exception;
-
void sendQueueInfoToQueue(String queueName, String address) throws Exception;
- boolean isPersistDeliveryCountBeforeDelivery();
- long getQueueActivationTimeout();
-
- long getConnectionTTLOverride();
-
- String getManagementAddress();
-
- String getManagementNotificationAddress();
-
- long getManagementRequestTimeout();
-
- int getIDCacheSize();
-
- boolean isPersistIDCache();
-
- int getPagingGlobalWatermarkSize();
-
- String getLargeMessagesDirectory();
-
- boolean isWildcardRoutingEnabled();
-
- long getTransactionTimeout();
-
- long getTransactionTimeoutScanPeriod();
-
- long getMessageExpiryScanPeriod();
-
- long getMessageExpiryThreadPriority();
-
}
Modified: trunk/src/main/org/jboss/messaging/core/management/ObjectNames.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/ObjectNames.java 2009-05-18 14:49:51 UTC (rev 6842)
+++ trunk/src/main/org/jboss/messaging/core/management/ObjectNames.java 2009-05-18 14:59:09 UTC (rev 6843)
@@ -56,11 +56,6 @@
return getInstance(DOMAIN + ":module=Core,type=Server");
}
- public static ObjectName getResourceManagerObjectName() throws Exception
- {
- return getInstance(DOMAIN + ":module=Core,type=ResourceManager");
- }
-
public static ObjectName getAddressObjectName(final SimpleString address) throws Exception
{
return createObjectName(CORE_MODULE, "Address", address.toString());
More information about the jboss-cvs-commits
mailing list