Author: timfox Date: 2010-01-05 12:00:38 -0500 (Tue, 05 Jan 2010) New Revision: 8717 Added: trunk/src/main/org/hornetq/api/core/server/HornetQServers.java Removed: trunk/src/main/org/hornetq/api/core/server/HornetQ.java Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java trunk/tests/src/org/hornetq/tests/opt/SendTest.java trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java Log: renamed HornetQ to HornetQServers Modified: trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java =================================================================== --- trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -52,7 +52,7 @@ configuration.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); // Step 2. Create and start the server - HornetQServer server = HornetQ.newHornetQServer(configuration); + HornetQServer server = HornetQServers.newHornetQServer(configuration); server.start(); // Step 3. As we are not using a JNDI environment we instantiate the objects directly Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java =================================================================== --- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -18,7 +18,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; @@ -59,7 +59,7 @@ configuration.setAcceptorConfigurations(setTransp); // Step 3. Create and start the server - HornetQServer server = HornetQ.newHornetQServer(configuration); + HornetQServer server = HornetQServers.newHornetQServer(configuration); server.start(); System.out.println("STARTED::"); } Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java =================================================================== --- trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -28,7 +28,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.config.ConnectionFactoryConfiguration; import org.hornetq.api.jms.config.ConnectionFactoryConfigurationImpl; import org.hornetq.api.jms.config.JMSConfiguration; @@ -65,7 +65,7 @@ .add(new TransportConfiguration(NettyAcceptorFactory.class.getName())); // Step 2. Create HornetQ core server - HornetQServer hornetqServer = HornetQ.newHornetQServer(configuration); + HornetQServer hornetqServer = HornetQServers.newHornetQServer(configuration); // Step 3. Create and start the JNDI server System.setProperty("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); Deleted: trunk/src/main/org/hornetq/api/core/server/HornetQ.java =================================================================== --- trunk/src/main/org/hornetq/api/core/server/HornetQ.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/src/main/org/hornetq/api/core/server/HornetQ.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -1,94 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.core.server; - -import java.lang.management.ManagementFactory; - -import javax.management.MBeanServer; - -import org.hornetq.api.core.config.Configuration; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.spi.core.security.HornetQSecurityManager; -import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; - -/** - * A HornetQ - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 24 Jan 2009 15:17:18 - * - * - */ -public class HornetQ -{ - private static final Logger log = Logger.getLogger(HornetQ.class); - - public static HornetQServer newHornetQServer(final Configuration config, final boolean enablePersistence) - { - HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl(); - - HornetQServer server = HornetQ.newHornetQServer(config, - ManagementFactory.getPlatformMBeanServer(), - securityManager, - enablePersistence); - - return server; - } - - public static HornetQServer newHornetQServer(final Configuration config) - { - return HornetQ.newHornetQServer(config, config.isPersistenceEnabled()); - } - - public static HornetQServer newHornetQServer(final Configuration config, - final MBeanServer mbeanServer, - final boolean enablePersistence) - { - HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl(); - - HornetQServer server = HornetQ.newHornetQServer(config, mbeanServer, securityManager, enablePersistence); - - return server; - } - - public static HornetQServer newHornetQServer(final Configuration config, final MBeanServer mbeanServer) - { - return HornetQ.newHornetQServer(config, mbeanServer, true); - } - - public static HornetQServer newHornetQServer(final Configuration config, - final MBeanServer mbeanServer, - final HornetQSecurityManager securityManager) - { - HornetQServer server = HornetQ.newHornetQServer(config, mbeanServer, securityManager, true); - - return server; - } - - public static HornetQServer newHornetQServer(final Configuration config, - final MBeanServer mbeanServer, - final HornetQSecurityManager securityManager, - final boolean enablePersistence) - { - config.setPersistenceEnabled(enablePersistence); - - HornetQServer server = new HornetQServerImpl(config, mbeanServer, securityManager); - - return server; - } - -} Copied: trunk/src/main/org/hornetq/api/core/server/HornetQServers.java (from rev 8716, trunk/src/main/org/hornetq/api/core/server/HornetQ.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/server/HornetQServers.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/server/HornetQServers.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -0,0 +1,97 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.api.core.server; + +import java.lang.management.ManagementFactory; + +import javax.management.MBeanServer; + +import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.impl.HornetQServerImpl; +import org.hornetq.spi.core.security.HornetQSecurityManager; +import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; + +/** + * HornetQServers is a factory class for instantiating HornetQServer instances. + * + * This class should be used when you want to instantiate a HornetQServer instance for embedding in + * your own application, as opposed to directly instantiating an implementing instance. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 24 Jan 2009 15:17:18 + * + * + */ +public class HornetQServers +{ + private static final Logger log = Logger.getLogger(HornetQServers.class); + + public static HornetQServer newHornetQServer(final Configuration config, final boolean enablePersistence) + { + HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl(); + + HornetQServer server = HornetQServers.newHornetQServer(config, + ManagementFactory.getPlatformMBeanServer(), + securityManager, + enablePersistence); + + return server; + } + + public static HornetQServer newHornetQServer(final Configuration config) + { + return HornetQServers.newHornetQServer(config, config.isPersistenceEnabled()); + } + + public static HornetQServer newHornetQServer(final Configuration config, + final MBeanServer mbeanServer, + final boolean enablePersistence) + { + HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl(); + + HornetQServer server = HornetQServers.newHornetQServer(config, mbeanServer, securityManager, enablePersistence); + + return server; + } + + public static HornetQServer newHornetQServer(final Configuration config, final MBeanServer mbeanServer) + { + return HornetQServers.newHornetQServer(config, mbeanServer, true); + } + + public static HornetQServer newHornetQServer(final Configuration config, + final MBeanServer mbeanServer, + final HornetQSecurityManager securityManager) + { + HornetQServer server = HornetQServers.newHornetQServer(config, mbeanServer, securityManager, true); + + return server; + } + + public static HornetQServer newHornetQServer(final Configuration config, + final MBeanServer mbeanServer, + final HornetQSecurityManager securityManager, + final boolean enablePersistence) + { + config.setPersistenceEnabled(enablePersistence); + + HornetQServer server = new HornetQServerImpl(config, mbeanServer, securityManager); + + return server; + } + +} Modified: trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -22,7 +22,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.server.JMSServerManager; import org.hornetq.api.jms.server.JMSServerManagerImpl; import org.hornetq.core.server.HornetQServer; @@ -69,7 +69,7 @@ conf.setFileDeploymentEnabled(false); // disable server persistence since JORAM tests do not restart server - final HornetQServer server = HornetQ.newHornetQServer(conf, false); + final HornetQServer server = HornetQServers.newHornetQServer(conf, false); Hashtable<String, String> env = new Hashtable<String, String>(); env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory"); Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -27,7 +27,7 @@ import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; @@ -869,7 +869,7 @@ conf.setIDCacheSize(cacheSize); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -907,7 +907,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -952,7 +952,7 @@ conf.setIDCacheSize(theCacheSize); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -986,7 +986,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1030,7 +1030,7 @@ conf.setIDCacheSize(initialCacheSize); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1066,7 +1066,7 @@ conf.setIDCacheSize(subsequentCacheSize); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1119,7 +1119,7 @@ conf.setIDCacheSize(initialCacheSize); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1155,7 +1155,7 @@ conf.setIDCacheSize(subsequentCacheSize); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1165,7 +1165,7 @@ conf.setIDCacheSize(initialCacheSize); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1217,7 +1217,7 @@ conf.setPersistIDCache(false); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1255,7 +1255,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1300,7 +1300,7 @@ conf.setPersistIDCache(false); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1340,7 +1340,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1385,7 +1385,7 @@ conf.setIDCacheSize(cacheSize); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1429,7 +1429,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1476,7 +1476,7 @@ conf.setPersistIDCache(false); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1518,7 +1518,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1575,7 +1575,7 @@ conf.setIDCacheSize(cacheSize); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1615,7 +1615,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1672,7 +1672,7 @@ conf.setIDCacheSize(cacheSize); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1714,7 +1714,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1771,7 +1771,7 @@ conf.setIDCacheSize(cacheSize); - HornetQServer messagingService2 = HornetQ.newHornetQServer(conf); + HornetQServer messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1812,7 +1812,7 @@ messagingService2.stop(); - messagingService2 = HornetQ.newHornetQServer(conf); + messagingService2 = HornetQServers.newHornetQServer(conf); messagingService2.start(); @@ -1872,7 +1872,7 @@ conf.setIDCacheSize(cacheSize); - messagingService = HornetQ.newHornetQServer(conf, false); + messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -25,7 +25,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -208,7 +208,7 @@ Configuration config = new ConfigurationImpl(); config.setSecurityEnabled(false); config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(config, false); + server = HornetQServers.newHornetQServer(config, false); server.start(); sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -26,7 +26,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -156,7 +156,7 @@ Configuration config = new ConfigurationImpl(); config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())); config.setSecurityEnabled(false); - server = HornetQ.newHornetQServer(config, false); + server = HornetQServers.newHornetQServer(config, false); server.start(); address = RandomUtil.randomSimpleString(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -26,7 +26,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.jms.client.HornetQTextMessage; @@ -68,7 +68,7 @@ conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactoryClassName)); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -27,7 +27,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; @@ -371,7 +371,7 @@ configuration.setSecurityEnabled(false); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); // start the server server.start(); // then we create a client as normal Modified: trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; @@ -322,7 +322,7 @@ configuration.setSecurityEnabled(false); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); // start the server server.start(); // then we create a client as normal Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -21,7 +21,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.server.JMSServerManagerImpl; import org.hornetq.core.client.impl.ClientSessionInternal; @@ -61,7 +61,7 @@ conf.setSecurityEnabled(false); conf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - server = HornetQ.newHornetQServer(conf, false); + server = HornetQServers.newHornetQServer(conf, false); jmsServer = new JMSServerManagerImpl(server); jmsServer.setContext(new NullInitialContext()); jmsServer.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -15,7 +15,7 @@ import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; @@ -44,7 +44,7 @@ configuration.setSecurityEnabled(false); configuration.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(configuration); + server = HornetQServers.newHornetQServer(configuration); server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -29,7 +29,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.UnitTestCase; @@ -174,7 +174,7 @@ configuration.setSecurityEnabled(false); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); // start the server server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -32,7 +32,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; @@ -634,7 +634,7 @@ configuration.setSecurityEnabled(false); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); // start the server server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -25,7 +25,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -204,7 +204,7 @@ Configuration config = new ConfigurationImpl(); config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())); config.setSecurityEnabled(false); - server = HornetQ.newHornetQServer(config, false); + server = HornetQServers.newHornetQServer(config, false); server.start(); sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.UnitTestCase; @@ -72,7 +72,7 @@ configuration.setSecurityEnabled(false); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); // start the server server.start(); // then we create a client as normal Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -22,7 +22,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -81,7 +81,7 @@ Configuration config = new ConfigurationImpl(); config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())); config.setSecurityEnabled(false); - server = HornetQ.newHornetQServer(config, false); + server = HornetQServers.newHornetQServer(config, false); server.start(); sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -23,7 +23,7 @@ import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; @@ -49,7 +49,7 @@ super.setUp(); Configuration config = createDefaultConfig(false); - server = HornetQ.newHornetQServer(config, false); + server = HornetQServers.newHornetQServer(config, false); server.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -28,7 +28,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -225,7 +225,7 @@ Configuration conf = new ConfigurationImpl(); conf.setSecurityEnabled(false); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - service = HornetQ.newHornetQServer(conf, false); + service = HornetQServers.newHornetQServer(conf, false); service.start(); sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -28,7 +28,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -252,7 +252,7 @@ Configuration config = new ConfigurationImpl(); config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())); config.setSecurityEnabled(false); - server = HornetQ.newHornetQServer(config, false); + server = HornetQServers.newHornetQServer(config, false); server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; @@ -119,7 +119,7 @@ Configuration config = new ConfigurationImpl(); config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())); config.setSecurityEnabled(false); - server = HornetQ.newHornetQServer(config, false); + server = HornetQServers.newHornetQServer(config, false); server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -32,7 +32,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; @@ -866,7 +866,7 @@ backupConf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory", backupParams)); backupConf.setBackup(true); - backupService = HornetQ.newHornetQServer(backupConf, false); + backupService = HornetQServers.newHornetQServer(backupConf, false); backupService.start(); Configuration liveConf = new ConfigurationImpl(); @@ -904,7 +904,7 @@ bcConfigs1.add(bcConfig1); liveConf.setBroadcastGroupConfigurations(bcConfigs1); - liveService = HornetQ.newHornetQServer(liveConf, false); + liveService = HornetQServers.newHornetQServer(liveConf, false); liveService.start(); } } Modified: trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.UnitTestCase; @@ -763,7 +763,7 @@ configuration.setTransactionTimeoutScanPeriod(500); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); // start the server server.start(); server.getManagementService().enableNotifications(false); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -19,7 +19,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; @@ -110,7 +110,7 @@ serviceConf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory", params)); } - HornetQServer service = HornetQ.newHornetQServer(serviceConf, true); + HornetQServer service = HornetQServers.newHornetQServer(serviceConf, true); servers.add(service); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -38,7 +38,7 @@ import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.postoffice.Binding; @@ -1280,11 +1280,11 @@ if (fileStorage) { - server = HornetQ.newHornetQServer(configuration); + server = HornetQServers.newHornetQServer(configuration); } else { - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); } servers[node] = server; } @@ -1413,11 +1413,11 @@ if (fileStorage) { - server = HornetQ.newHornetQServer(configuration); + server = HornetQServers.newHornetQServer(configuration); } else { - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); } servers[node] = server; } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -17,7 +17,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.JournalType; @@ -75,11 +75,11 @@ if (fileStorage) { - server = HornetQ.newHornetQServer(configuration); + server = HornetQServers.newHornetQServer(configuration); } else { - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); } servers[node] = server; } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -17,7 +17,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.JournalType; import org.hornetq.tests.util.ServiceTestBase; @@ -72,11 +72,11 @@ if (fileStorage) { - server = HornetQ.newHornetQServer(configuration); + server = HornetQServers.newHornetQServer(configuration); } else { - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); } servers[node] = server; } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -17,7 +17,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; /** @@ -39,7 +39,7 @@ liveConf.setSecurityEnabled(false); liveConf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - liveServer = HornetQ.newHornetQServer(liveConf, false); + liveServer = HornetQServers.newHornetQServer(liveConf, false); liveServer.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -17,7 +17,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; /** @@ -40,7 +40,7 @@ liveConf.getAcceptorConfigurations().clear(); liveConf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyAcceptorFactory")); - liveServer = HornetQ.newHornetQServer(liveConf, false); + liveServer = HornetQServers.newHornetQServer(liveConf, false); liveServer.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -34,7 +34,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMRegistry; @@ -1449,7 +1449,7 @@ liveConf.setSecurityEnabled(false); liveConf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - liveService = HornetQ.newHornetQServer(liveConf, false); + liveService = HornetQServers.newHornetQServer(liveConf, false); liveService.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -28,7 +28,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; @@ -72,7 +72,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -166,7 +166,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -298,7 +298,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -373,7 +373,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -490,7 +490,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -642,7 +642,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -783,7 +783,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -916,7 +916,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -1100,7 +1100,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); @@ -1260,7 +1260,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf, false); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf, false); messagingService.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -28,7 +28,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; @@ -105,7 +105,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf); messagingService.start(); @@ -308,7 +308,7 @@ conf.setDivertConfigurations(divertConfs); - HornetQServer messagingService = HornetQ.newHornetQServer(conf); + HornetQServer messagingService = HornetQServers.newHornetQServer(conf); messagingService.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -26,7 +26,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.jms.client.HornetQTextMessage; @@ -49,7 +49,7 @@ params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); conf.getAcceptorConfigurations().add(new TransportConfiguration(UnitTestCase.NETTY_ACCEPTOR_FACTORY, params)); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); @@ -105,7 +105,7 @@ params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); conf.getAcceptorConfigurations().add(new TransportConfiguration(UnitTestCase.NETTY_ACCEPTOR_FACTORY, params)); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -29,7 +29,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQTopic; import org.hornetq.api.jms.server.JMSServerManagerImpl; import org.hornetq.core.logging.Logger; @@ -84,7 +84,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, false); + server = HornetQServers.newHornetQServer(conf, false); server.start(); serverManager = new JMSServerManagerImpl(server); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -30,7 +30,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; @@ -899,7 +899,7 @@ .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory", backupParams)); backupConf.setBackup(true); backupConf.setSharedStore(true); - backupService = HornetQ.newHornetQServer(backupConf, false); + backupService = HornetQServers.newHornetQServer(backupConf, false); backupService.start(); Configuration liveConf = new ConfigurationImpl(); @@ -937,7 +937,7 @@ bcConfigs1.add(bcConfig1); liveConf.setBroadcastGroupConfigurations(bcConfigs1); - liveService = HornetQ.newHornetQServer(liveConf, false); + liveService = HornetQServers.newHornetQServer(liveConf, false); liveService.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -35,7 +35,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.config.ConnectionFactoryConfiguration; import org.hornetq.api.jms.config.ConnectionFactoryConfigurationImpl; import org.hornetq.api.jms.config.JMSConfiguration; @@ -159,7 +159,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName())); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); JMSConfiguration configuration = new JMSConfigurationImpl(); context = new InVMContext(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -38,7 +38,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.bridge.ConnectionFactoryFactory; import org.hornetq.api.jms.bridge.DestinationFactory; @@ -104,7 +104,7 @@ conf0.setSecurityEnabled(false); conf0.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - server0 = HornetQ.newHornetQServer(conf0, false); + server0 = HornetQServers.newHornetQServer(conf0, false); context0 = new InVMContext(); jmsServer0 = new JMSServerManagerImpl(server0); @@ -118,7 +118,7 @@ conf1.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory", params1)); - server1 = HornetQ.newHornetQServer(conf1, false); + server1 = HornetQServers.newHornetQServer(conf1, false); context1 = new InVMContext(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -35,7 +35,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.core.client.impl.ClientSessionInternal; @@ -269,7 +269,7 @@ backupConf.setJournalDirectory(getJournalDir()); backupConf.setPagingDirectory(getPageDir()); backupConf.setLargeMessagesDirectory(getLargeMessagesDir()); - backupService = HornetQ.newHornetQServer(backupConf, true); + backupService = HornetQServers.newHornetQServer(backupConf, true); backupService.start(); Configuration liveConf = new ConfigurationImpl(); @@ -283,7 +283,7 @@ liveConf.setPagingDirectory(getPageDir()); liveConf.setLargeMessagesDirectory(getLargeMessagesDir()); - liveService = HornetQ.newHornetQServer(liveConf, true); + liveService = HornetQServers.newHornetQServer(liveConf, true); liveService.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -34,7 +34,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.HornetQTopic; @@ -338,7 +338,7 @@ liveConf.setPagingDirectory(getPageDir()); liveConf.setLargeMessagesDirectory(getLargeMessagesDir()); - liveService = HornetQ.newHornetQServer(liveConf, true); + liveService = HornetQServers.newHornetQServer(liveConf, true); liveService.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -26,7 +26,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.server.JMSServerManagerImpl; import org.hornetq.core.client.impl.ClientSessionInternal; @@ -64,7 +64,7 @@ conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - server = HornetQ.newHornetQServer(conf, false); + server = HornetQServers.newHornetQServer(conf, false); jmsServer = new JMSServerManagerImpl(server); jmsServer.setContext(new NullInitialContext()); jmsServer.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -31,7 +31,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; @@ -822,7 +822,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); serverManager = new JMSServerManagerImpl(server); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -27,7 +27,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.api.jms.server.JMSServerManagerImpl; import org.hornetq.core.logging.Logger; @@ -76,7 +76,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactory)); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); context = new InVMContext(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -28,7 +28,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.api.jms.server.JMSServerManager; import org.hornetq.api.jms.server.JMSServerManagerImpl; @@ -635,7 +635,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); context = new InVMContext(); serverManager = new JMSServerManagerImpl(server); @@ -704,7 +704,7 @@ "231.7.7.7", discoveryPort, ConfigurationImpl.DEFAULT_BROADCAST_REFRESH_TIMEOUT)); - HornetQServer server = HornetQ.newHornetQServer(conf, mbeanServer, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, mbeanServer, false); context = new InVMContext(); JMSServerManagerImpl serverManager = new JMSServerManagerImpl(server); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQTopic; import org.hornetq.api.jms.management.SubscriptionInfo; import org.hornetq.api.jms.management.TopicControl; @@ -414,7 +414,7 @@ conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); serverManager = new JMSServerManagerImpl(server); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -25,7 +25,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.HornetQTopic; @@ -338,7 +338,7 @@ conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); serverManager = new JMSServerManagerImpl(server); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -26,7 +26,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.NotificationType; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -71,7 +71,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(acceptorConfig); - service = HornetQ.newHornetQServer(conf, mbeanServer, false); + service = HornetQServers.newHornetQServer(conf, mbeanServer, false); service.start(); AcceptorControl acceptorControl = createManagementControl(acceptorConfig.getName()); @@ -89,7 +89,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(acceptorConfig); - service = HornetQ.newHornetQServer(conf, mbeanServer, false); + service = HornetQServers.newHornetQServer(conf, mbeanServer, false); service.start(); AcceptorControl acceptorControl = createManagementControl(acceptorConfig.getName()); @@ -146,7 +146,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(acceptorConfig); - service = HornetQ.newHornetQServer(conf, mbeanServer, false); + service = HornetQServers.newHornetQServer(conf, mbeanServer, false); service.start(); AcceptorControl acceptorControl = createManagementControl(acceptorConfig.getName()); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -29,7 +29,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.RoleInfo; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.security.CheckType; @@ -423,7 +423,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -27,7 +27,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.security.CheckType; @@ -311,7 +311,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -32,7 +32,7 @@ import org.hornetq.api.core.management.BridgeControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; @@ -190,10 +190,10 @@ conf_0.getQueueConfigurations().add(sourceQueueConfig); conf_0.getBridgeConfigurations().add(bridgeConfig); - server_1 = HornetQ.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false); + server_1 = HornetQServers.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false); server_1.start(); - server_0 = HornetQ.newHornetQServer(conf_0, mbeanServer, false); + server_0 = HornetQServers.newHornetQServer(conf_0, mbeanServer, false); server_0.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -31,7 +31,7 @@ import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; @@ -168,10 +168,10 @@ conf_0.getQueueConfigurations().add(sourceQueueConfig); conf_0.getBridgeConfigurations().add(bridgeConfig); - server_1 = HornetQ.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false); + server_1 = HornetQServers.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false); server_1.start(); - server_0 = HornetQ.newHornetQServer(conf_0, mbeanServer, false); + server_0 = HornetQServers.newHornetQServer(conf_0, mbeanServer, false); server_0.start(); ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; import org.hornetq.api.core.management.BroadcastGroupControl; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyConnectorFactory; @@ -86,7 +86,7 @@ conf.getConnectorConfigurations().put(connectorConfiguration.getName(), connectorConfiguration); conf.getBroadcastGroupConfigurations().add(broadcastGroupConfig); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - service = HornetQ.newHornetQServer(conf, mbeanServer, false); + service = HornetQServers.newHornetQServer(conf, mbeanServer, false); service.start(); BroadcastGroupControl broadcastGroupControl = createManagementControl(broadcastGroupConfig.getName()); @@ -128,7 +128,7 @@ conf.getConnectorConfigurations().put(connectorConfiguration.getName(), connectorConfiguration); conf.getBroadcastGroupConfigurations().add(broadcastGroupConfig); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - service = HornetQ.newHornetQServer(conf, mbeanServer, false); + service = HornetQServers.newHornetQServer(conf, mbeanServer, false); service.start(); BroadcastGroupControl broadcastGroupControl = createManagementControl(broadcastGroupConfig.getName()); Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -33,7 +33,7 @@ import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; @@ -173,9 +173,9 @@ conf_0.getBroadcastGroupConfigurations().add(broadcastGroupConfig); mbeanServer_1 = MBeanServerFactory.createMBeanServer(); - server_1 = HornetQ.newHornetQServer(conf_1, mbeanServer_1, false); + server_1 = HornetQServers.newHornetQServer(conf_1, mbeanServer_1, false); - server_0 = HornetQ.newHornetQServer(conf_0, mbeanServer, false); + server_0 = HornetQServers.newHornetQServer(conf_0, mbeanServer, false); server_0.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -33,7 +33,7 @@ import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; @@ -243,10 +243,10 @@ conf_0.getClusterConfigurations().add(clusterConnectionConfig2); mbeanServer_1 = MBeanServerFactory.createMBeanServer(); - server_1 = HornetQ.newHornetQServer(conf_1, mbeanServer_1, false); + server_1 = HornetQServers.newHornetQServer(conf_1, mbeanServer_1, false); server_1.start(); - server_0 = HornetQ.newHornetQServer(conf_0, mbeanServer, false); + server_0 = HornetQServers.newHornetQServer(conf_0, mbeanServer, false); server_0.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -20,7 +20,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; import org.hornetq.api.core.management.DiscoveryGroupControl; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; @@ -62,7 +62,7 @@ conf.setClustered(true); conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - service = HornetQ.newHornetQServer(conf, mbeanServer, false); + service = HornetQServers.newHornetQServer(conf, mbeanServer, false); service.start(); DiscoveryGroupControl discoveryGroupControl = createManagementControl(discoveryGroupConfig.getName()); @@ -86,7 +86,7 @@ conf.setClustered(true); conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - service = HornetQ.newHornetQServer(conf, mbeanServer, false); + service = HornetQServers.newHornetQServer(conf, mbeanServer, false); service.start(); DiscoveryGroupControl discoveryGroupControl = createManagementControl(discoveryGroupConfig.getName()); Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -23,7 +23,7 @@ import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.DivertControl; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -111,7 +111,7 @@ conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); conf.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig); - service = HornetQ.newHornetQServer(conf, mbeanServer, false); + service = HornetQServers.newHornetQServer(conf, mbeanServer, false); service.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -25,7 +25,7 @@ import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -411,7 +411,7 @@ conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); conf.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig); server.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -20,7 +20,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; @@ -60,8 +60,8 @@ config_1.setJMXDomain(jmxDomain_1); config_1.setJMXManagementEnabled(true); - HornetQServer server_0 = HornetQ.newHornetQServer(config_0, mbeanServer, false); - HornetQServer server_1 = HornetQ.newHornetQServer(config_1, mbeanServer, false); + HornetQServer server_0 = HornetQServers.newHornetQServer(config_0, mbeanServer, false); + HornetQServer server_1 = HornetQServers.newHornetQServer(config_1, mbeanServer, false); ObjectNameBuilder builder_0 = ObjectNameBuilder.DEFAULT; ObjectNameBuilder builder_1 = ObjectNameBuilder.create(jmxDomain_1); Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -22,7 +22,7 @@ import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.core.management.client.ManagementHelper; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; import org.hornetq.core.server.HornetQServer; @@ -62,7 +62,7 @@ Configuration conf = new ConfigurationImpl(); conf.setJMXManagementEnabled(false); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); // invoke attribute and operation on the server @@ -81,7 +81,7 @@ Configuration conf = new ConfigurationImpl(); conf.setJMXManagementEnabled(false); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); // invoke attribute and operation on the server @@ -100,7 +100,7 @@ Configuration conf = new ConfigurationImpl(); conf.setJMXManagementEnabled(false); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); // invoke attribute and operation on the server @@ -119,7 +119,7 @@ Configuration conf = new ConfigurationImpl(); conf.setJMXManagementEnabled(false); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); // invoke attribute and operation on the server Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -30,7 +30,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.client.ManagementHelper; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -216,7 +216,7 @@ // the notifications are independent of JMX conf.setJMXManagementEnabled(false); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - service = HornetQ.newHornetQServer(conf, false); + service = HornetQServers.newHornetQServer(conf, false); service.start(); ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -31,7 +31,7 @@ import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; @@ -1282,7 +1282,7 @@ conf.setSecurityEnabled(false); conf.setJMXManagementEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, mbeanServer, false); + server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -18,7 +18,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; @@ -88,7 +88,7 @@ Configuration conf = new ConfigurationImpl(); conf.setSecurityEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository(); HornetQSecurityManagerImpl securityManager = (HornetQSecurityManagerImpl)server.getSecurityManager(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -16,7 +16,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; @@ -65,7 +65,7 @@ Configuration conf = new ConfigurationImpl(); conf.setSecurityEnabled(true); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); return server; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -15,7 +15,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; @@ -72,7 +72,7 @@ conf.setSecurityEnabled(true); conf.setManagementClusterPassword(configuredClusterPassword); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); return server; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -32,7 +32,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.client.ManagementHelper; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.security.CheckType; @@ -145,7 +145,7 @@ // the notifications are independent of JMX conf.setJMXManagementEnabled(false); conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, false); + server = HornetQServers.newHornetQServer(conf, false); server.start(); notifQueue = RandomUtil.randomSimpleString(); Modified: trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -21,7 +21,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; @@ -75,7 +75,7 @@ ConfigurationImpl config = new ConfigurationImpl(); config.setSecurityEnabled(false); config.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName())); - messagingService = HornetQ.newHornetQServer(config, false); + messagingService = HornetQServers.newHornetQServer(config, false); messagingService.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -32,7 +32,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; @@ -256,7 +256,7 @@ configuration.setMessageExpiryScanPeriod(1000); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); // start the server server.start(); // then we create a client as normal Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; @@ -577,7 +577,7 @@ configuration.setSecurityEnabled(false); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); // start the server server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -29,7 +29,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Bindings; import org.hornetq.core.server.HornetQServer; @@ -75,7 +75,7 @@ conf.setQueueConfigurations(queueConfs); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); @@ -145,7 +145,7 @@ conf.setQueueConfigurations(queueConfs); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); @@ -213,7 +213,7 @@ final String queueName3 = "queue3"; - HornetQServer server = HornetQ.newHornetQServer(conf); + HornetQServer server = HornetQServers.newHornetQServer(conf); server.start(); @@ -326,7 +326,7 @@ conf.setQueueConfigurations(queueConfs); - HornetQServer server = HornetQ.newHornetQServer(conf); + HornetQServer server = HornetQServers.newHornetQServer(conf); server.start(); @@ -411,7 +411,7 @@ conf.setQueueConfigurations(queueConfs); - HornetQServer server = HornetQ.newHornetQServer(conf, false); + HornetQServer server = HornetQServers.newHornetQServer(conf, false); server.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -29,7 +29,7 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; @@ -139,7 +139,7 @@ Map<String, Object> params = new HashMap<String, Object>(); params.put(TransportConstants.SSL_ENABLED_PROP_NAME, true); config.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName(), params)); - server = HornetQ.newHornetQServer(config, false); + server = HornetQServers.newHornetQServer(config, false); server.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -35,7 +35,7 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; @@ -78,7 +78,7 @@ configuration.setTransactionTimeoutScanPeriod(500); TransportConfiguration transportConfig = new TransportConfiguration(UnitTestCase.INVM_ACCEPTOR_FACTORY); configuration.getAcceptorConfigurations().add(transportConfig); - messagingService = HornetQ.newHornetQServer(configuration, false); + messagingService = HornetQServers.newHornetQServer(configuration, false); // start the server messagingService.start(); // then we create a client as normal Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -31,7 +31,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.core.logging.Logger; @@ -114,7 +114,7 @@ configuration.getAcceptorConfigurations().add(transportConfig1); configuration.getAcceptorConfigurations().add(transportConfig2); - server = HornetQ.newHornetQServer(configuration); + server = HornetQServers.newHornetQServer(configuration); server.start(); Modified: trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -43,7 +43,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.bridge.ConnectionFactoryFactory; @@ -529,7 +529,7 @@ config.setSecurityEnabled(false); config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); InVMContext context = new InVMContext(); - jmsServer = new JMSServerManagerImpl(HornetQ.newHornetQServer(config, false)); + jmsServer = new JMSServerManagerImpl(HornetQServers.newHornetQServer(config, false)); jmsServer.setContext(context); jmsServer.start(); Modified: trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -25,7 +25,7 @@ import junit.framework.Assert; import org.hornetq.api.core.config.ConfigurationImpl; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.jms.client.HornetQConnectionMetaData; @@ -67,7 +67,7 @@ try { - HornetQServer server = HornetQ.newHornetQServer(new ConfigurationImpl()); + HornetQServer server = HornetQServers.newHornetQServer(new ConfigurationImpl()); ConnectionMetaData meta = new HornetQConnectionMetaData(server.getVersion()); Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -24,7 +24,7 @@ import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.server.JMSServerManagerImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; @@ -100,7 +100,7 @@ conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName())); - server = HornetQ.newHornetQServer(conf, usePersistence()); + server = HornetQServers.newHornetQServer(conf, usePersistence()); jmsServer = new JMSServerManagerImpl(server); context = new InVMContext(); Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-05 16:54:28 UTC (rev 8716) +++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-05 17:00:38 UTC (rev 8717) @@ -28,7 +28,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQ; +import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -94,11 +94,11 @@ if (realFiles) { - server = HornetQ.newHornetQServer(configuration); + server = HornetQServers.newHornetQServer(configuration); } else { - server = HornetQ.newHornetQServer(configuration, false); + server = HornetQServers.newHornetQServer(configuration, false); } for (Map.Entry<String, AddressSettings> setting : settings.entrySet()) @@ -124,11 +124,11 @@ if (realFiles) { - server = HornetQ.newHornetQServer(configuration, mbeanServer); + server = HornetQServers.newHornetQServer(configuration, mbeanServer); } else { - server = HornetQ.newHornetQServer(configuration, mbeanServer, false); + server = HornetQServers.newHornetQServer(configuration, mbeanServer, false); } for (Map.Entry<String, AddressSettings> setting : settings.entrySet()) @@ -165,11 +165,11 @@ if (realFiles) { - server = HornetQ.newHornetQServer(configuration, ManagementFactory.getPlatformMBeanServer(), securityManager); + server = HornetQServers.newHornetQServer(configuration, ManagementFactory.getPlatformMBeanServer(), securityManager); } else { - server = HornetQ.newHornetQServer(configuration, + server = HornetQServers.newHornetQServer(configuration, ManagementFactory.getPlatformMBeanServer(), securityManager, false);