[jboss-cvs] JBoss Messaging SVN: r5834 - in trunk: src/main/org/jboss/messaging/core/management and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 6 06:26:33 EST 2009
Author: jmesnil
Date: 2009-02-06 06:26:32 -0500 (Fri, 06 Feb 2009)
New Revision: 5834
Added:
trunk/src/main/org/jboss/messaging/core/management/ObjectNames.java
Modified:
trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java
trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementControlHelper.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSManagementServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSServerControlTest.java
Log:
all JBM ObjectNames are created in o.j.m.core.management.ObjectNames
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -37,7 +37,7 @@
import org.jboss.messaging.core.client.management.impl.ManagementHelper;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.util.SimpleString;
/*
@@ -100,7 +100,7 @@
// method
ClientMessage mngmntMessage = clientSession.createClientMessage(false);
ManagementHelper.putOperationInvocation(mngmntMessage,
- ManagementServiceImpl.getMessagingServerObjectName(),
+ ObjectNames.getMessagingServerObjectName(),
"setMessageCounterSamplePeriod",
(long)30000);
ClientMessage reply = requestor.request(mngmntMessage);
@@ -120,7 +120,7 @@
// create a message to retrieve one or many attributes
mngmntMessage = clientSession.createClientMessage(false);
ManagementHelper.putAttributes(mngmntMessage,
- ManagementServiceImpl.getQueueObjectName(queue, queue),
+ ObjectNames.getQueueObjectName(queue, queue),
"MessageCount",
"Durable");
reply = requestor.request(mngmntMessage);
@@ -136,7 +136,7 @@
// queue
mngmntMessage = clientSession.createClientMessage(false);
ManagementHelper.putOperationInvocation(mngmntMessage,
- ManagementServiceImpl.getQueueObjectName(queue, queue),
+ ObjectNames.getQueueObjectName(queue, queue),
"sendMessageToDLQ",
(long)6161);
reply = requestor.request(mngmntMessage);
Added: trunk/src/main/org/jboss/messaging/core/management/ObjectNames.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/ObjectNames.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/management/ObjectNames.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -0,0 +1,136 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.messaging.core.management;
+
+import static java.lang.String.format;
+import static javax.management.ObjectName.getInstance;
+import static javax.management.ObjectName.quote;
+
+import javax.management.ObjectName;
+
+import org.jboss.messaging.util.SimpleString;
+
+/**
+ * A ObjectNames
+ *
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ */
+public class ObjectNames
+{
+
+ // Constants -----------------------------------------------------
+
+ public static final String DOMAIN = "org.jboss.messaging";
+
+ public static final String JMS_MODULE = "JMS";
+
+ public static final String CORE_MODULE = "Core";
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ public static ObjectName getMessagingServerObjectName() throws Exception
+ {
+ 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());
+ }
+
+ public static ObjectName getQueueObjectName(final SimpleString address, final SimpleString name) throws Exception
+ {
+ return getInstance(format("%s:module=%s,type=%s,address=%s,name=%s",
+ DOMAIN,
+ CORE_MODULE,
+ "Queue",
+ quote(address.toString()),
+ quote(name.toString())));
+ }
+
+ public static ObjectName getAcceptorObjectName(final String name) throws Exception
+ {
+ return createObjectName(CORE_MODULE, "Acceptor", name);
+ }
+
+ public static ObjectName getBroadcastGroupObjectName(final String name) throws Exception
+ {
+ return createObjectName(CORE_MODULE, "BroadcastGroup", name);
+ }
+
+ public static ObjectName getBridgeObjectName(final String name) throws Exception
+ {
+ return createObjectName(CORE_MODULE, "Bridge", name);
+ }
+
+ public static ObjectName getDiscoveryGroupObjectName(final String name) throws Exception
+ {
+ return createObjectName(CORE_MODULE, "DiscoveryGroup", name);
+ }
+
+ public static ObjectName getJMSServerObjectName() throws Exception
+ {
+ return getInstance(DOMAIN + ":module=JMS,type=Server");
+ }
+
+ public static ObjectName getJMSQueueObjectName(final String name) throws Exception
+ {
+ return createObjectName(JMS_MODULE, "Queue", name);
+ }
+
+ public static ObjectName getJMSTopicObjectName(final String name) throws Exception
+ {
+ return createObjectName(JMS_MODULE, "Topic", name);
+ }
+
+ public static ObjectName getConnectionFactoryObjectName(final String name) throws Exception
+ {
+ return createObjectName(JMS_MODULE, "ConnectionFactory", name);
+ }
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ private static ObjectName createObjectName(final String module, final String type, final String name) throws Exception
+ {
+ return getInstance(format("%s:module=%s,type=%s,name=%s", DOMAIN, module, type, quote(name)));
+ }
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -24,7 +24,6 @@
package org.jboss.messaging.core.management.impl;
-import static javax.management.ObjectName.quote;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -59,6 +58,7 @@
import org.jboss.messaging.core.management.Notification;
import org.jboss.messaging.core.management.NotificationListener;
import org.jboss.messaging.core.management.NotificationType;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.management.jmx.impl.ReplicationAwareAddressControlWrapper;
import org.jboss.messaging.core.management.jmx.impl.ReplicationAwareMessagingServerControlWrapper;
import org.jboss.messaging.core.management.jmx.impl.ReplicationAwareQueueControlWrapper;
@@ -98,10 +98,6 @@
private static final Logger log = Logger.getLogger(ManagementServiceImpl.class);
- public static final String DOMAIN = "org.jboss.messaging";
-
- // Attributes ----------------------------------------------------
-
private final MBeanServer mbeanServer;
private final boolean jmxManagementEnabled;
@@ -132,53 +128,6 @@
// Static --------------------------------------------------------
- public static ObjectName getMessagingServerObjectName() throws Exception
- {
- return ObjectName.getInstance(DOMAIN + ":module=Core,type=Server");
- }
-
- public static ObjectName getResourceManagerObjectName() throws Exception
- {
- return ObjectName.getInstance(DOMAIN + ":module=Core,type=ResourceManager");
- }
-
- public static ObjectName getAddressObjectName(final SimpleString address) throws Exception
- {
- return ObjectName.getInstance(String.format("%s:module=Core,type=Address,name=%s",
- DOMAIN,
- quote(address.toString())));
- }
-
- public static ObjectName getQueueObjectName(final SimpleString address, final SimpleString name) throws Exception
- {
- return ObjectName.getInstance(String.format("%s:module=Core,type=Queue,address=%s,name=%s",
- DOMAIN,
- quote(address.toString()),
- quote(name.toString())));
- }
-
- public static ObjectName getAcceptorObjectName(final String name) throws Exception
- {
- return ObjectName.getInstance(String.format("%s:module=Core,type=Acceptor,name=%s", DOMAIN, quote(name)));
- }
-
- public static ObjectName getBroadcastGroupObjectName(final String name) throws Exception
- {
- return ObjectName.getInstance(String.format("%s:module=Core,type=BroadcastGroup,name=%s", DOMAIN, quote(name)));
- }
-
- public static ObjectName getBridgeObjectName(final String name) throws Exception
- {
- return ObjectName.getInstance(String.format("%s:module=Core,type=Bridge,name=%s", DOMAIN, quote(name)));
- }
-
- public static ObjectName getDiscoveryGroupObjectName(final String name) throws Exception
- {
- return ObjectName.getInstance(String.format("%s:module=Core,type=DiscoveryGroup,name=%s", DOMAIN, quote(name)));
- }
-
- // Constructors --------------------------------------------------
-
public ManagementServiceImpl(final MBeanServer mbeanServer, final boolean jmxManagementEnabled)
{
this.mbeanServer = mbeanServer;
@@ -221,7 +170,7 @@
messageCounterManager,
broadcaster,
queueFactory);
- ObjectName objectName = getMessagingServerObjectName();
+ ObjectName objectName = ObjectNames.getMessagingServerObjectName();
registerInJMX(objectName, new ReplicationAwareMessagingServerControlWrapper(objectName, managedServer));
registerInRegistry(objectName, managedServer);
@@ -230,13 +179,13 @@
public void unregisterServer() throws Exception
{
- ObjectName objectName = getMessagingServerObjectName();
+ ObjectName objectName = ObjectNames.getMessagingServerObjectName();
unregisterResource(objectName);
}
public void registerAddress(final SimpleString address) throws Exception
{
- ObjectName objectName = getAddressObjectName(address);
+ ObjectName objectName = ObjectNames.getAddressObjectName(address);
AddressControl addressControl = new AddressControl(address, postOffice, securityRepository);
registerInJMX(objectName, new ReplicationAwareAddressControlWrapper(objectName, addressControl));
@@ -256,7 +205,7 @@
public void unregisterAddress(final SimpleString address) throws Exception
{
- ObjectName objectName = getAddressObjectName(address);
+ ObjectName objectName = ObjectNames.getAddressObjectName(address);
unregisterResource(objectName);
@@ -276,7 +225,7 @@
queue.isDurable(),
messageCounterManager.getMaxDayCount());
messageCounterManager.registerMessageCounter(queue.getName().toString(), counter);
- ObjectName objectName = getQueueObjectName(address, queue.getName());
+ ObjectName objectName = ObjectNames.getQueueObjectName(address, queue.getName());
QueueControl queueControl = new QueueControl(queue, storageManager, postOffice, queueSettingsRepository, counter);
registerInJMX(objectName, new ReplicationAwareQueueControlWrapper(objectName, queueControl));
registerInRegistry(objectName, queueControl);
@@ -289,14 +238,14 @@
public void unregisterQueue(final SimpleString name, final SimpleString address) throws Exception
{
- ObjectName objectName = getQueueObjectName(address, name);
+ ObjectName objectName = ObjectNames.getQueueObjectName(address, name);
unregisterResource(objectName);
messageCounterManager.unregisterMessageCounter(name.toString());
}
public void registerAcceptor(final Acceptor acceptor, final TransportConfiguration configuration) throws Exception
{
- ObjectName objectName = getAcceptorObjectName(configuration.getName());
+ ObjectName objectName = ObjectNames.getAcceptorObjectName(configuration.getName());
AcceptorControlMBean control = new AcceptorControl(acceptor, configuration);
registerInJMX(objectName, new StandardMBean(control, AcceptorControlMBean.class));
registerInRegistry(objectName, control);
@@ -304,13 +253,13 @@
public void unregisterAcceptor(final String name) throws Exception
{
- ObjectName objectName = getAcceptorObjectName(name);
+ ObjectName objectName = ObjectNames.getAcceptorObjectName(name);
unregisterResource(objectName);
}
public void registerBroadcastGroup(BroadcastGroup broadcastGroup, BroadcastGroupConfiguration configuration) throws Exception
{
- ObjectName objectName = getBroadcastGroupObjectName(configuration.getName());
+ ObjectName objectName = ObjectNames.getBroadcastGroupObjectName(configuration.getName());
BroadcastGroupControlMBean control = new BroadcastGroupControl(broadcastGroup, configuration);
registerInJMX(objectName, new StandardMBean(control, BroadcastGroupControlMBean.class));
registerInRegistry(objectName, control);
@@ -318,13 +267,13 @@
public void unregisterBroadcastGroup(String name) throws Exception
{
- ObjectName objectName = getBroadcastGroupObjectName(name);
+ ObjectName objectName = ObjectNames.getBroadcastGroupObjectName(name);
unregisterResource(objectName);
}
public void registerDiscoveryGroup(DiscoveryGroup discoveryGroup, DiscoveryGroupConfiguration configuration) throws Exception
{
- ObjectName objectName = getDiscoveryGroupObjectName(configuration.getName());
+ ObjectName objectName = ObjectNames.getDiscoveryGroupObjectName(configuration.getName());
DiscoveryGroupControlMBean control = new DiscoveryGroupControl(discoveryGroup, configuration);
registerInJMX(objectName, new StandardMBean(control, DiscoveryGroupControlMBean.class));
registerInRegistry(objectName, control);
@@ -332,13 +281,13 @@
public void unregisterDiscoveryGroup(String name) throws Exception
{
- ObjectName objectName = getDiscoveryGroupObjectName(name);
+ ObjectName objectName = ObjectNames.getDiscoveryGroupObjectName(name);
unregisterResource(objectName);
}
public void registerBridge(Bridge bridge, BridgeConfiguration configuration) throws Exception
{
- ObjectName objectName = getBridgeObjectName(configuration.getName());
+ ObjectName objectName = ObjectNames.getBridgeObjectName(configuration.getName());
BridgeControlMBean control = new BridgeControl(bridge, configuration);
registerInJMX(objectName, new StandardMBean(control, BridgeControlMBean.class));
registerInRegistry(objectName, control);
@@ -346,7 +295,7 @@
public void unregisterBridge(String name) throws Exception
{
- ObjectName objectName = getBridgeObjectName(name);
+ ObjectName objectName = ObjectNames.getBridgeObjectName(name);
unregisterResource(objectName);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -47,7 +47,7 @@
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.NotificationType;
-import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.message.impl.MessageImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.remoting.FailureListener;
@@ -696,7 +696,7 @@
ClientMessage message = session.createClientMessage(false);
ManagementHelper.putOperationInvocation(message,
- ManagementServiceImpl.getMessagingServerObjectName(),
+ ObjectNames.getMessagingServerObjectName(),
"sendQueueInfoToQueue",
notifQueueName.toString(),
flowRecord.getAddress());
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -22,14 +22,13 @@
package org.jboss.messaging.jms.server.management.impl;
-import static javax.management.ObjectName.quote;
import java.util.List;
import javax.management.ObjectName;
import org.jboss.messaging.core.management.ManagementService;
-import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.messagecounter.MessageCounter;
import org.jboss.messaging.core.messagecounter.MessageCounterManager;
import org.jboss.messaging.core.persistence.StorageManager;
@@ -63,31 +62,6 @@
// Static --------------------------------------------------------
- public static ObjectName getJMSServerObjectName() throws Exception
- {
- return ObjectName.getInstance(ManagementServiceImpl.DOMAIN + ":module=JMS,type=Server");
- }
-
- public static ObjectName getJMSQueueObjectName(final String name) throws Exception
- {
- return ObjectName.getInstance(ManagementServiceImpl.DOMAIN + ":module=JMS,type=Queue,name=" +
- quote(name.toString()));
- }
-
- public static ObjectName getJMSTopicObjectName(final String name) throws Exception
- {
- return ObjectName.getInstance(ManagementServiceImpl.DOMAIN + ":module=JMS,type=Topic,name=" +
- quote(name.toString()));
- }
-
- public static ObjectName getConnectionFactoryObjectName(final String name) throws Exception
- {
- return ObjectName.getInstance(ManagementServiceImpl.DOMAIN + ":module=JMS,type=ConnectionFactory,name=" +
- quote(name));
- }
-
- // Constructors --------------------------------------------------
-
public JMSManagementServiceImpl(final ManagementService managementService)
{
this.managementService = managementService;
@@ -99,7 +73,7 @@
public void registerJMSServer(final JMSServerManager server) throws Exception
{
- ObjectName objectName = getJMSServerObjectName();
+ ObjectName objectName = ObjectNames.getJMSServerObjectName();
JMSServerControl control = new JMSServerControl(server);
managementService.registerInJMX(objectName,
new ReplicationAwareJMSServerControlWrapper(objectName, control));
@@ -108,7 +82,7 @@
public void unregisterJMSServer() throws Exception
{
- ObjectName objectName = getJMSServerObjectName();
+ ObjectName objectName = ObjectNames.getJMSServerObjectName();
managementService.unregisterResource(objectName);
}
@@ -127,7 +101,7 @@
coreQueue.isDurable(),
messageCounterManager.getMaxDayCount());
messageCounterManager.registerMessageCounter(queue.getName(), counter);
- ObjectName objectName = getJMSQueueObjectName(queue.getQueueName());
+ ObjectName objectName = ObjectNames.getJMSQueueObjectName(queue.getQueueName());
JMSQueueControl control = new JMSQueueControl(queue,
coreQueue,
jndiBinding,
@@ -141,7 +115,7 @@
public void unregisterQueue(final String name) throws Exception
{
- ObjectName objectName = getJMSQueueObjectName(name);
+ ObjectName objectName = ObjectNames.getJMSQueueObjectName(name);
managementService.unregisterResource(objectName);
}
@@ -151,7 +125,7 @@
final StorageManager storageManager,
final HierarchicalRepository<AddressSettings> queueSettingsRepository) throws Exception
{
- ObjectName objectName = getJMSTopicObjectName(topic.getTopicName());
+ ObjectName objectName = ObjectNames.getJMSTopicObjectName(topic.getTopicName());
TopicControl control = new TopicControl(topic, jndiBinding, postOffice);
managementService.registerInJMX(objectName, new ReplicationAwareTopicControlWrapper(objectName, control));
managementService.registerInRegistry(objectName, control);
@@ -159,7 +133,7 @@
public void unregisterTopic(final String name) throws Exception
{
- ObjectName objectName = getJMSTopicObjectName(name);
+ ObjectName objectName = ObjectNames.getJMSTopicObjectName(name);
managementService.unregisterResource(objectName);
}
@@ -167,7 +141,7 @@
final JBossConnectionFactory connectionFactory,
final List<String> bindings) throws Exception
{
- ObjectName objectName = getConnectionFactoryObjectName(name);
+ ObjectName objectName = ObjectNames.getConnectionFactoryObjectName(name);
ConnectionFactoryControl control = new ConnectionFactoryControl(connectionFactory, name, bindings);
managementService.registerInJMX(objectName,
new ReplicationAwareConnectionFactoryControlWrapper(objectName, control));
@@ -176,7 +150,7 @@
public void unregisterConnectionFactory(final String name) throws Exception
{
- ObjectName objectName = getConnectionFactoryObjectName(name);
+ ObjectName objectName = ObjectNames.getConnectionFactoryObjectName(name);
managementService.unregisterResource(objectName);
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -52,6 +52,7 @@
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.MessagingServer;
@@ -63,7 +64,6 @@
import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
import org.jboss.messaging.jms.server.management.SubscriptionInfo;
import org.jboss.messaging.jms.server.management.TopicControlMBean;
-import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
import org.jboss.messaging.util.Pair;
import org.jboss.messaging.util.SimpleString;
import org.jboss.test.messaging.tools.ConfigurationHelper;
@@ -698,7 +698,7 @@
public Integer getMessageCountForQueue(String queueName) throws Exception
{
- ObjectName objectName = JMSManagementServiceImpl.getJMSQueueObjectName(queueName);
+ ObjectName objectName = ObjectNames.getJMSQueueObjectName(queueName);
JMSQueueControlMBean queue = (JMSQueueControlMBean)getMessagingServer().getManagementService()
.getResource(objectName);
if (queue != null)
@@ -722,7 +722,7 @@
public List<SubscriptionInfo> listAllSubscribersForTopic(String s) throws Exception
{
- ObjectName objectName = JMSManagementServiceImpl.getJMSTopicObjectName(s);
+ ObjectName objectName = ObjectNames.getJMSTopicObjectName(s);
TopicControlMBean topic = (TopicControlMBean)MBeanServerInvocationHandler.newProxyInstance(ManagementFactory.getPlatformMBeanServer(),
objectName,
TopicControlMBean.class,
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -41,6 +41,7 @@
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.jms.JBossDestination;
@@ -48,7 +49,6 @@
import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
import org.jboss.messaging.jms.server.management.SubscriptionInfo;
import org.jboss.messaging.jms.server.management.TopicControlMBean;
-import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
/**
* An RMI wrapper to access the ServiceContainer from a different address space.
@@ -465,7 +465,7 @@
public Integer getMessageCountForQueue(String queueName) throws Exception
{
- ObjectName objectName = JMSManagementServiceImpl.getJMSQueueObjectName(queueName);
+ ObjectName objectName = ObjectNames.getJMSQueueObjectName(queueName);
JMSQueueControlMBean queue = (JMSQueueControlMBean) MBeanServerInvocationHandler.newProxyInstance(
ManagementFactory.getPlatformMBeanServer(), objectName, JMSQueueControlMBean.class, false);
return queue.getMessageCount();
@@ -474,7 +474,7 @@
public List<SubscriptionInfo> listAllSubscribersForTopic(String s) throws Exception
{
- ObjectName objectName = JMSManagementServiceImpl.getJMSTopicObjectName(s);
+ ObjectName objectName = ObjectNames.getJMSTopicObjectName(s);
TopicControlMBean topic = (TopicControlMBean) MBeanServerInvocationHandler.newProxyInstance(
ManagementFactory.getPlatformMBeanServer(), objectName, TopicControlMBean.class, false);
return Arrays.asList(topic.listAllSubscriptionInfos());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -43,7 +43,7 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
@@ -117,7 +117,7 @@
ClientMessage managementMessage = session1.createClientMessage(false);
ManagementHelper.putAttributes(managementMessage,
- ManagementServiceImpl.getQueueObjectName(ADDRESS, ADDRESS),
+ ObjectNames.getQueueObjectName(ADDRESS, ADDRESS),
"MessageCount");
managementMessage.putStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME, replyTo);
managementMessage.getBody().flip();
@@ -137,7 +137,7 @@
ClientMessage managementMessage = session1.createClientMessage(false);
ManagementHelper.putAttributes(managementMessage,
- ManagementServiceImpl.getQueueObjectName(ADDRESS, ADDRESS),
+ ObjectNames.getQueueObjectName(ADDRESS, ADDRESS),
"MessageCount");
managementMessage.putStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME, replyTo);
@@ -211,7 +211,7 @@
ClientMessage managementMessage = session1.createClientMessage(false);
ManagementHelper.putAttributes(managementMessage,
- ManagementServiceImpl.getQueueObjectName(ADDRESS, ADDRESS),
+ ObjectNames.getQueueObjectName(ADDRESS, ADDRESS),
"MessageCount");
managementMessage.putStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME, replyTo);
managementMessage.getBody().flip();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -38,8 +38,8 @@
import org.jboss.messaging.core.client.impl.ClientSessionFactoryInternal;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.management.MessagingServerControlMBean;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.management.QueueControlMBean;
-import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.tests.util.RandomUtil;
import org.jboss.messaging.util.SimpleString;
@@ -69,7 +69,7 @@
SimpleString address = randomSimpleString();
MessagingServerControlMBean liveServerControl = createMessagingServerControl(liveMBeanServer);
- ObjectName addressON = ManagementServiceImpl.getAddressObjectName(address);
+ ObjectName addressON = ObjectNames.getAddressObjectName(address);
assertResourceNotExists(liveMBeanServer, addressON);
assertResourceNotExists(backupMBeanServer, addressON);
@@ -85,7 +85,7 @@
SimpleString address = randomSimpleString();
MessagingServerControlMBean liveServerControl = createMessagingServerControl(liveMBeanServer);
- ObjectName addressON = ManagementServiceImpl.getAddressObjectName(address);
+ ObjectName addressON = ObjectNames.getAddressObjectName(address);
assertResourceNotExists(liveMBeanServer, addressON);
assertResourceNotExists(backupMBeanServer, addressON);
@@ -109,7 +109,7 @@
SimpleString name = randomSimpleString();
MessagingServerControlMBean liveServerControl = createMessagingServerControl(liveMBeanServer);
- ObjectName queueON = ManagementServiceImpl.getQueueObjectName(address, name);
+ ObjectName queueON = ObjectNames.getQueueObjectName(address, name);
assertResourceNotExists(liveMBeanServer, queueON);
assertResourceNotExists(backupMBeanServer, queueON);
@@ -126,7 +126,7 @@
SimpleString name = randomSimpleString();
MessagingServerControlMBean liveServerControl = createMessagingServerControl(liveMBeanServer);
- ObjectName queueON = ManagementServiceImpl.getQueueObjectName(address, name);
+ ObjectName queueON = ObjectNames.getQueueObjectName(address, name);
assertResourceNotExists(liveMBeanServer, queueON);
assertResourceNotExists(backupMBeanServer, queueON);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementControlHelper.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementControlHelper.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementControlHelper.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -34,13 +34,12 @@
import org.jboss.messaging.core.management.BroadcastGroupControlMBean;
import org.jboss.messaging.core.management.DiscoveryGroupControlMBean;
import org.jboss.messaging.core.management.MessagingServerControlMBean;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.management.QueueControlMBean;
-import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
import org.jboss.messaging.jms.server.management.ConnectionFactoryControlMBean;
import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
import org.jboss.messaging.jms.server.management.JMSServerControlMBean;
import org.jboss.messaging.jms.server.management.TopicControlMBean;
-import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
import org.jboss.messaging.util.SimpleString;
/**
@@ -60,49 +59,49 @@
public static AcceptorControlMBean createAcceptorControl(String name, MBeanServer mbeanServer) throws Exception
{
- return (AcceptorControlMBean)createProxy(ManagementServiceImpl.getAcceptorObjectName(name),
+ return (AcceptorControlMBean)createProxy(ObjectNames.getAcceptorObjectName(name),
AcceptorControlMBean.class,
mbeanServer);
}
public static BroadcastGroupControlMBean createBroadcastGroupControl(String name, MBeanServer mbeanServer) throws Exception
{
- return (BroadcastGroupControlMBean)createProxy(ManagementServiceImpl.getBroadcastGroupObjectName(name),
+ return (BroadcastGroupControlMBean)createProxy(ObjectNames.getBroadcastGroupObjectName(name),
BroadcastGroupControlMBean.class,
mbeanServer);
}
public static DiscoveryGroupControlMBean createDiscoveryGroupControl(String name, MBeanServer mbeanServer) throws Exception
{
- return (DiscoveryGroupControlMBean)createProxy(ManagementServiceImpl.getDiscoveryGroupObjectName(name),
+ return (DiscoveryGroupControlMBean)createProxy(ObjectNames.getDiscoveryGroupObjectName(name),
DiscoveryGroupControlMBean.class,
mbeanServer);
}
public static BridgeControlMBean createBridgeControl(String name, MBeanServer mbeanServer) throws Exception
{
- return (BridgeControlMBean)createProxy(ManagementServiceImpl.getBridgeObjectName(name),
+ return (BridgeControlMBean)createProxy(ObjectNames.getBridgeObjectName(name),
BridgeControlMBean.class,
mbeanServer);
}
public static MessagingServerControlMBean createMessagingServerControl(MBeanServer mbeanServer) throws Exception
{
- return (MessagingServerControlMBean)createProxy(ManagementServiceImpl.getMessagingServerObjectName(),
+ return (MessagingServerControlMBean)createProxy(ObjectNames.getMessagingServerObjectName(),
MessagingServerControlMBean.class,
mbeanServer);
}
public static QueueControlMBean createQueueControl(SimpleString address, SimpleString name, MBeanServer mbeanServer) throws Exception
{
- return (QueueControlMBean)createProxy(ManagementServiceImpl.getQueueObjectName(address, name),
+ return (QueueControlMBean)createProxy(ObjectNames.getQueueObjectName(address, name),
QueueControlMBean.class,
mbeanServer);
}
public static AddressControlMBean createAddressControl(SimpleString address, MBeanServer mbeanServer) throws Exception
{
- return (AddressControlMBean)createProxy(ManagementServiceImpl.getAddressObjectName(address),
+ return (AddressControlMBean)createProxy(ObjectNames.getAddressObjectName(address),
AddressControlMBean.class,
mbeanServer);
}
@@ -114,28 +113,28 @@
public static JMSQueueControlMBean createJMSQueueControl(String name, MBeanServer mbeanServer) throws Exception
{
- return (JMSQueueControlMBean)createProxy(JMSManagementServiceImpl.getJMSQueueObjectName(name),
+ return (JMSQueueControlMBean)createProxy(ObjectNames.getJMSQueueObjectName(name),
JMSQueueControlMBean.class,
mbeanServer);
}
public static JMSServerControlMBean createJMSServerControl(MBeanServer mbeanServer) throws Exception
{
- return (JMSServerControlMBean)createProxy(JMSManagementServiceImpl.getJMSServerObjectName(),
+ return (JMSServerControlMBean)createProxy(ObjectNames.getJMSServerObjectName(),
JMSServerControlMBean.class,
mbeanServer);
}
public static ConnectionFactoryControlMBean createConnectionFactoryControl(String name, MBeanServer mbeanServer) throws Exception
{
- return (ConnectionFactoryControlMBean)createProxy(JMSManagementServiceImpl.getConnectionFactoryObjectName(name),
+ return (ConnectionFactoryControlMBean)createProxy(ObjectNames.getConnectionFactoryObjectName(name),
ConnectionFactoryControlMBean.class,
mbeanServer);
}
public static TopicControlMBean createTopicControl(Topic topic, MBeanServer mbeanServer) throws Exception
{
- return (TopicControlMBean)createProxy(JMSManagementServiceImpl.getJMSTopicObjectName(topic.getTopicName()),
+ return (TopicControlMBean)createProxy(ObjectNames.getJMSTopicObjectName(topic.getTopicName()),
TopicControlMBean.class,
mbeanServer);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -47,6 +47,7 @@
import org.jboss.messaging.core.client.management.impl.ManagementHelper;
import org.jboss.messaging.core.management.AddressControlMBean;
import org.jboss.messaging.core.management.ManagementService;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
@@ -86,7 +87,7 @@
ServerMessage message = new ServerMessageImpl();
MessagingBuffer body = new ByteBufferWrapper(ByteBuffer.allocate(2048));
message.setBody(body);
- ManagementHelper.putAttributes(message, ManagementServiceImpl.getAddressObjectName(address), "Address");
+ ManagementHelper.putAttributes(message, ObjectNames.getAddressObjectName(address), "Address");
managementService.handleMessage(message);
@@ -110,7 +111,7 @@
replay(resource);
SimpleString address = RandomUtil.randomSimpleString();
- ObjectName on = ManagementServiceImpl.getAddressObjectName(address);
+ ObjectName on = ObjectNames.getAddressObjectName(address);
managementService.registerResource(on, resource);
// invoke attribute and operation on the server
@@ -150,7 +151,7 @@
replay(resource);
SimpleString address = RandomUtil.randomSimpleString();
- ObjectName on = ManagementServiceImpl.getAddressObjectName(address);
+ ObjectName on = ObjectNames.getAddressObjectName(address);
managementService.registerResource(on, resource);
// invoke attribute and operation on the server
@@ -187,11 +188,11 @@
managementService.registerAddress(randomSimpleString());
- assertEquals(1, mbeanServer.queryMBeans(ObjectName.getInstance(ManagementServiceImpl.DOMAIN + ":*"), null).size());
+ assertEquals(1, mbeanServer.queryMBeans(ObjectName.getInstance(ObjectNames.DOMAIN + ":*"), null).size());
managementService.stop();
- assertEquals(0, mbeanServer.queryMBeans(ObjectName.getInstance(ManagementServiceImpl.DOMAIN + ":*"), null).size());
+ assertEquals(0, mbeanServer.queryMBeans(ObjectName.getInstance(ObjectNames.DOMAIN + ":*"), null).size());
}
// Package protected ---------------------------------------------
@@ -200,7 +201,7 @@
protected void tearDown() throws Exception
{
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
- assertEquals(0, mbeanServer.queryMBeans(ObjectName.getInstance(ManagementServiceImpl.DOMAIN + ":*"), null).size());
+ assertEquals(0, mbeanServer.queryMBeans(ObjectName.getInstance(ObjectNames.DOMAIN + ":*"), null).size());
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTest.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityManagementTest.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -38,7 +38,7 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.security.Role;
@@ -150,7 +150,7 @@
ClientRequestor requestor = new ClientRequestor(session, DEFAULT_MANAGEMENT_ADDRESS);
ClientMessage mngmntMessage = session.createClientMessage(false);
- ManagementHelper.putAttributes(mngmntMessage, ManagementServiceImpl.getMessagingServerObjectName(), "Started");
+ ManagementHelper.putAttributes(mngmntMessage, ObjectNames.getMessagingServerObjectName(), "Started");
ClientMessage reply = requestor.request(mngmntMessage, 500);
if (expectReply)
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -41,6 +41,7 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.management.ManagementService;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.management.impl.AddressControl;
import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
import org.jboss.messaging.core.management.impl.MessagingServerControl;
@@ -75,7 +76,7 @@
public void testRegisterMessagingServer() throws Exception
{
- ObjectName objectName = ManagementServiceImpl.getMessagingServerObjectName();
+ ObjectName objectName = ObjectNames.getMessagingServerObjectName();
ObjectInstance objectInstance = new ObjectInstance(objectName, MessagingServerControl.class.getName());
PostOffice postOffice = createMock(PostOffice.class);
@@ -127,7 +128,7 @@
public void testRegisterAlreadyRegisteredMessagingServer() throws Exception
{
- ObjectName objectName = ManagementServiceImpl.getMessagingServerObjectName();
+ ObjectName objectName = ObjectNames.getMessagingServerObjectName();
ObjectInstance objectInstance = new ObjectInstance(objectName, MessagingServerControl.class.getName());
PostOffice postOffice = createMock(PostOffice.class);
@@ -180,7 +181,7 @@
public void testUnregisterMessagingServer() throws Exception
{
- ObjectName objectName = ManagementServiceImpl.getMessagingServerObjectName();
+ ObjectName objectName = ObjectNames.getMessagingServerObjectName();
MBeanServer mbeanServer = createMock(MBeanServer.class);
expect(mbeanServer.isRegistered(objectName)).andReturn(true);
@@ -197,7 +198,7 @@
public void testRegisterAddress() throws Exception
{
SimpleString address = randomSimpleString();
- ObjectName objectName = ManagementServiceImpl.getAddressObjectName(address);
+ ObjectName objectName = ObjectNames.getAddressObjectName(address);
ObjectInstance objectInstance = new ObjectInstance(objectName, AddressControl.class.getName());
MBeanServer mbeanServer = createMock(MBeanServer.class);
@@ -215,7 +216,7 @@
public void testRegisterAlreadyRegisteredAddress() throws Exception
{
SimpleString address = randomSimpleString();
- ObjectName objectName = ManagementServiceImpl.getAddressObjectName(address);
+ ObjectName objectName = ObjectNames.getAddressObjectName(address);
ObjectInstance objectInstance = new ObjectInstance(objectName, AddressControl.class.getName());
MBeanServer mbeanServer = createMock(MBeanServer.class);
@@ -234,7 +235,7 @@
public void testUnregisterAddress() throws Exception
{
SimpleString address = randomSimpleString();
- ObjectName objectName = ManagementServiceImpl.getAddressObjectName(address);
+ ObjectName objectName = ObjectNames.getAddressObjectName(address);
MBeanServer mbeanServer = createMock(MBeanServer.class);
expect(mbeanServer.isRegistered(objectName)).andReturn(true);
@@ -299,7 +300,7 @@
{
SimpleString address = randomSimpleString();
SimpleString name = randomSimpleString();
- ObjectName objectName = ManagementServiceImpl.getQueueObjectName(address, name);
+ ObjectName objectName = ObjectNames.getQueueObjectName(address, name);
MBeanServer mbeanServer = createMock(MBeanServer.class);
expect(mbeanServer.isRegistered(objectName)).andReturn(true);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSManagementServiceImplTest.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSManagementServiceImplTest.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -39,6 +39,7 @@
import junit.framework.TestCase;
import org.jboss.messaging.core.management.ManagementService;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.messagecounter.MessageCounter;
import org.jboss.messaging.core.messagecounter.MessageCounterManager;
import org.jboss.messaging.core.persistence.StorageManager;
@@ -76,7 +77,7 @@
public void testRegisterJMSServer() throws Exception
{
- ObjectName objectName = JMSManagementServiceImpl.getJMSServerObjectName();
+ ObjectName objectName = ObjectNames.getJMSServerObjectName();
JMSServerManager server = createMock(JMSServerManager.class);
@@ -95,7 +96,7 @@
{
String name = randomString();
String jndiBinding = randomString();
- ObjectName objectName = JMSManagementServiceImpl.getJMSQueueObjectName(name);
+ ObjectName objectName = ObjectNames.getJMSQueueObjectName(name);
JBossQueue queue = new JBossQueue(name);
Queue coreQueue = createMock(Queue.class);
@@ -124,7 +125,7 @@
{
String name = randomString();
String jndiBinding = randomString();
- ObjectName objectName = JMSManagementServiceImpl.getJMSTopicObjectName(name);
+ ObjectName objectName = ObjectNames.getJMSTopicObjectName(name);
JBossTopic topic = new JBossTopic(name);
PostOffice postOffice = createMock(PostOffice.class);
@@ -150,7 +151,7 @@
List<String> bindings = new ArrayList<String>();
bindings.add(jndiBinding);
- ObjectName objectName = JMSManagementServiceImpl.getConnectionFactoryObjectName(name);
+ ObjectName objectName = ObjectNames.getConnectionFactoryObjectName(name);
JBossConnectionFactory connectionFactory = createMock(JBossConnectionFactory.class);
ManagementService managementService = createMock(ManagementService.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSServerControlTest.java 2009-02-06 11:09:48 UTC (rev 5833)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSServerControlTest.java 2009-02-06 11:26:32 UTC (rev 5834)
@@ -41,8 +41,8 @@
import junit.framework.TestCase;
+import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.jms.server.JMSServerManager;
-import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
import org.jboss.messaging.jms.server.management.impl.JMSServerControl;
/**
@@ -367,7 +367,7 @@
mbeanServer = MBeanServerFactory.createMBeanServer();
- serverON = JMSManagementServiceImpl.getJMSServerObjectName();
+ serverON = ObjectNames.getJMSServerObjectName();
}
@Override
More information about the jboss-cvs-commits
mailing list