[jboss-cvs] JBoss Messaging SVN: r5722 - in trunk: src/main/org/jboss/messaging/core/cluster/impl and 34 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 26 05:27:15 EST 2009
Author: timfox
Date: 2009-01-26 05:27:15 -0500 (Mon, 26 Jan 2009)
New Revision: 5722
Modified:
trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java
trunk/src/main/org/jboss/messaging/core/cluster/impl/DiscoveryGroupImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BroadcastGroupImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java
trunk/src/main/org/jboss/messaging/integration/bootstrap/JBMBootstrapServer.java
trunk/tests/src/org/jboss/messaging/tests/integration/DuplicateDetectionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/basic/AutoGroupClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/basic/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/consumer/TransactionDurabilityTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/divert/DivertTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/divert/PersistentDivertTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/http/CoreClientOverHttpTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSUtil.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementControlHelper.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryRunnerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/MessageGroupingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/PredefinedQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/wildcard/WildCardRoutingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java
trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/OperatorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/AddressControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapper2Test.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServiceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/transaction/impl/TransactionImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSMessageListenerWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/TopicControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java
trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
Log:
mainly moved messagingservice factory methods to Messaging class
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -30,8 +30,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.util.SimpleString;
/**
@@ -52,7 +52,7 @@
ConfigurationImpl configuration = new ConfigurationImpl();
configuration.setSecurityEnabled(false);
configuration.getAcceptorConfigurations().add(new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory"));
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(configuration);
+ messagingService = Messaging.newNullStorageMessagingService(configuration);
//start the server
messagingService.start();
Modified: trunk/src/main/org/jboss/messaging/core/cluster/impl/DiscoveryGroupImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/cluster/impl/DiscoveryGroupImpl.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/src/main/org/jboss/messaging/core/cluster/impl/DiscoveryGroupImpl.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -71,7 +71,7 @@
private final long timeout;
private volatile boolean started;
-
+
public DiscoveryGroupImpl(final String name, final InetAddress groupAddress, final int groupPort, final long timeout) throws Exception
{
this.name = name;
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BroadcastGroupImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BroadcastGroupImpl.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BroadcastGroupImpl.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -172,7 +172,7 @@
byte[] data = bos.toByteArray();
DatagramPacket packet = new DatagramPacket(data, data.length, groupAddress, groupPort);
-
+
socket.send(packet);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -47,96 +47,8 @@
*/
public class MessagingServiceImpl implements MessagingService
{
- public static MessagingServiceImpl newNullStorageMessagingService()
- {
- return newNullStorageMessagingService(new ConfigurationImpl());
- }
+ private final MessagingServer server;
- public static MessagingServiceImpl newNullStorageMessagingService(final Configuration config)
- {
- StorageManager storageManager = new NullStorageManager();
-
- RemotingService remotingService = new RemotingServiceImpl(config);
-
- JBMSecurityManager securityManager = new JBMSecurityManagerImpl(true);
-
- ManagementService managementService = new ManagementServiceImpl(ManagementFactory.getPlatformMBeanServer(),
- config.isJMXManagementEnabled());
-
- remotingService.setManagementService(managementService);
-
- MessagingServer server = new MessagingServerImpl();
-
- server.setConfiguration(config);
-
- server.setStorageManager(storageManager);
-
- server.setRemotingService(remotingService);
-
- server.setSecurityManager(securityManager);
-
- server.setManagementService(managementService);
-
- return new MessagingServiceImpl(server, storageManager, remotingService);
- }
-
- public static MessagingServiceImpl newNullStorageMessagingService(final Configuration config, MBeanServer mbeanServer)
- {
- StorageManager storageManager = new NullStorageManager();
-
- RemotingService remotingService = new RemotingServiceImpl(config);
-
- JBMSecurityManager securityManager = new JBMSecurityManagerImpl(true);
-
- ManagementService managementService = new ManagementServiceImpl(mbeanServer,
- config.isJMXManagementEnabled());
-
- remotingService.setManagementService(managementService);
-
- MessagingServer server = new MessagingServerImpl();
-
- server.setConfiguration(config);
-
- server.setStorageManager(storageManager);
-
- server.setRemotingService(remotingService);
-
- server.setSecurityManager(securityManager);
-
- server.setManagementService(managementService);
-
- return new MessagingServiceImpl(server, storageManager, remotingService);
- }
-
- public static MessagingServiceImpl newMessagingService(final Configuration config)
- {
- StorageManager storageManager = new JournalStorageManager(config);
-
- RemotingService remotingService = new RemotingServiceImpl(config);
-
- JBMSecurityManager securityManager = new JBMSecurityManagerImpl(true);
-
- ManagementService managementService = new ManagementServiceImpl(ManagementFactory.getPlatformMBeanServer(), false);
-
- remotingService.setManagementService(managementService);
-
- MessagingServer server = new MessagingServerImpl();
-
- server.setConfiguration(config);
-
- server.setStorageManager(storageManager);
-
- server.setRemotingService(remotingService);
-
- server.setSecurityManager(securityManager);
-
- server.setManagementService(managementService);
-
- return new MessagingServiceImpl(server, storageManager, remotingService);
- }
-
- private final MessagingServer server;
-
private final StorageManager storageManager;
private final RemotingService remotingService;
Modified: trunk/src/main/org/jboss/messaging/integration/bootstrap/JBMBootstrapServer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/bootstrap/JBMBootstrapServer.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/src/main/org/jboss/messaging/integration/bootstrap/JBMBootstrapServer.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -77,8 +77,17 @@
public void run()
{
- super.run();
- log.info("JBM Server Started");
+ try
+ {
+ super.run();
+ log.info("JBM Server Started");
+ }
+ catch (RuntimeException e)
+ {
+ log.error("Failed to start server", e);
+
+ throw e;
+ }
}
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/DuplicateDetectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/DuplicateDetectionTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/DuplicateDetectionTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -36,8 +36,8 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.impl.MessageImpl;
import org.jboss.messaging.core.postoffice.impl.DuplicateIDCacheImpl;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.core.transaction.impl.XidImpl;
import org.jboss.messaging.tests.util.ServiceTestBase;
import org.jboss.messaging.util.SimpleString;
@@ -813,7 +813,7 @@
conf.setIDCacheSize(cacheSize);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -851,7 +851,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -896,7 +896,7 @@
conf.setIDCacheSize(theCacheSize);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -930,7 +930,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -974,7 +974,7 @@
conf.setIDCacheSize(initialCacheSize);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1010,7 +1010,7 @@
conf.setIDCacheSize(subsequentCacheSize);
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1063,7 +1063,7 @@
conf.setIDCacheSize(initialCacheSize);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1099,7 +1099,7 @@
conf.setIDCacheSize(subsequentCacheSize);
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1109,7 +1109,7 @@
conf.setIDCacheSize(initialCacheSize);
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1162,7 +1162,7 @@
conf.setPersistIDCache(false);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1200,7 +1200,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1245,7 +1245,7 @@
conf.setPersistIDCache(false);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1285,7 +1285,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1330,7 +1330,7 @@
conf.setIDCacheSize(cacheSize);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1374,7 +1374,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1421,7 +1421,7 @@
conf.setPersistIDCache(false);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1463,7 +1463,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1520,7 +1520,7 @@
conf.setIDCacheSize(cacheSize);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1560,7 +1560,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1617,7 +1617,7 @@
conf.setIDCacheSize(cacheSize);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1659,7 +1659,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1716,7 +1716,7 @@
conf.setIDCacheSize(cacheSize);
- MessagingService messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1757,7 +1757,7 @@
messagingService2.stop();
- messagingService2 = MessagingServiceImpl.newMessagingService(conf);
+ messagingService2 = Messaging.newMessagingService(conf);
messagingService2.start();
@@ -1817,7 +1817,7 @@
conf.setIDCacheSize(cacheSize);
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/basic/AutoGroupClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/basic/AutoGroupClientTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/basic/AutoGroupClientTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -37,9 +37,9 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -63,7 +63,7 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.getServer().getQueueSettingsRepository().addMatch("testGroupQueue", qs);
messagingService.start();
@@ -124,7 +124,7 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.getServer().getQueueSettingsRepository().addMatch("testGroupQueue", qs);
messagingService.start();
@@ -193,7 +193,7 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.getServer().getQueueSettingsRepository().addMatch("testGroupQueue", qs);
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/basic/ClientRequestorTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -41,8 +41,8 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.util.SimpleString;
/**
@@ -234,7 +234,7 @@
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ service = Messaging.newNullStorageMessagingService(conf);
service.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/basic/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/basic/CoreClientTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/basic/CoreClientTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -34,8 +34,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -72,7 +72,7 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactoryClassName));
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -32,8 +32,8 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.tests.util.SpawnedVMSupport;
import org.jboss.messaging.util.SimpleString;
@@ -101,7 +101,7 @@
ConfigurationImpl config = new ConfigurationImpl();
config.setSecurityEnabled(false);
config.getAcceptorConfigurations().add(new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory"));
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(config);
+ messagingService = Messaging.newNullStorageMessagingService(config);
messagingService.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyConnectorFactory"));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeTestBase.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeTestBase.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -31,8 +31,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
/**
* A BridgeTestBase
@@ -56,7 +56,7 @@
serviceConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
params));
- MessagingService service = MessagingServiceImpl.newMessagingService(serviceConf);
+ MessagingService service = Messaging.newMessagingService(serviceConf);
return service;
}
@@ -69,7 +69,7 @@
serviceConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
params));
- MessagingService service = MessagingServiceImpl.newNullStorageMessagingService(serviceConf);
+ MessagingService service = Messaging.newNullStorageMessagingService(serviceConf);
return service;
}
@@ -83,7 +83,7 @@
serviceConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
params));
- MessagingService service = MessagingServiceImpl.newNullStorageMessagingService(serviceConf);
+ MessagingService service = Messaging.newNullStorageMessagingService(serviceConf);
return service;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -42,8 +42,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -274,7 +274,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -287,7 +287,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -24,12 +24,8 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
import junit.framework.TestCase;
@@ -37,9 +33,7 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.ClientSessionFactory;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
-import org.jboss.messaging.core.client.impl.ClientSessionFactoryInternal;
import org.jboss.messaging.core.client.impl.ClientSessionImpl;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
@@ -47,12 +41,11 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.FailureListener;
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.Pair;
import org.jboss.messaging.util.SimpleString;
@@ -186,7 +179,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -224,7 +217,7 @@
bcConfigs1.add(bcConfig1);
liveConf.setBroadcastGroupConfigurations(bcConfigs1);
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -42,8 +42,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -189,7 +189,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -202,7 +202,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -42,8 +42,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -199,7 +199,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -212,7 +212,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -47,8 +47,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.util.SimpleString;
/**
@@ -275,7 +275,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -288,7 +288,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -39,8 +39,8 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -191,7 +191,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -204,7 +204,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -41,8 +41,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -174,7 +174,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -187,7 +187,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -43,8 +43,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -193,7 +193,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -206,7 +206,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -34,8 +34,8 @@
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.tests.util.ServiceTestBase;
/**
@@ -109,7 +109,7 @@
clearData(getTestDir() + "/backup");
- backupService = MessagingServiceImpl.newMessagingService(backupConf);
+ backupService = Messaging.newMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -135,7 +135,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newMessagingService(liveConf);
+ liveService = Messaging.newMessagingService(liveConf);
clearData(getTestDir() + "/live");
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -41,8 +41,8 @@
import org.jboss.messaging.core.remoting.impl.invm.InVMConnector;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
/**
*
@@ -337,7 +337,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -351,7 +351,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -39,8 +39,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnector;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -95,7 +95,7 @@
liveConf.setSecurityEnabled(false);
liveConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- service = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ service = Messaging.newNullStorageMessagingService(liveConf);
service.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -29,9 +29,6 @@
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.core.client.impl.ClientSessionImpl;
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -35,7 +35,7 @@
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import org.jboss.messaging.core.server.Messaging;
/**
* A LargeMessageMultiThreadFailoverTest
@@ -95,7 +95,7 @@
.add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName(), backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newMessagingService(backupConf);
+ backupService = Messaging.newMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -119,7 +119,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newMessagingService(liveConf);
+ liveService = Messaging.newMessagingService(liveConf);
liveService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -20,7 +20,7 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import org.jboss.messaging.core.server.Messaging;
/**
* A MultiThreadRandomFailoverStressTest
@@ -40,7 +40,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
// We need to sleep > 16 ms otherwise the id generators on live and backup could be initialised
@@ -58,7 +58,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -39,8 +39,8 @@
import org.jboss.messaging.core.remoting.impl.invm.InVMConnector;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -1478,7 +1478,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
// We need to sleep > 16 ms otherwise the id generators on live and backup could be initialised
@@ -1496,7 +1496,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -39,8 +39,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnector;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -621,7 +621,7 @@
liveConf.setSecurityEnabled(false);
liveConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- service = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ service = Messaging.newNullStorageMessagingService(liveConf);
service.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -40,11 +40,10 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.RemotingConnection;
-import org.jboss.messaging.core.remoting.impl.RemotingConnectionImpl;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -286,7 +285,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -300,7 +299,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -29,7 +29,6 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS;
@@ -58,8 +57,8 @@
import org.jboss.messaging.core.remoting.impl.RemotingConnectionImpl;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
/**
*
@@ -182,7 +181,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -196,7 +195,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -48,8 +48,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -714,7 +714,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -727,7 +727,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -46,8 +46,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -185,14 +185,14 @@
server1Conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
server1Params));
- server1Service = MessagingServiceImpl.newNullStorageMessagingService(server1Conf);
+ server1Service = Messaging.newNullStorageMessagingService(server1Conf);
server1Service.start();
Configuration server0Conf = new ConfigurationImpl();
server0Conf.setSecurityEnabled(false);
server0Conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- server0Service = MessagingServiceImpl.newNullStorageMessagingService(server0Conf);
+ server0Service = Messaging.newNullStorageMessagingService(server0Conf);
server0Service.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -38,8 +38,8 @@
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
/**
* A ReplicationAwareAddressControlWrapperTest
@@ -105,7 +105,7 @@
backupParams));
backupConf.setBackup(true);
backupConf.setJMXManagementEnabled(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf, backupMBeanServer);
+ backupService = Messaging.newNullStorageMessagingService(backupConf, backupMBeanServer);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -119,7 +119,7 @@
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
liveConf.setJMXManagementEnabled(true);
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf, liveMBeanServer);
+ liveService = Messaging.newNullStorageMessagingService(liveConf, liveMBeanServer);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -32,9 +32,9 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.core.server.Queue;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
@@ -60,7 +60,7 @@
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/consumer/TransactionDurabilityTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/consumer/TransactionDurabilityTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/consumer/TransactionDurabilityTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -30,8 +30,8 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.tests.util.ServiceTestBase;
import org.jboss.messaging.util.SimpleString;
/**
@@ -73,7 +73,7 @@
final SimpleString queue2 = new SimpleString("queue2");
- MessagingService messagingService = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService = Messaging.newMessagingService(conf);
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/divert/DivertTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/divert/DivertTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/divert/DivertTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -36,8 +36,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.cluster.DivertConfiguration;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.tests.util.ServiceTestBase;
import org.jboss.messaging.util.SimpleString;
@@ -72,7 +72,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -160,7 +160,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -286,7 +286,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -355,7 +355,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -454,7 +454,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -588,7 +588,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -711,7 +711,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -823,7 +823,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -965,7 +965,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/divert/PersistentDivertTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/divert/PersistentDivertTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/divert/PersistentDivertTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -36,8 +36,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.cluster.DivertConfiguration;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.tests.util.ServiceTestBase;
import org.jboss.messaging.util.SimpleString;
@@ -82,7 +82,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService = Messaging.newMessagingService(conf);
messagingService.start();
@@ -218,7 +218,7 @@
conf.setDivertConfigurations(divertConfs);
- MessagingService messagingService = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService = Messaging.newMessagingService(conf);
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/http/CoreClientOverHttpTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/http/CoreClientOverHttpTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/http/CoreClientOverHttpTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -21,6 +21,8 @@
*/
package org.jboss.messaging.tests.integration.http;
+import java.util.HashMap;
+
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientProducer;
@@ -30,14 +32,12 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
-import java.util.HashMap;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
@@ -55,7 +55,7 @@
params.put("jbm.remoting.netty.httpenabled", true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params));
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -108,7 +108,7 @@
params.put("jbm.remoting.netty.httpenabled", true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params));
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -21,22 +21,22 @@
*/
package org.jboss.messaging.tests.integration.http;
-import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.integration.transports.netty.NettyAcceptor;
-import org.jboss.messaging.integration.transports.netty.TransportConstants;
-import org.jboss.messaging.integration.transports.netty.NettyConnector;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.impl.AbstractBufferHandler;
import org.jboss.messaging.core.remoting.spi.BufferHandler;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.remoting.spi.Connection;
import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
-import org.jboss.messaging.core.remoting.impl.AbstractBufferHandler;
-import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+import org.jboss.messaging.integration.transports.netty.NettyAcceptor;
+import org.jboss.messaging.integration.transports.netty.NettyConnector;
+import org.jboss.messaging.integration.transports.netty.TransportConstants;
+import org.jboss.messaging.tests.util.UnitTestCase;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -66,8 +66,8 @@
import org.jboss.messaging.core.remoting.RemotingConnection;
import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.client.JBossSession;
@@ -328,7 +328,7 @@
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = MessagingServiceImpl.newNullStorageMessagingService(backupConf);
+ backupService = Messaging.newNullStorageMessagingService(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -342,7 +342,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = MessagingServiceImpl.newNullStorageMessagingService(liveConf);
+ liveService = Messaging.newNullStorageMessagingService(liveConf);
liveService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -51,9 +51,9 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.core.server.Queue;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.client.JBossSession;
@@ -84,7 +84,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- service = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ service = Messaging.newNullStorageMessagingService(conf);
service.start();
serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
serverManager.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -63,8 +63,8 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
@@ -315,7 +315,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -44,8 +44,8 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.integration.transports.mina.MinaAcceptorFactory;
import org.jboss.messaging.integration.transports.mina.MinaConnectorFactory;
import org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory;
@@ -80,7 +80,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactory));
- MessagingService service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ MessagingService service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
JMSServerManagerImpl serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSUtil.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSUtil.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSUtil.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -56,7 +56,6 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
-import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
import org.jboss.messaging.jms.client.JBossConnectionFactory;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -38,8 +38,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.JBossTopic;
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.jms.server.management.TopicControlMBean;
@@ -213,7 +213,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -40,8 +40,8 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.management.AcceptorControlMBean;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory;
import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
@@ -80,7 +80,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(acceptorConfig);
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
AcceptorControlMBean acceptorControl = createAcceptorControl(acceptorConfig.getName(), mbeanServer);
@@ -99,7 +99,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(acceptorConfig);
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
AcceptorControlMBean acceptorControl = createAcceptorControl(acceptorConfig.getName(), mbeanServer);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,25 +22,15 @@
package org.jboss.messaging.tests.integration.management;
-import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createBridgeControl;
import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
import static org.jboss.messaging.tests.util.RandomUtil.randomDouble;
import static org.jboss.messaging.tests.util.RandomUtil.randomPositiveInt;
import static org.jboss.messaging.tests.util.RandomUtil.randomPositiveLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
import junit.framework.TestCase;
-import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.cluster.BridgeConfiguration;
-import org.jboss.messaging.core.config.cluster.DiscoveryGroupConfiguration;
-import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.management.BridgeControlMBean;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.util.Pair;
/**
@@ -100,7 +90,7 @@
// conf.setClustered(true);
// conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig);
// conf.getBridgeConfigurations().add(bridgeConfig);
-// service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+// service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
// service.start();
//
// BridgeControlMBean bridgeControl = createBridgeControl(bridgeConfig.getName(), mbeanServer);
@@ -124,7 +114,7 @@
// conf.setClustered(true);
// conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig);
// conf.getBridgeConfigurations().add(bridgeConfig);
-// service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+// service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
// service.start();
//
// BridgeControlMBean bridgeControl = createBridgeControl(bridgeConfig.getName(), mbeanServer);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -40,8 +40,8 @@
import org.jboss.messaging.core.config.cluster.BroadcastGroupConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.management.BroadcastGroupControlMBean;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
import org.jboss.messaging.util.Pair;
@@ -99,7 +99,7 @@
conf.setClustered(true);
conf.getConnectorConfigurations().put(connectorConfiguration.getName(), connectorConfiguration);
conf.getBroadcastGroupConfigurations().add(broadcastGroupConfig);
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
BroadcastGroupControlMBean broadcastGroupControl = createBroadcastGroupControl(broadcastGroupConfig.getName(), mbeanServer);
@@ -125,7 +125,7 @@
conf.setClustered(true);
conf.getConnectorConfigurations().put(connectorConfiguration.getName(), connectorConfiguration);
conf.getBroadcastGroupConfigurations().add(broadcastGroupConfig);
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
BroadcastGroupControlMBean broadcastGroupControl = createBroadcastGroupControl(broadcastGroupConfig.getName(), mbeanServer);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/DiscoveryGroupControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -35,8 +35,8 @@
import org.jboss.messaging.core.config.cluster.DiscoveryGroupConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.management.DiscoveryGroupControlMBean;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
/**
* A AcceptorControlTest
@@ -72,7 +72,7 @@
conf.setJMXManagementEnabled(true);
conf.setClustered(true);
conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig);
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
DiscoveryGroupControlMBean discoveryGroupControl = createDiscoveryGroupControl(discoveryGroupConfig.getName(), mbeanServer);
@@ -93,7 +93,7 @@
conf.setJMXManagementEnabled(true);
conf.setClustered(true);
conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig);
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
DiscoveryGroupControlMBean discoveryGroupControl = createDiscoveryGroupControl(discoveryGroupConfig.getName(), mbeanServer);
@@ -115,7 +115,7 @@
conf.setJMXManagementEnabled(true);
conf.setClustered(true);
conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig);
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
DiscoveryGroupControlMBean discoveryGroupControl = createDiscoveryGroupControl(discoveryGroupConfig.getName(), mbeanServer);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementControlHelper.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementControlHelper.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementControlHelper.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -30,9 +30,9 @@
import org.jboss.messaging.core.management.AcceptorControlMBean;
import org.jboss.messaging.core.management.AddressControlMBean;
+import org.jboss.messaging.core.management.BridgeControlMBean;
import org.jboss.messaging.core.management.BroadcastGroupControlMBean;
import org.jboss.messaging.core.management.DiscoveryGroupControlMBean;
-import org.jboss.messaging.core.management.BridgeControlMBean;
import org.jboss.messaging.core.management.MessagingServerControlMBean;
import org.jboss.messaging.core.management.QueueControlMBean;
import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -38,8 +38,8 @@
import org.jboss.messaging.core.management.MessagingServerControlMBean;
import org.jboss.messaging.core.management.TransportConfigurationInfo;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
/**
* A QueueControlTest
@@ -77,7 +77,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig);
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
MessagingServerControlMBean serverControl = ManagementControlHelper.createMessagingServerControl(mbeanServer);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -40,12 +40,10 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.management.NotificationType;
-import org.jboss.messaging.core.management.impl.MessagingServerControl;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
-import org.jboss.messaging.tests.util.RandomUtil;
import org.jboss.messaging.util.SimpleString;
/**
@@ -186,7 +184,7 @@
conf.setJMXManagementEnabled(false);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ service = Messaging.newNullStorageMessagingService(conf);
service.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -43,8 +43,8 @@
import org.jboss.messaging.core.management.QueueControlMBean;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.util.SimpleString;
/**
@@ -404,7 +404,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = MessagingServiceImpl.newNullStorageMessagingService(conf, mbeanServer);
+ service = Messaging.newNullStorageMessagingService(conf, mbeanServer);
service.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -37,9 +37,9 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.core.server.Queue;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.core.transaction.impl.XidImpl;
import org.jboss.messaging.tests.util.UnitTestCase;
@@ -242,7 +242,7 @@
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(configuration);
+ messagingService = Messaging.newNullStorageMessagingService(configuration);
//start the server
messagingService.start();
//then we create a client as normal
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -33,8 +33,8 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
@@ -222,7 +222,7 @@
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(configuration);
+ messagingService = Messaging.newNullStorageMessagingService(configuration);
// start the server
messagingService.start();
// then we create a client as normal
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryRunnerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryRunnerTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryRunnerTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -21,33 +21,31 @@
*/
package org.jboss.messaging.tests.integration.queue;
-import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.Queue;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.core.client.ClientProducer;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientConsumer;
-import org.jboss.messaging.core.client.MessageHandler;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
-import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.server.Messaging;
+import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.settings.impl.QueueSettings;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.List;
-import java.util.ArrayList;
-
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
@@ -295,7 +293,7 @@
configuration.setMessageExpiryScanPeriod(1000);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(configuration);
+ messagingService = Messaging.newNullStorageMessagingService(configuration);
// start the server
messagingService.start();
// then we create a client as normal
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/MessageGroupingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/MessageGroupingTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/MessageGroupingTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -21,31 +21,32 @@
*/
package org.jboss.messaging.tests.integration.queue;
-import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
-import org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor;
-import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.config.TransportConfiguration;
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.ClientProducer;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.MessageHandler;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.server.Messaging;
+import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor;
import org.jboss.messaging.core.settings.impl.QueueSettings;
-import org.jboss.messaging.core.message.impl.MessageImpl;
import org.jboss.messaging.core.transaction.impl.XidImpl;
+import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
-import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAResource;
-import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
@@ -550,7 +551,7 @@
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(configuration);
+ messagingService = Messaging.newNullStorageMessagingService(configuration);
// start the server
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/queue/PredefinedQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/PredefinedQueueTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/PredefinedQueueTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -38,8 +38,8 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.postoffice.Bindings;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.tests.util.ServiceTestBase;
import org.jboss.messaging.util.SimpleString;
@@ -83,7 +83,7 @@
conf.setQueueConfigurations(queueConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -153,7 +153,7 @@
conf.setQueueConfigurations(queueConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
@@ -221,7 +221,7 @@
final String queueName3 = "queue3";
- MessagingService messagingService = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService = Messaging.newMessagingService(conf);
messagingService.start();
@@ -334,7 +334,7 @@
conf.setQueueConfigurations(queueConfs);
- MessagingService messagingService = MessagingServiceImpl.newMessagingService(conf);
+ MessagingService messagingService = Messaging.newMessagingService(conf);
messagingService.start();
@@ -420,7 +420,7 @@
conf.setQueueConfigurations(queueConfs);
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(conf);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(conf);
messagingService.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/wildcard/WildCardRoutingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/wildcard/WildCardRoutingTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/wildcard/WildCardRoutingTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -30,8 +30,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
@@ -800,7 +800,7 @@
configuration.setTransactionTimeoutScanPeriod(500);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(configuration);
+ messagingService = Messaging.newNullStorageMessagingService(configuration);
//start the server
messagingService.start();
messagingService.getServer().getManagementService().enableNotifications(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -37,8 +37,8 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.core.transaction.impl.XidImpl;
import org.jboss.messaging.tests.util.UnitTestCase;
@@ -75,7 +75,7 @@
configuration.setTransactionTimeoutScanPeriod(500);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- messagingService = MessagingServiceImpl.newNullStorageMessagingService(configuration);
+ messagingService = Messaging.newNullStorageMessagingService(configuration);
//start the server
messagingService.start();
//then we create a client as normal
Modified: trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -32,10 +32,10 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
-import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
import org.jboss.messaging.core.server.JournalType;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
+import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/journal/AddAndRemoveStressTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -31,7 +31,6 @@
import org.jboss.messaging.core.journal.SequentialFileFactory;
import org.jboss.messaging.core.journal.impl.AIOSequentialFileFactory;
import org.jboss.messaging.core.journal.impl.JournalImpl;
-import org.jboss.messaging.core.journal.impl.NIOSequentialFileFactory;
import org.jboss.messaging.tests.unit.core.journal.impl.fakes.SimpleEncoding;
import org.jboss.messaging.tests.util.UnitTestCase;
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -30,17 +30,12 @@
import org.easymock.EasyMock;
import org.easymock.IAnswer;
-import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.persistence.StorageManager;
-import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.server.Consumer;
import org.jboss.messaging.core.server.HandleStatus;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.impl.QueueImpl;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.tests.unit.core.server.impl.fakes.FakeConsumer;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,13 +22,12 @@
package org.jboss.messaging.tests.unit.core.config.impl;
+import junit.framework.TestCase;
+
import org.jboss.messaging.core.config.impl.FileConfiguration;
import org.jboss.messaging.util.XMLUtil;
import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-import junit.framework.TestCase;
-
/**
* A ConfigurationValidationTr
*
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,10 +22,7 @@
package org.jboss.messaging.tests.unit.core.config.impl;
-import java.util.Map;
-
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.FileConfiguration;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/OperatorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/OperatorTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/OperatorTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -47,10 +47,8 @@
import static org.jboss.messaging.core.filter.impl.Operator.OR;
import static org.jboss.messaging.core.filter.impl.Operator.SUB;
-import java.util.Collections;
import java.util.HashSet;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.jboss.messaging.core.filter.impl.Operator;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/AddressControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/AddressControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -42,13 +42,9 @@
import org.jboss.messaging.core.management.RoleInfo;
import org.jboss.messaging.core.management.impl.AddressControl;
-import org.jboss.messaging.core.postoffice.Binding;
-import org.jboss.messaging.core.postoffice.Bindings;
import org.jboss.messaging.core.postoffice.PostOffice;
-import org.jboss.messaging.core.postoffice.impl.BindingsImpl;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.Role;
-import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/MessagingServerControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -23,15 +23,12 @@
package org.jboss.messaging.tests.unit.core.management.impl;
import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
import static org.jboss.messaging.tests.util.RandomUtil.randomInt;
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomPositiveInt;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
import static org.jboss.messaging.tests.util.RandomUtil.randomXid;
@@ -49,17 +46,14 @@
import junit.framework.TestCase;
import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.management.impl.MessagingServerControl;
import org.jboss.messaging.core.messagecounter.MessageCounterManager;
import org.jboss.messaging.core.persistence.StorageManager;
-import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.remoting.RemotingService;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.JournalType;
import org.jboss.messaging.core.server.MessagingServer;
-import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.QueueFactory;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.QueueSettings;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -23,7 +23,6 @@
package org.jboss.messaging.tests.unit.core.management.impl;
import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.isA;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageImplTestBase.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -39,9 +39,9 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
-import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
+import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapper2Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapper2Test.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapper2Test.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,8 +22,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.mina;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapperTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/IoBufferWrapperTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -23,8 +23,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.mina;
import org.apache.mina.core.buffer.IoBuffer;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorFactoryTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorFactoryTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -25,11 +25,11 @@
import java.util.Map;
import org.easymock.EasyMock;
-import org.jboss.messaging.integration.transports.mina.MinaAcceptor;
-import org.jboss.messaging.integration.transports.mina.MinaAcceptorFactory;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.BufferHandler;
import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.integration.transports.mina.MinaAcceptor;
+import org.jboss.messaging.integration.transports.mina.MinaAcceptorFactory;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaAcceptorTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -28,9 +28,9 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.integration.transports.mina.MinaAcceptor;
import org.jboss.messaging.core.remoting.spi.BufferHandler;
import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.integration.transports.mina.MinaAcceptor;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectionTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectionTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -23,8 +23,8 @@
import org.apache.mina.core.session.IoSession;
import org.easymock.EasyMock;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.mina.MinaConnection;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectorTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/mina/MinaConnectorTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -26,9 +26,9 @@
import java.util.Map;
import org.easymock.EasyMock;
-import org.jboss.messaging.integration.transports.mina.MinaConnector;
import org.jboss.messaging.core.remoting.spi.BufferHandler;
import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.integration.transports.mina.MinaConnector;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,8 +22,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.netty;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.netty.ChannelBufferWrapper;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,8 +22,8 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.netty;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.netty.ChannelBufferWrapper;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.unit.core.remoting.MessagingBufferTestBase;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -25,11 +25,11 @@
import java.util.Map;
import org.easymock.EasyMock;
-import org.jboss.messaging.integration.transports.netty.NettyAcceptor;
-import org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.BufferHandler;
import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.integration.transports.netty.NettyAcceptor;
+import org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -26,9 +26,9 @@
import java.util.Map;
import org.easymock.EasyMock;
-import org.jboss.messaging.integration.transports.netty.NettyAcceptor;
import org.jboss.messaging.core.remoting.spi.BufferHandler;
import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.integration.transports.netty.NettyAcceptor;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -24,8 +24,8 @@
import java.util.UUID;
import org.easymock.EasyMock;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.netty.NettyConnection;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.netty.channel.Channel;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -26,9 +26,9 @@
import java.util.Map;
import org.easymock.EasyMock;
-import org.jboss.messaging.integration.transports.netty.NettyConnector;
import org.jboss.messaging.core.remoting.spi.BufferHandler;
import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
+import org.jboss.messaging.integration.transports.netty.NettyConnector;
import org.jboss.messaging.tests.util.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -21,24 +21,7 @@
*/
package org.jboss.messaging.tests.unit.core.server.impl;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.paging.PagingManager;
-import org.jboss.messaging.core.persistence.StorageManager;
-import org.jboss.messaging.core.postoffice.Binding;
-import org.jboss.messaging.core.postoffice.PostOffice;
-import org.jboss.messaging.core.server.MessageReference;
-import org.jboss.messaging.core.server.Queue;
-import org.jboss.messaging.core.server.ServerMessage;
-import org.jboss.messaging.core.server.impl.MessageReferenceImpl;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.QueueSettings;
-import org.jboss.messaging.tests.util.RandomUtil;
import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.util.SimpleString;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServiceImplTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServiceImplTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -27,6 +27,7 @@
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.persistence.impl.nullpm.NullStorageManager;
import org.jboss.messaging.core.remoting.RemotingService;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.MessagingService;
import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
@@ -73,7 +74,7 @@
public void testNewNullStorageMessagingServer() throws Exception
{
Configuration config = new ConfigurationImpl();
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService(config);
+ MessagingService messagingService = Messaging.newNullStorageMessagingService(config);
messagingService.start();
assertTrue(messagingService.isStarted());
assertEquals(messagingService.getServer().getStorageManager().getClass(), NullStorageManager.class);
@@ -83,7 +84,7 @@
public void testNewNullStorageMessagingServerDefault() throws Exception
{
- MessagingService messagingService = MessagingServiceImpl.newNullStorageMessagingService();
+ MessagingService messagingService = Messaging.newNullStorageMessagingService();
messagingService.start();
assertTrue(messagingService.isStarted());
assertEquals(messagingService.getServer().getStorageManager().getClass(), NullStorageManager.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/ServerMessageImplTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -27,12 +27,9 @@
import java.nio.ByteBuffer;
-import org.easymock.EasyMock;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.core.server.MessageReference;
-import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
import org.jboss.messaging.tests.unit.core.message.impl.MessageImplTestBase;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/transaction/impl/TransactionImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/transaction/impl/TransactionImplTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/transaction/impl/TransactionImplTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -24,28 +24,20 @@
import static org.jboss.messaging.tests.util.RandomUtil.randomXid;
-import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import javax.transaction.xa.Xid;
import org.easymock.EasyMock;
-import org.jboss.messaging.core.paging.PagingManager;
-import org.jboss.messaging.core.paging.PagingStore;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
-import org.jboss.messaging.core.server.MessageReference;
-import org.jboss.messaging.core.server.Queue;
-import org.jboss.messaging.core.server.ServerMessage;
-import org.jboss.messaging.core.server.impl.QueueImpl;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.HierarchicalObjectRepository;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.core.transaction.Transaction;
import org.jboss.messaging.core.transaction.impl.TransactionImpl;
import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.util.SimpleString;
/**
*
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,37 +22,10 @@
package org.jboss.messaging.tests.unit.jms.client;
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import javax.jms.ConnectionConsumer;
-import javax.jms.ConnectionMetaData;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.QueueSession;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicSession;
-import javax.jms.XAQueueSession;
-import javax.jms.XASession;
-import javax.jms.XATopicSession;
-
import junit.framework.TestCase;
-import org.easymock.EasyMock;
import org.easymock.IArgumentMatcher;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.FailureListener;
-import org.jboss.messaging.jms.client.JBossConnection;
-import org.jboss.messaging.tests.util.RandomUtil;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,69 +22,14 @@
package org.jboss.messaging.tests.unit.jms.client;
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.isNull;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.IllegalStateException;
-import javax.jms.InvalidClientIDException;
-import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
-import javax.jms.MapMessage;
import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
import javax.jms.Session;
-import javax.jms.StreamMessage;
-import javax.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.jms.TransactionInProgressException;
-import javax.transaction.xa.XAResource;
import junit.framework.TestCase;
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.client.ClientConsumer;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
-import org.jboss.messaging.jms.JBossDestination;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.JBossTemporaryQueue;
-import org.jboss.messaging.jms.JBossTemporaryTopic;
-import org.jboss.messaging.jms.JBossTopic;
-import org.jboss.messaging.jms.client.JBossConnection;
-import org.jboss.messaging.jms.client.JBossMessage;
-import org.jboss.messaging.jms.client.JBossSession;
-import org.jboss.messaging.util.SimpleString;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSMessageListenerWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSMessageListenerWrapperTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JMSMessageListenerWrapperTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -22,25 +22,8 @@
package org.jboss.messaging.tests.unit.jms.client;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.classextension.EasyMock.createNiceMock;
-import static org.easymock.classextension.EasyMock.createStrictMock;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
import junit.framework.TestCase;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.jms.client.JBossSession;
-import org.jboss.messaging.jms.client.JMSMessageListenerWrapper;
-
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -23,7 +23,6 @@
package org.jboss.messaging.tests.unit.jms.server.management.impl;
import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/TopicControlTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/TopicControlTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -30,8 +30,6 @@
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.jms.JBossTopic;
import org.jboss.messaging.jms.server.management.impl.TopicControl;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/TypedPropertiesTest.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -38,8 +38,8 @@
import junit.framework.TestCase;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.integration.transports.mina.IoBufferWrapper;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.TypedProperties;
Modified: trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -37,8 +37,8 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory;
import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
@@ -118,11 +118,11 @@
if (realFiles)
{
- service = MessagingServiceImpl.newMessagingService(configuration);
+ service = Messaging.newMessagingService(configuration);
}
else
{
- service = MessagingServiceImpl.newNullStorageMessagingService(configuration);
+ service = Messaging.newNullStorageMessagingService(configuration);
}
for (Map.Entry<String, QueueSettings> setting : settings.entrySet())
Modified: trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2009-01-26 10:05:41 UTC (rev 5721)
+++ trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2009-01-26 10:27:15 UTC (rev 5722)
@@ -44,6 +44,7 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.journal.EncodingSupport;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.core.server.MessageReference;
@@ -64,6 +65,9 @@
public class UnitTestCase extends TestCase
{
// Constants -----------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(UnitTestCase.class);
+
public static final String INVM_ACCEPTOR_FACTORY = "org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory";
@@ -316,6 +320,14 @@
// Protected -----------------------------------------------------
@Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ log.info("###### starting test " + this.getName());
+ }
+
+ @Override
protected void tearDown() throws Exception
{
super.tearDown();
More information about the jboss-cvs-commits
mailing list