http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java index 535f525..f3fcc11 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java @@ -10,39 +10,39 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.bridge; +package org.apache.activemq.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.QueueControl; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnector; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; -import org.apache.activemq6.core.server.impl.InVMNodeManager; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.QueueControl; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.remoting.impl.invm.InVMConnector; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq.core.server.impl.InVMNodeManager; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.integration.IntegrationTestLogger; import org.junit.After; import org.junit.Assert; import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java index 8c34f21..b7e82c2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeStartTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.bridge; +package org.apache.activemq.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.Arrays; @@ -19,22 +19,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -92,7 +92,7 @@ public class BridgeStartTest extends ServiceTestBase Map<String, Object> server1Params = new HashMap<String, Object>(); if (isNetty()) { - server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -261,7 +261,7 @@ public class BridgeStartTest extends ServiceTestBase Map<String, Object> server1Params = new HashMap<String, Object>(); if (isNetty()) { - server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -472,7 +472,7 @@ public class BridgeStartTest extends ServiceTestBase Map<String, Object> server1Params = new HashMap<String, Object>(); if (isNetty()) { - server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -626,7 +626,7 @@ public class BridgeStartTest extends ServiceTestBase Map<String, Object> server1Params = new HashMap<String, Object>(); if (isNetty()) { - server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java index 114e475..d491493 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.bridge; +package org.apache.activemq.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.Arrays; @@ -23,38 +23,38 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.postoffice.DuplicateIDCache; -import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendLargeMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.LinkedListIterator; -import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.postoffice.DuplicateIDCache; +import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.utils.ReusableLatch; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -456,7 +456,7 @@ public class BridgeTest extends ServiceTestBase { if (isNetty()) { - server1Params.put("port", org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java index c994f2e..516c1ed 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTestBase.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.bridge; +package org.apache.activemq.tests.integration.cluster.bridge; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnector; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.tests.util.InVMNodeManagerServer; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.remoting.impl.invm.InVMConnector; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.tests.util.InVMNodeManagerServer; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.After; /** @@ -65,14 +65,14 @@ public abstract class BridgeTestBase extends UnitTestCase if (netty) { - params.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); + params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params); } else { - params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); + params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); tc = new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params); } Configuration serviceConf = createBasicConfig() @@ -110,14 +110,14 @@ public abstract class BridgeTestBase extends UnitTestCase if (netty) { - params.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); + params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params); } else { - params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); + params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); tc = new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java index 38dee7d..9963d4e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.bridge; +package org.apache.activemq.tests.integration.cluster.bridge; import java.util.ArrayList; import java.util.Arrays; @@ -19,26 +19,26 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -92,7 +92,7 @@ public class BridgeWithDiscoveryGroupStartTest extends ServiceTestBase } else { - server1Params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, 1); + server1Params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, 1); } HornetQServer server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params); ServerLocator locator = null; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java index 5eb51fc..d8ea441 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.bridge; +package org.apache.activemq.tests.integration.cluster.bridge; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.Transformer; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.Transformer; /** * A SimpleTransformer http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java index d951d80..937c1a7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.core.message.impl.MessageImpl; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.core.message.impl.MessageImpl; public class ClusterHeadersRemovedTest extends ClusterTestBase { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java index 7b23dab..a33582d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import java.io.PrintWriter; import java.io.StringWriter; @@ -27,53 +27,53 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.client.impl.Topology; -import org.apache.activemq6.core.client.impl.TopologyMemberImpl; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; -import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.cluster.ClusterManager; -import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; -import org.apache.activemq6.core.server.cluster.qourum.SharedNothingBackupQuorum; -import org.apache.activemq6.core.server.group.GroupingHandler; -import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq6.core.server.impl.InVMNodeManager; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.Bindings; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.cluster.ClusterManager; +import org.apache.activemq.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum; +import org.apache.activemq.core.server.group.GroupingHandler; +import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.core.server.impl.InVMNodeManager; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java index a718968..ac73a61 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterWithBackupTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java index a0d23f0..92fec81 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import java.util.ArrayList; import java.util.List; @@ -21,28 +21,28 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.core.postoffice.impl.BindingsImpl; -import org.apache.activemq6.core.server.group.GroupingHandler; -import org.apache.activemq6.core.server.group.UnproposalListener; -import org.apache.activemq6.core.server.group.impl.GroupBinding; -import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq6.core.server.group.impl.Proposal; -import org.apache.activemq6.core.server.group.impl.Response; -import org.apache.activemq6.core.server.impl.QueueImpl; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.server.management.NotificationListener; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.core.postoffice.impl.BindingsImpl; +import org.apache.activemq.core.server.group.GroupingHandler; +import org.apache.activemq.core.server.group.UnproposalListener; +import org.apache.activemq.core.server.group.impl.GroupBinding; +import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.core.server.group.impl.Proposal; +import org.apache.activemq.core.server.group.impl.Response; +import org.apache.activemq.core.server.impl.QueueImpl; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.server.management.NotificationListener; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.integration.IntegrationTestLogger; import org.junit.After; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java index 69852e1..30da5c6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredRequestResponseTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java index ad21b39..6366d02 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/LargeMessageRedistributionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; /** * A LargeMessageRedistributionTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java index b2499c1..6d81d8c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -18,20 +18,20 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.server.Bindable; -import org.apache.activemq6.core.server.cluster.impl.Redistributor; -import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq6.core.server.impl.QueueImpl; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.server.Bindable; +import org.apache.activemq.core.server.cluster.impl.Redistributor; +import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.core.server.impl.QueueImpl; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.integration.IntegrationTestLogger; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java index 1894f46..c139d91 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/MessageRedistributionWithDiscoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; @@ -20,11 +20,11 @@ import java.util.ArrayList; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.core.settings.impl.AddressSettings; /** * A MessageRedistributionWithDiscoveryTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java index 15d6208..acaa5a1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** * A NettyFileStorageSymmetricClusterTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java index c2c546b..1f5d5c3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithBackupTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; /** * A NettyFileStorageSymmetricClusterWithBackupTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java index 78c5f34..ca265ce 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyFileStorageSymmetricClusterWithDiscoveryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** * A NettyFileStorageSymmetricClusterWithDiscoveryTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java index f67e4cf..64645c8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayChainClusterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java index 0ff0549..0857cc0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java index 61b046a..3fbd7f2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; /** * A NettySymmetricClusterTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java index c3a932b..2fe639f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithBackupTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java index 07f320e..f63a3a5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/NettySymmetricClusterWithDiscoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; /** * A NettySymmetricClusterWithDiscoveryTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java index bfbe888..b0eb51f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OneWayChainClusterTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.cluster.MessageFlowRecord; -import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.cluster.MessageFlowRecord; +import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq.tests.integration.IntegrationTestLogger; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java index fc2fde3..f7e7488 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; -import org.apache.activemq6.core.server.HornetQServer; +package org.apache.activemq.tests.integration.cluster.distribution; +import org.apache.activemq.core.server.HornetQServer; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java index 9d3aa14..2486f59 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.IntegrationTestLogger; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java index fa1ca67..8bb8e18 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterTest.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.UnitTestCase; /** * A SymmetricClusterTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java index cab0775..6cd6469 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java index 97ddee5..2e757ed 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** * A SymmetricClusterWithDiscoveryTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java index 50baedb..9f31c3a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TemporaryQueueClusterTest.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientSession; /** * A TemporaryQueueClusterTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java index 62d11bf..5183bb4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.IntegrationTestLogger; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java index 3337d49..8adbb91 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.distribution; +package org.apache.activemq.tests.integration.cluster.distribution; /** * A TwoWayTwoNodeClusterWithDiscoveryTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java index ac94be7..c0b35bb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.failover; +package org.apache.activemq.tests.integration.cluster.failover; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; /** * Validating failover when the size of the message Size > flow Control && message Size < minLargeMessageSize http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java index 79092d6..b214c4e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.failover; +package org.apache.activemq.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.HornetQDuplicateIdException; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQTransactionOutcomeUnknownException; -import org.apache.activemq6.api.core.HornetQTransactionRolledBackException; -import org.apache.activemq6.api.core.HornetQUnBlockedException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.client.impl.DelegatingSession; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.CountDownSessionFailureListener; -import org.apache.activemq6.tests.util.TransportConfigurationUtils; +import org.apache.activemq.api.core.HornetQDuplicateIdException; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQTransactionOutcomeUnknownException; +import org.apache.activemq.api.core.HornetQTransactionRolledBackException; +import org.apache.activemq.api.core.HornetQUnBlockedException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.client.impl.DelegatingSession; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.CountDownSessionFailureListener; +import org.apache.activemq.tests.util.TransportConfigurationUtils; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java index 1b43b9e..190dbaa 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.failover; +package org.apache.activemq.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.Arrays; @@ -21,24 +21,24 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.Topology; -import org.apache.activemq6.core.client.impl.TopologyMemberImpl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.config.ScaleDownConfiguration; -import org.apache.activemq6.core.config.ha.ColocatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.config.ScaleDownConfiguration; +import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java index 8a8a5d7..ffa8cd9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.tests.integration.cluster.failover; +package org.apache.activemq.tests.integration.cluster.failover; import org.junit.Before; import org.junit.Test; @@ -22,13 +22,13 @@ import java.util.Arrays; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.TransportConfigurationUtils; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.TransportConfigurationUtils; public class BackupAuthenticationTest extends FailoverTestBase { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java index 358dc27..2904c9a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.failover; +package org.apache.activemq.tests.integration.cluster.failover; import java.io.File; import java.io.RandomAccessFile; @@ -20,27 +20,27 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.journal.impl.JournalFile; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.tests.integration.cluster.util.BackupSyncDelay; -import org.apache.activemq6.tests.integration.cluster.util.TestableServer; -import org.apache.activemq6.tests.util.TransportConfigurationUtils; -import org.apache.activemq6.utils.UUID; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.journal.impl.JournalFile; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.tests.integration.cluster.util.BackupSyncDelay; +import org.apache.activemq.tests.integration.cluster.util.TestableServer; +import org.apache.activemq.tests.util.TransportConfigurationUtils; +import org.apache.activemq.utils.UUID; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java index cc32cc7..903ec51 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.failover; +package org.apache.activemq.tests.integration.cluster.failover; import org.junit.Test; @@ -24,15 +24,15 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.tests.util.UnitTestCase; public class BackupSyncLargeMessageTest extends BackupSyncJournalTest { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java index 21d9490..7ec394a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncPagingTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster.failover; +package org.apache.activemq.tests.integration.cluster.failover; import org.junit.Before; import org.junit.Test; @@ -18,11 +18,11 @@ import org.junit.Test; import java.util.HashMap; import java.util.Map; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; public class BackupSyncPagingTest extends BackupSyncJournalTest {
