[jboss-cvs] JBoss Messaging SVN: r6476 - in trunk: src/main/org/jboss/messaging/core/management/impl and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 17 10:37:13 EDT 2009
Author: jmesnil
Date: 2009-04-17 10:37:13 -0400 (Fri, 17 Apr 2009)
New Revision: 6476
Modified:
trunk/src/main/org/jboss/messaging/core/management/ManagementService.java
trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
Log:
ManagementService API refactoring
* removed setter methods now that the configuration is injected in the constructor
* uncommented ManagementServiceImplTest and update the tests to get rid of easymock
Modified: trunk/src/main/org/jboss/messaging/core/management/ManagementService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/ManagementService.java 2009-04-17 13:53:52 UTC (rev 6475)
+++ trunk/src/main/org/jboss/messaging/core/management/ManagementService.java 2009-04-17 14:37:13 UTC (rev 6476)
@@ -69,18 +69,10 @@
String getClusterPassword();
- void setClusterPassword(String clusterPassword);
-
SimpleString getManagementAddress();
- void setManagementAddress(SimpleString managementAddress);
-
SimpleString getManagementNotificationAddress();
- void setManagementNotificationAddress(SimpleString managementNotificationAddress);
-
- void setManagementRequestTimeout(long timeout);
-
ReplicationOperationInvoker getReplicationOperationInvoker();
// Resource Registration
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-04-17 13:53:52 UTC (rev 6475)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-04-17 14:37:13 UTC (rev 6476)
@@ -48,7 +48,6 @@
import org.jboss.messaging.core.config.cluster.ClusterConnectionConfiguration;
import org.jboss.messaging.core.config.cluster.DiscoveryGroupConfiguration;
import org.jboss.messaging.core.config.cluster.DivertConfiguration;
-import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.AcceptorControlMBean;
import org.jboss.messaging.core.management.BridgeControlMBean;
@@ -121,14 +120,14 @@
private final MessageCounterManager messageCounterManager;
- private SimpleString managementNotificationAddress = ConfigurationImpl.DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS;
-
- private SimpleString managementAddress = ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS;
-
- private String managementClusterPassword = ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_PASSWORD;
-
- private long managementRequestTimeout = ConfigurationImpl.DEFAULT_MANAGEMENT_REQUEST_TIMEOUT;
-
+ private final SimpleString managementNotificationAddress;
+
+ private final SimpleString managementAddress;
+
+ private final String managementClusterPassword;
+
+ private final long managementRequestTimeout;
+
private boolean started = false;
private boolean messageCounterEnabled;
@@ -146,6 +145,11 @@
this.mbeanServer = mbeanServer;
this.jmxManagementEnabled = configuration.isJMXManagementEnabled();
this.messageCounterEnabled = configuration.isMessageCounterEnabled();
+ this.managementAddress = configuration.getManagementAddress();
+ this.managementNotificationAddress = configuration.getManagementNotificationAddress();
+ this.managementClusterPassword = configuration.getManagementClusterPassword();
+ this.managementRequestTimeout = configuration.getManagementRequestTimeout();
+
registry = new HashMap<String, Object>();
broadcaster = new NotificationBroadcasterSupport();
noticationsEnabled = true;
@@ -481,41 +485,21 @@
return managementAddress;
}
- public void setManagementAddress(SimpleString managementAddress)
- {
- this.managementAddress = managementAddress;
- }
-
public SimpleString getManagementNotificationAddress()
{
return managementNotificationAddress;
}
- public void setManagementNotificationAddress(SimpleString managementNotificationAddress)
- {
- this.managementNotificationAddress = managementNotificationAddress;
- }
-
public String getClusterPassword()
{
return managementClusterPassword;
}
- public void setClusterPassword(String clusterPassword)
- {
- this.managementClusterPassword = clusterPassword;
- }
-
public long getManagementRequestTimeout()
{
return managementRequestTimeout;
}
- public void setManagementRequestTimeout(long timeout)
- {
- this.managementRequestTimeout = timeout;
- }
-
public ReplicationOperationInvoker getReplicationOperationInvoker()
{
return replicationInvoker;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-04-17 13:53:52 UTC (rev 6475)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-04-17 14:37:13 UTC (rev 6476)
@@ -285,11 +285,6 @@
pagingManager.start();
- managementService.setManagementAddress(configuration.getManagementAddress());
- managementService.setManagementNotificationAddress(configuration.getManagementNotificationAddress());
- managementService.setClusterPassword(configuration.getManagementClusterPassword());
- managementService.setManagementRequestTimeout(configuration.getManagementRequestTimeout());
-
managementService.start();
// Start the deployers
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-04-17 13:53:52 UTC (rev 6475)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-04-17 14:37:13 UTC (rev 6476)
@@ -24,8 +24,29 @@
package org.jboss.messaging.tests.integration.management;
+import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
+import static org.jboss.messaging.tests.util.RandomUtil.randomString;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+import org.jboss.messaging.core.buffers.ChannelBuffers;
+import org.jboss.messaging.core.client.management.impl.ManagementHelper;
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.management.ManagementService;
+import org.jboss.messaging.core.management.ResourceNames;
+import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+import org.jboss.messaging.core.security.Role;
+import org.jboss.messaging.core.server.Messaging;
+import org.jboss.messaging.core.server.MessagingServer;
+import org.jboss.messaging.core.server.ServerMessage;
+import org.jboss.messaging.core.server.impl.ServerMessageImpl;
+import org.jboss.messaging.tests.util.RandomUtil;
import org.jboss.messaging.tests.util.UnitTestCase;
+import org.jboss.messaging.utils.SimpleString;
/*
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -48,122 +69,58 @@
public void testHandleManagementMessageWithOperation() throws Exception
{
- /*MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
- ManagementService managementService = new ManagementServiceImpl(mbeanServer, false);
- assertNotNull(managementService);
- managementService.start();
+ String queue = randomString();
+ String address = randomString();
+
+ Configuration conf = new ConfigurationImpl();
+ conf.setJMXManagementEnabled(false);
+
+ MessagingServer server = Messaging.newMessagingServer(conf, false);
+ server.start();
- Role role = new Role(randomString(), randomBoolean(), randomBoolean(), randomBoolean());
-
- AddressControlMBean resource = createMock(AddressControlMBean.class);
- resource.addRole(role.getName(), role.isCheckType(CREATE), role.isCheckType(READ), role.isCheckType(WRITE));
- replay(resource);
-
- SimpleString address = RandomUtil.randomSimpleString();
- ObjectName on = ObjectNames.getAddressObjectName(address);
- managementService.registerResource(on, resource);
-
// invoke attribute and operation on the server
ServerMessage message = new ServerMessageImpl();
MessagingBuffer body = ChannelBuffers.buffer(2048);
message.setBody(body);
ManagementHelper.putOperationInvocation(message,
- on,
- "addRole",
- role.getName(),
- role.isCheckType(CREATE),
- role.isCheckType(READ),
- role.isCheckType(WRITE));
+ ResourceNames.CORE_SERVER,
+ "createQueue",
+ queue,
+ address);
+
+ ServerMessage reply = server.getManagementService().handleMessage(message);
+
+ assertTrue(ManagementHelper.hasOperationSucceeded(reply));
- ServerMessage reply = managementService.handleMessage(message);
-
- boolean success = (Boolean)reply.getProperty(ManagementHelper.HDR_JMX_OPERATION_SUCCEEDED);
- assertTrue(success);
-
- verify(resource);
-
- managementService.stop();*/
+ server.stop();
}
- /*public void testHandleManagementMessageWithOperationWhichFails() throws Exception
+ public void testHandleManagementMessageWithOperationWhichFails() throws Exception
{
- MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
- ManagementService managementService = new ManagementServiceImpl(mbeanServer, false);
- assertNotNull(managementService);
- managementService.start();
+ Configuration conf = new ConfigurationImpl();
+ conf.setJMXManagementEnabled(false);
+
+ MessagingServer server = Messaging.newMessagingServer(conf, false);
+ server.start();
- Role role = new Role(randomString(), randomBoolean(), randomBoolean(), randomBoolean());
-
- String exceptionMessage = randomString();
- AddressControlMBean resource = createMock(AddressControlMBean.class);
- resource.addRole(role.getName(), role.isCheckType(CREATE), role.isCheckType(READ), role.isCheckType(WRITE));
- expectLastCall().andThrow(new Exception(exceptionMessage));
- replay(resource);
-
- SimpleString address = RandomUtil.randomSimpleString();
- ObjectName on = ObjectNames.getAddressObjectName(address);
- managementService.registerResource(on, resource);
-
// invoke attribute and operation on the server
ServerMessage message = new ServerMessageImpl();
MessagingBuffer body = ChannelBuffers.buffer(2048);
message.setBody(body);
ManagementHelper.putOperationInvocation(message,
- on,
- "addRole",
- role.getName(),
- role.isCheckType(CREATE),
- role.isCheckType(READ),
- role.isCheckType(WRITE));
+ ResourceNames.CORE_SERVER,
+ "thereIsNoSuchOperation");
+
+ ServerMessage reply = server.getManagementService().handleMessage(message);
- ServerMessage reply = managementService.handleMessage(message);
-
- boolean success = (Boolean)reply.getProperty(ManagementHelper.HDR_JMX_OPERATION_SUCCEEDED);
- assertFalse(success);
- SimpleString exceptionMsg = (SimpleString)reply.getProperty(ManagementHelper.HDR_JMX_OPERATION_EXCEPTION);
- assertNotNull(exceptionMsg);
- assertEquals(exceptionMessage, exceptionMsg.toString());
-
- verify(resource);
-
- managementService.stop();
+
+ assertFalse(ManagementHelper.hasOperationSucceeded(reply));
+ assertNotNull(ManagementHelper.getOperationExceptionMessage(reply));
+ server.stop();
}
-
// Package protected ---------------------------------------------
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
-
- Set set = mbeanServer.queryNames(ObjectName.getInstance(ObjectNames.DOMAIN + ":*"), null);
-
- for (Object objectName : set)
- {
- mbeanServer.unregisterMBean((ObjectName)objectName);
- }
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
-
- Set set = mbeanServer.queryMBeans(ObjectName.getInstance(ObjectNames.DOMAIN + ":*"), null);
-
- for (Object obj : set)
- {
- log.info("mbean:" + set);
- }
-
- assertEquals(0, mbeanServer.queryMBeans(ObjectName.getInstance(ObjectNames.DOMAIN + ":*"), null).size());
-
- super.tearDown();
- }*/
-
// Protected -----------------------------------------------------
// Private -------------------------------------------------------
More information about the jboss-cvs-commits
mailing list