[jboss-cvs] JBoss Messaging SVN: r4772 - in branches/Branch_JBMESSAGING-1303: src/main/org/jboss/messaging/core/config and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 5 08:01:40 EDT 2008
Author: jmesnil
Date: 2008-08-05 08:01:40 -0400 (Tue, 05 Aug 2008)
New Revision: 4772
Modified:
branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml
branches/Branch_JBMESSAGING-1303/src/config/jbm-configuration.xml
branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/Configuration.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java
branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java
branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java
Log:
JBMESSAGING-1303: Revisit management interfaces
* added configuration property management-enabled to enable/disable management
Modified: branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml 2008-08-05 12:01:40 UTC (rev 4772)
@@ -118,6 +118,9 @@
<parameter>
<inject bean="MBeanServer"/>
</parameter>
+ <parameter>
+ <inject bean="Configuration" property="managementEnabled" />
+ </parameter>
</constructor>
</bean>
@@ -126,6 +129,9 @@
<parameter>
<inject bean="MBeanServer"/>
</parameter>
+ <parameter>
+ <inject bean="Configuration" property="managementEnabled" />
+ </parameter>
</constructor>
</bean>
Modified: branches/Branch_JBMESSAGING-1303/src/config/jbm-configuration.xml
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/config/jbm-configuration.xml 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/config/jbm-configuration.xml 2008-08-05 12:01:40 UTC (rev 4772)
@@ -15,6 +15,8 @@
<security-invalidation-interval>10000</security-invalidation-interval>
+ <management-enabled>true</management-enabled>
+
<!-- Remoting configuration -->
<!-- one of: TCP, INVM -->
Modified: branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml 2008-08-05 12:01:40 UTC (rev 4772)
@@ -138,6 +138,9 @@
<parameter>
<inject bean="MBeanServer"/>
</parameter>
+ <parameter>
+ <inject bean="Configuration" property="managementEnabled" />
+ </parameter>
</constructor>
</bean>
@@ -146,6 +149,9 @@
<parameter>
<inject bean="MBeanServer"/>
</parameter>
+ <parameter>
+ <inject bean="Configuration" property="managementEnabled" />
+ </parameter>
</constructor>
</bean>
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/Configuration.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/Configuration.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -67,6 +67,10 @@
void setRequireDestinations(boolean require);
+ boolean isManagementEnabled();
+
+ void setManagementEnabled(boolean enabled);
+
// Remoting related attributes ----------------------------------------------------------
int getServerID();
@@ -158,4 +162,5 @@
boolean isCreateJournalDir();
void setCreateJournalDir(boolean create);
+
}
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -61,6 +61,8 @@
public static final boolean DEFAULT_SECURITY_ENABLED = true;
+ public static final boolean DEFAULT_MANAGEMENT_ENABLED = true;
+
public static final boolean DEFAULT_SSL_ENABLED = false;
public static final String DEFAULT_KEYSTORE_PATH = "messaging.keystore";
@@ -116,6 +118,7 @@
protected boolean securityEnabled = DEFAULT_SECURITY_ENABLED;
+ protected boolean managementEnabled = DEFAULT_MANAGEMENT_ENABLED;
// Journal related attributes
@@ -166,7 +169,6 @@
protected String trustStorePassword = DEFAULT_TRUSTSTORE_PASSWORD;
-
public List<String> getInterceptorClassNames()
{
return interceptorClassNames;
@@ -461,6 +463,16 @@
this.securityEnabled = enabled;
}
+ public boolean isManagementEnabled()
+ {
+ return managementEnabled ;
+ }
+
+ public void setManagementEnabled(boolean enabled)
+ {
+ this.managementEnabled = enabled;
+ }
+
public ConnectionParams getConnectionParams()
{
return this.defaultConnectionParams;
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -77,6 +77,8 @@
securityEnabled = getBoolean(e, "security-enabled", securityEnabled);
+ managementEnabled = getBoolean(e, "management-enabled", managementEnabled);
+
securityInvalidationInterval = getLong(e, "security-invalidation-interval", securityInvalidationInterval);
transport = TransportType.valueOf(getString(e, "remoting-transport", TransportType.TCP.toString()));
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -57,6 +57,7 @@
private MessagingServerManagement server;
private PostOffice postOffice;
private HierarchicalRepository<QueueSettings> queueSettingsRepository;
+ private boolean managementEnabled;
// Static --------------------------------------------------------
@@ -82,9 +83,11 @@
// Constructors --------------------------------------------------
- public ManagementServiceImpl(final MBeanServer mbeanServer)
+ public ManagementServiceImpl(final MBeanServer mbeanServer,
+ final boolean managementEnabled)
{
this.mbeanServer = mbeanServer;
+ this.managementEnabled = managementEnabled;
}
// Public --------------------------------------------------------
@@ -105,7 +108,11 @@
public void registerServer(final MessagingServerManagement server)
throws Exception
{
- //unregisterServer();
+ if (!managementEnabled)
+ {
+ return;
+ }
+ // unregisterServer();
ObjectName objectName = getMessagingServerObjectName();
MessagingServerControl managedServer = new MessagingServerControl(server,
server.getConfiguration());
@@ -116,6 +123,10 @@
public void unregisterServer() throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
ObjectName objectName = getMessagingServerObjectName();
if (mbeanServer.isRegistered(objectName))
{
@@ -126,6 +137,10 @@
public void registerAddress(final SimpleString address) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
unregisterAddress(address);
ObjectName objectName = getAddressObjectName(address);
AddressControlMBean addressControl = new AddressControl(address, server);
@@ -138,6 +153,10 @@
public void unregisterAddress(final SimpleString address) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
ObjectName objectName = getAddressObjectName(address);
if (mbeanServer.isRegistered(objectName))
{
@@ -148,6 +167,10 @@
public void registerQueue(final Queue queue, final SimpleString address,
final StorageManager storageManager) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
unregisterQueue(queue.getName(), address);
ObjectName objectName = getQueueObjectName(address, queue.getName());
QueueControlMBean queueControl = new QueueControl(queue, storageManager,
@@ -162,6 +185,10 @@
public void unregisterQueue(final SimpleString name,
final SimpleString address) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
ObjectName objectName = getQueueObjectName(address, name);
if (mbeanServer.isRegistered(objectName))
{
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -37,6 +37,7 @@
import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.management.MessagingServerManagement;
import org.jboss.messaging.core.management.impl.MessagingServerManagementImpl;
+import org.jboss.messaging.core.management.impl.NullManagementService;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.postoffice.impl.PostOfficeImpl;
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -22,7 +22,6 @@
package org.jboss.messaging.jms.server.impl;
-import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -35,7 +34,6 @@
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.MessagingServerManagement;
-import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.jms.JBossDestination;
import org.jboss.messaging.jms.JBossQueue;
@@ -43,7 +41,6 @@
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.jms.server.management.JMSManagementService;
-import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
import org.jboss.messaging.util.JNDIUtil;
/**
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementServiceImpl.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -49,7 +49,8 @@
// Attributes ----------------------------------------------------
- public MBeanServer mbeanServer;
+ public final MBeanServer mbeanServer;
+ private final boolean managementEnabled;
// Static --------------------------------------------------------
@@ -82,9 +83,11 @@
// Constructors --------------------------------------------------
- public JMSManagementServiceImpl(final MBeanServer mbeanServer)
+ public JMSManagementServiceImpl(final MBeanServer mbeanServer,
+ final boolean managementEnabled)
{
this.mbeanServer = mbeanServer;
+ this.managementEnabled = managementEnabled;
}
// Public --------------------------------------------------------
@@ -94,6 +97,10 @@
public void registerJMSServer(final JMSServerManager server)
throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
ObjectName objectName = getJMSServerObjectName();
if (mbeanServer.isRegistered(objectName))
{
@@ -112,6 +119,10 @@
final String jndiBinding, final JMSServerManager server)
throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
ObjectName objectName = getJMSQueueObjectName(queue.getQueueName());
if (mbeanServer.isRegistered(objectName))
{
@@ -123,6 +134,10 @@
public void unregisterQueue(final String name) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
mbeanServer.unregisterMBean(getJMSQueueObjectName(name));
}
@@ -130,6 +145,10 @@
final MessagingServerManagement serverManagement,
final String jndiBinding) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
ObjectName objectName = getJMSTopicObjectName(topic.getTopicName());
if (mbeanServer.isRegistered(objectName))
{
@@ -141,6 +160,10 @@
public void unregisterTopic(final String name) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
mbeanServer.unregisterMBean(getJMSTopicObjectName(name));
}
@@ -148,6 +171,10 @@
final JBossConnectionFactory connectionFactory,
final List<String> bindings) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
ObjectName objectName = getConnectionFactoryObjectName(name);
mbeanServer.registerMBean(new ConnectionFactoryControl(connectionFactory,
connectionFactory.getCoreConnection(), name, bindings), objectName);
@@ -155,6 +182,10 @@
public void unregisterConnectionFactory(final String name) throws Exception
{
+ if (!managementEnabled)
+ {
+ return;
+ }
ObjectName objectName = getConnectionFactoryObjectName(name);
mbeanServer.unregisterMBean(objectName);
}
Modified: branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -61,8 +61,7 @@
messagingService = MessagingServiceImpl.newNullStorageMessagingServer(conf);
messagingService.start();
jmsServerManager = new JMSServerManagerImpl(messagingService.getServer()
- .getServerManagement(), new JMSManagementServiceImpl(
- ManagementFactory.getPlatformMBeanServer()));
+ .getServerManagement(), new JMSManagementServiceImpl(ManagementFactory.getPlatformMBeanServer(), false));
Hashtable env = new Hashtable();
env.put("java.naming.factory.initial",
"org.jboss.messaging.tests.util.InVMSingleInitialContextFactory");
Modified: branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java 2008-08-05 08:46:31 UTC (rev 4771)
+++ branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/management/impl/ManagementServiceImplTest.java 2008-08-05 12:01:40 UTC (rev 4772)
@@ -86,7 +86,7 @@
replay(mbeanServer, server);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.registerServer(server);
verify(mbeanServer, server);
@@ -111,7 +111,7 @@
replay(mbeanServer, server);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.registerServer(server);
verify(mbeanServer, server);
@@ -128,7 +128,7 @@
replay(mbeanServer);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.unregisterServer();
verify(mbeanServer);
@@ -150,7 +150,7 @@
replay(mbeanServer);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.registerAddress(address);
verify(mbeanServer);
@@ -173,7 +173,7 @@
replay(mbeanServer);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.registerAddress(address);
verify(mbeanServer);
@@ -191,7 +191,7 @@
replay(mbeanServer);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.unregisterAddress(address);
verify(mbeanServer);
@@ -217,7 +217,7 @@
replay(mbeanServer, queue, storageManager);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.registerQueue(queue, address, storageManager);
verify(mbeanServer, queue, storageManager);
@@ -244,7 +244,7 @@
replay(mbeanServer, queue, storageManager);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.registerQueue(queue, address, storageManager);
verify(mbeanServer, queue, storageManager);
@@ -263,7 +263,7 @@
replay(mbeanServer);
- ManagementService service = new ManagementServiceImpl(mbeanServer);
+ ManagementService service = new ManagementServiceImpl(mbeanServer, true);
service.unregisterQueue(name, address);
verify(mbeanServer);
More information about the jboss-cvs-commits
mailing list