Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B3473CBC5 for ; Mon, 17 Nov 2014 14:48:37 +0000 (UTC) Received: (qmail 58049 invoked by uid 500); 17 Nov 2014 14:48:37 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 57912 invoked by uid 500); 17 Nov 2014 14:48:37 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 57373 invoked by uid 99); 17 Nov 2014 14:48:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2014 14:48:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E176798D044; Mon, 17 Nov 2014 14:48:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andytaylor@apache.org To: commits@activemq.apache.org Date: Mon, 17 Nov 2014 14:48:43 -0000 Message-Id: <95d59b12211346c8a165203773edbf53@git.apache.org> In-Reply-To: <4795dcec67344b8e975c3f1f7e3bf4f7@git.apache.org> References: <4795dcec67344b8e975c3f1f7e3bf4f7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java index b0b4654..17847c7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java @@ -10,28 +10,28 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.client; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -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.ClientRequestor; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.MessageHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientMessageImpl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.TransportConfigurationUtils; -import org.apache.activemq6.tests.util.UnitTestCase; +package org.apache.activemq.tests.integration.client; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +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.ClientRequestor; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientMessageImpl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.TransportConfigurationUtils; +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/client/RoutingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.java index 97b9476..0bb6795 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RoutingTest.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.client; +package org.apache.activemq.tests.integration.client; -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.client.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; +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.client.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/SelfExpandingBufferTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java index 92b3afc..8b4e10c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.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.client; - -import org.apache.activemq6.api.core.HornetQBuffer; -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.client.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; +package org.apache.activemq.tests.integration.client; + +import org.apache.activemq.api.core.HornetQBuffer; +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.client.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; 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/client/ServerLocatorConnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java index ec6b6a3..4e0bdbb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.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.client; +package org.apache.activemq.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -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.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ServerLocatorInternal; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQNotConnectedException; +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.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ServerLocatorInternal; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; 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/client/ServerLocatorSerializationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorSerializationTest.java index baf8cf0..8c5fe4a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorSerializationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorSerializationTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.client; +package org.apache.activemq.tests.integration.client; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.apache.activemq6.api.core.TransportConfiguration; -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.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.client.impl.ServerLocatorImpl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.TransportConfiguration; +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.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.ServiceTestBase; import javax.jms.Connection; import javax.jms.Session; @@ -95,7 +95,7 @@ public class ServerLocatorSerializationTest extends ServiceTestBase public void testConnectionFactorySerialization() throws Exception { log.info("Starting connection factory"); - HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory")); + HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory")); Connection connection = cf.createConnection(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java index 1339c27..5942c75 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseOnGCTest.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.client; +package org.apache.activemq.tests.integration.client; import java.lang.ref.WeakReference; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.Assert; 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/client/SessionCloseTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java index b7ef699..4f93bc4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.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.client; +package org.apache.activemq.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -21,22 +21,22 @@ import javax.transaction.xa.XAResource; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -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.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.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +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.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.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.UnitTestCase; /** * A SessionCloseTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java index 9021e0f..abcc827 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.client; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -import org.apache.activemq6.api.core.HornetQObjectClosedException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -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.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.ServiceTestBase; +package org.apache.activemq.tests.integration.client; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.HornetQObjectClosedException; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +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.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/SessionCreateAndDeleteQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java index eaeef36..f25d134 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.client; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQNonExistentQueueException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.impl.LastValueQueue; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.util.ServiceTestBase; +package org.apache.activemq.tests.integration.client; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.impl.LastValueQueue; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/SessionCreateConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java index 712ea18..d46f69b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.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.client; +package org.apache.activemq.tests.integration.client; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQInvalidFilterExpressionException; -import org.apache.activemq6.api.core.HornetQNonExistentQueueException; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQInvalidFilterExpressionException; +import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/SessionCreateProducerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java index 1b6b12b..6b7956d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.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.client; +package org.apache.activemq.tests.integration.client; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQObjectClosedException; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQObjectClosedException; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/SessionFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.java index 0a5e88b..7c86215 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionFactoryTest.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.client; +package org.apache.activemq.tests.integration.client; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -20,21 +20,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -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.Configuration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.RandomUtil; -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.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +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.Configuration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/SessionSendAcknowledgementHandlerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java index db8ae37..c31edf7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionSendAcknowledgementHandlerTest.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.client; +package org.apache.activemq.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -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.SendAcknowledgementHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +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.SendAcknowledgementHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/SessionStopStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.java index 75803b9..150113d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionStopStartTest.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.client; +package org.apache.activemq.tests.integration.client; import org.junit.Before; import org.junit.Test; @@ -20,17 +20,17 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -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.client.MessageHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -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.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.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.ServiceTestBase; /** * @author Andy Taylor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java index 1683521..285f13a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java @@ -10,29 +10,29 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.client; +package org.apache.activemq.tests.integration.client; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -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.ClientSession.QueueQuery; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.client.SessionFailureListener; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.CountDownSessionFailureListener; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQInternalErrorException; +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.ClientSession.QueueQuery; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.client.SessionFailureListener; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.CountDownSessionFailureListener; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/SimpleSendMultipleQueuesTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.java index 525cc5e..8b38a98 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SimpleSendMultipleQueuesTest.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.client; +package org.apache.activemq.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -18,15 +18,15 @@ 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.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; +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.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; /** * @author Tim Fox http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java index 0d037e3..d7499a9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.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.client; +package org.apache.activemq.tests.integration.client; import java.util.Arrays; import java.util.Collection; @@ -18,25 +18,25 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQObjectClosedException; -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.client.MessageHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.ManagementHelper; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQObjectClosedException; +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.client.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.ManagementHelper; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java index 022a971..ad52394 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java @@ -10,44 +10,44 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.client; +package org.apache.activemq.tests.integration.client; import java.util.Arrays; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQDisconnectedException; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQIOErrorException; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.HornetQNonExistentQueueException; -import org.apache.activemq6.api.core.Interceptor; -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.client.MessageHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientProducerImpl; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.protocol.core.impl.RemotingConnectionImpl; -import org.apache.activemq6.core.remoting.CloseListener; -import org.apache.activemq6.core.remoting.server.impl.RemotingServiceImpl; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.core.server.impl.ServerSessionImpl; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.SingleServerTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.HornetQDisconnectedException; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQIOErrorException; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.Interceptor; +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.client.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientProducerImpl; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.protocol.core.impl.RemotingConnectionImpl; +import org.apache.activemq.core.remoting.CloseListener; +import org.apache.activemq.core.remoting.server.impl.RemotingServiceImpl; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.core.server.impl.ServerSessionImpl; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.SingleServerTestBase; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.After; 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/client/TransactionDurabilityTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java index a920f33..95e9bb4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionDurabilityTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.client; +package org.apache.activemq.tests.integration.client; import org.junit.Test; import org.junit.Assert; -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.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -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.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java index 7c2f981..7f7f85f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransactionalSendTest.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.client; +package org.apache.activemq.tests.integration.client; -import org.apache.activemq6.api.core.SimpleString; -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.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.SimpleString; +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.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; 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/client/TransientQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java index 6425152..99dda29 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.client; - -import org.apache.activemq6.api.core.HornetQInvalidTransientQueueUseException; -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.client.ServerLocator; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.SingleServerTestBase; +package org.apache.activemq.tests.integration.client; + +import org.apache.activemq.api.core.HornetQInvalidTransientQueueUseException; +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.client.ServerLocator; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.SingleServerTestBase; 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/client/WildCardRoutingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java index a6ecac8..750be82 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.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.client; +package org.apache.activemq.tests.integration.client; import org.junit.Before; import org.junit.After; @@ -18,20 +18,20 @@ import org.junit.Test; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQException; -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.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.HornetQException; +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.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.tests.util.UnitTestCase; /** * @author Andy Taylor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java index 63bf74f..0b01d9d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientCrashTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.clientcrash; +package org.apache.activemq.tests.integration.clientcrash; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -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.client.ServerLocator; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.jms.client.HornetQTextMessage; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.SpawnedVMSupport; +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.client.ServerLocator; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.jms.client.HornetQTextMessage; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.SpawnedVMSupport; /** * A test that makes sure that a HornetQ server cleans up the associated http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java index b90cb0d..c12cdb6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientExitTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.clientcrash; +package org.apache.activemq.tests.integration.clientcrash; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -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.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.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.SpawnedVMSupport; +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.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.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.SpawnedVMSupport; /** * A test that makes sure that a HornetQ client gracefully exists after the last session is http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java index 5b120d5..416d961 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/ClientTestBase.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.clientcrash; +package org.apache.activemq.tests.integration.clientcrash; import org.junit.Before; import org.junit.Assert; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; /** * A ClientTestBase http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java index d10a4cb..e58bd53 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.clientcrash; +package org.apache.activemq.tests.integration.clientcrash; import java.util.Arrays; -import org.apache.activemq6.api.core.TransportConfiguration; -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.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.jms.client.HornetQTextMessage; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +import org.apache.activemq.api.core.TransportConfiguration; +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.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.jms.client.HornetQTextMessage; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** * Code to be run in an external VM, via main() http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java index c6b61c7..e3e8bd7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/CrashClient2.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.clientcrash; +package org.apache.activemq.tests.integration.clientcrash; import java.util.Arrays; -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.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +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.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** * Code to be run in an external VM, via main() http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java index 3104d59..c4e07ca 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.clientcrash; +package org.apache.activemq.tests.integration.clientcrash; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; -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.Interceptor; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** * @author Clebert Suconic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java index 8d663d5..45d722b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.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.clientcrash; +package org.apache.activemq.tests.integration.clientcrash; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.core.protocol.core.Packet; -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.Interceptor; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +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/clientcrash/GracefulClient.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java index a87484f..5b50b7b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/GracefulClient.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.clientcrash; - -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.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.jms.client.HornetQTextMessage; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; +package org.apache.activemq.tests.integration.clientcrash; + +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.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.jms.client.HornetQTextMessage; +import org.apache.activemq.tests.integration.IntegrationTestLogger; /** * Code to be run in an external VM, via main() http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java index bdcc552..b11567c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.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; +package org.apache.activemq.tests.integration.cluster; -import org.apache.activemq6.api.core.HornetQClusterSecurityException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.ServerLocatorImpl; -import org.apache.activemq6.core.server.cluster.ClusterControl; -import org.apache.activemq6.core.server.cluster.ClusterController; -import org.apache.activemq6.core.server.cluster.HornetQServerSideProtocolManagerFactory; -import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq.api.core.HornetQClusterSecurityException; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.core.server.cluster.ClusterControl; +import org.apache.activemq.core.server.cluster.ClusterController; +import org.apache.activemq.core.server.cluster.HornetQServerSideProtocolManagerFactory; +import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase; 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/NodeManagerAction.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.java index 092b044..f748ffb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerAction.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; +package org.apache.activemq.tests.integration.cluster; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.impl.FileLockNodeManager; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.impl.FileLockNodeManager; /** * @author Andy Taylor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java index cbfecc4..4511762 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/NodeManagerTest.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.cluster; +package org.apache.activemq.tests.integration.cluster; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.impl.InVMNodeManager; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.impl.InVMNodeManager; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Test; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.AWAIT_LIVE; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.CRASH_LIVE; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_BACKUP; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_LIVE; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.HAS_BACKUP; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.HAS_LIVE; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.PAUSE_LIVE; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.RELEASE_BACKUP; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.START_BACKUP; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.START_LIVE; -import static org.apache.activemq6.tests.integration.cluster.NodeManagerAction.STOP_BACKUP; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.AWAIT_LIVE; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.CRASH_LIVE; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_BACKUP; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.DOESNT_HAVE_LIVE; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.HAS_BACKUP; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.HAS_LIVE; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.PAUSE_LIVE; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.RELEASE_BACKUP; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.START_BACKUP; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.START_LIVE; +import static org.apache.activemq.tests.integration.cluster.NodeManagerAction.STOP_BACKUP; /** * @author Andy Taylor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java index 4a2cefd..835ae91 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/RealNodeManagerTest.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; +package org.apache.activemq.tests.integration.cluster; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.impl.FileLockNodeManager; -import org.apache.activemq6.tests.util.SpawnedVMSupport; -import org.apache.activemq6.utils.UUID; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.impl.FileLockNodeManager; +import org.apache.activemq.tests.util.SpawnedVMSupport; +import org.apache.activemq.utils.UUID; 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/bridge/BridgeFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java index ef18fd3..fa94757 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeFailoverTest.java @@ -10,22 +10,22 @@ * 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.List; -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.ServerLocator; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; -import org.apache.activemq6.tests.integration.cluster.util.MultiServerTestBase; +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.ServerLocator; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq.tests.integration.cluster.util.MultiServerTestBase; import org.junit.Test; /**