You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2007/04/20 02:33:09 UTC

svn commit: r530592 - /geronimo/server/trunk/modules/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java

Author: akulshreshtha
Date: Thu Apr 19 17:33:07 2007
New Revision: 530592

URL: http://svn.apache.org/viewvc?view=rev&rev=530592
Log:
GERONIMO-3011 Do not allow creation of ConnectorServer by activemq broker

Modified:
    geronimo/server/trunk/modules/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java

Modified: geronimo/server/trunk/modules/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java?view=diff&rev=530592&r1=530591&r2=530592
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java Thu Apr 19 17:33:07 2007
@@ -27,6 +27,7 @@
 
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.jmx.ManagementContext;
 import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
 import org.apache.activemq.transport.TransportDisposedIOException;
 import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
@@ -83,6 +84,11 @@
                     }
                 }
             }
+            
+            // Do not allow creation of another ConnectorServer
+            ManagementContext mgmtctx = new ManagementContext();
+            mgmtctx.setCreateConnector(false);
+            brokerService.setManagementContext(mgmtctx);
 
             // Do not allow the broker to use a shutown hook, the kernel will stop it
             brokerService.setUseShutdownHook(isUseShutdownHook());