http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java index ce0e9b4..9d8ccda 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageAvoidLargeMessagesTest.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.client; - -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.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.util.UnitTestCase; +package org.apache.activemq.tests.integration.client; + +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.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.settings.impl.AddressSettings; +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/LargeMessageCompressTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.java index 26f8a24..2ef94dd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageCompressTest.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.File; import java.io.FileInputStream; @@ -20,16 +20,16 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.Message; -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.server.HornetQServer; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.api.core.Message; +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.server.HornetQServer; +import org.apache.activemq.tests.util.RandomUtil; 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/LargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java index 5bc369b..8e2737a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.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 javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -22,30 +22,30 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQBuffer; -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.HornetQClient; -import org.apache.activemq6.api.core.client.MessageHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientConsumerInternal; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; -import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -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.activemq6.tests.integration.largemessage.LargeMessageTestBase; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.HornetQBuffer; +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.HornetQClient; +import org.apache.activemq.api.core.client.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientConsumerInternal; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +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.apache.activemq.tests.integration.largemessage.LargeMessageTestBase; +import org.apache.activemq.tests.util.RandomUtil; +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/LibaioDependencyCheckTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.java index bd3df92..fd84269 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LibaioDependencyCheckTest.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.client; +package org.apache.activemq.tests.integration.client; import org.junit.Test; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.tests.util.UnitTestCase; /** * This tests is placed in duplication here to validate that the libaio module is properly loaded on this http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java index c17c3a5..fbd9f6b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConcurrencyTest.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 java.util.HashSet; import java.util.Set; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -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.RandomUtil; -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.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; 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/client/MessageConsumerRollbackTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.java index cb3186c..7908482 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageConsumerRollbackTest.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 java.util.HashSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -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.core.settings.impl.AddressSettings; -import org.apache.activemq6.jms.client.HornetQTextMessage; -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.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.jms.client.HornetQTextMessage; +import org.apache.activemq.tests.util.ServiceTestBase; 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/client/MessageCounterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.java index 2a7461b..6eaf0de 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageCounterTest.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; +package org.apache.activemq.tests.integration.client; import org.junit.Before; import org.junit.Test; 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.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; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java index 397cda8..6baf461 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.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.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQNonExistentQueueException; -import org.apache.activemq6.api.core.SimpleString; -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.server.HornetQServer; -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.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.SimpleString; +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.server.HornetQServer; +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.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/MessageExpirationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java index 6ee5ffc..fe1cbc7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageExpirationTest.java @@ -10,26 +10,26 @@ * 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; 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.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -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.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.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; /** * A MessageExpirationTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java index d0fb393..b44539b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.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; @@ -21,22 +21,22 @@ import java.util.concurrent.TimeUnit; 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.MessageHandler; -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.ServiceTestBase; -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.MessageHandler; +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.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java index 6d94bb2..7a43637 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.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.Assume; import org.junit.Before; @@ -25,24 +25,24 @@ import javax.transaction.xa.Xid; import org.junit.Assert; -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.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.MessageHandler; -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.core.transaction.impl.XidImpl; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.UnitTestCase; +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.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.MessageHandler; +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.core.transaction.impl.XidImpl; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.UnitTestCase; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java index 12cbfe2..45313e6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageHandlerTest.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 <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java index 6ce162a..1f808cc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessagePriorityTest.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; - -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.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -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.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.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +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.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/MessageRateTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.java index d057fa1..b03d827 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageRateTest.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; +package org.apache.activemq.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -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.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.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/MultipleThreadFilterOneTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java index 11751da..3faec6c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.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 java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQException; -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.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQException; +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.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.ServiceTestBase; /** * Multiple Threads producing Messages, with Multiple Consumers with different queues, each queue with a different filter http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java index c1c9ca8..2a1985d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NIOvsOIOTest.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.Test; @@ -20,25 +20,25 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; -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.MessageHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.config.Configuration; -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.settings.HierarchicalRepository; -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.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.UUIDGenerator; +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.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.config.Configuration; +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.settings.HierarchicalRepository; +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.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.UUIDGenerator; public class NIOvsOIOTest extends UnitTestCase { @@ -151,7 +151,7 @@ public class NIOvsOIOTest extends UnitTestCase private void testPerf(boolean nio) throws Exception { - String acceptorFactoryClassName = "org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory"; + String acceptorFactoryClassName = "org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory"; Configuration conf = createDefaultConfig() .setSecurityEnabled(false); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java index 912b2a7..8daf866 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConnectorTest.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; +package org.apache.activemq.tests.integration.client; import io.netty.bootstrap.Bootstrap; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnector; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; 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/client/NettyConsumerWindowSizeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.java index db44b83..2084b68 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyConsumerWindowSizeTest.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; /** * A NettyConsumerWindowSizeTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java index 7b9b7d9..6aa0881 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyNonPersistentMessageBufferTest.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; /** * A NettyNonPersistentMessageBufferTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java index c9eeb38..0dd9f7e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyPersistentMessageBufferTest.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; /** * A NettyPersistentMessageBufferTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java index cf0fcc9..e879ec2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NettyProducerFlowControlTest.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; /** * A NettyProducerFlowControlTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java index ec5eaa8..d9604e2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.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,21 +18,21 @@ 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.core.settings.impl.AddressSettings; -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.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.UnitTestCase; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java index 1f82725..be84d82 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/OrderTest.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.client; +package org.apache.activemq.tests.integration.client; import java.util.Arrays; import java.util.Collection; -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.core.settings.impl.AddressSettings; -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.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/PagingOrderTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java index fd423cb..009b55f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.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 javax.jms.BytesMessage; import javax.jms.Connection; @@ -23,31 +23,31 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQBuffer; -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.ServerLocator; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -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.jms.client.HornetQJMSConnectionFactory; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQBuffer; +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.ServerLocator; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.Bindings; +import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +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.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.ServiceTestBase; 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/client/PagingSyncTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java index 910551e..2e9f0c4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.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; +package org.apache.activemq.tests.integration.client; import java.nio.ByteBuffer; import java.util.HashMap; -import org.apache.activemq6.api.core.HornetQBuffer; -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.ServerLocator; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQBuffer; +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.ServerLocator; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.ServiceTestBase; 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/PagingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java index da7b611..5f1a745 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.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 javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -29,49 +29,49 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; 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.HornetQExceptionType; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.Pair; -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.ClientConsumerInternal; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.cursor.PageCursorProvider; -import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.persistence.OperationContext; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; -import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.AckDescribe; -import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -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.activemq6.tests.logging.AssertionLoggerHandler; -import org.apache.activemq6.tests.util.ServiceTestBase; -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.HornetQExceptionType; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.Pair; +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.ClientConsumerInternal; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.persistence.OperationContext; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; +import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.AckDescribe; +import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +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.apache.activemq.tests.logging.AssertionLoggerHandler; +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/ProducerCloseTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java index afad754..a63ba53 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java @@ -10,26 +10,26 @@ * 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; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.TransportConfiguration; -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.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; -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.TransportConfiguration; +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.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java index 61d82b5..131b6e4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.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.ArrayList; import java.util.Iterator; @@ -19,27 +19,27 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -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.core.client.impl.ClientProducerCreditManagerImpl; -import org.apache.activemq6.core.client.impl.ClientProducerCredits; -import org.apache.activemq6.core.client.impl.ClientProducerInternal; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.settings.HierarchicalRepository; -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.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; +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.core.client.impl.ClientProducerCreditManagerImpl; +import org.apache.activemq.core.client.impl.ClientProducerCredits; +import org.apache.activemq.core.client.impl.ClientProducerInternal; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.settings.HierarchicalRepository; +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.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.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/ProducerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java index a3ac4be..20906f4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.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.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.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.ServerLocator; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -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.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.ServiceTestBase; +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.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.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +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.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/QueueBrowserTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java index b04e1b4..660d220 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/QueueBrowserTest.java @@ -10,23 +10,23 @@ * 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; 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.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.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.core.server.Queue; +import org.apache.activemq.tests.util.ServiceTestBase; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java index 86d3392..0a9622b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveImmediateTest.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; @@ -19,18 +19,18 @@ import java.util.concurrent.atomic.AtomicBoolean; 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.config.Configuration; -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.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.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.tests.util.ServiceTestBase; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java index 7fd4786..e8fc3ba 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.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.HornetQException; -import org.apache.activemq6.api.core.HornetQIllegalStateException; -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.core.server.HornetQServer; -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.HornetQIllegalStateException; +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.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/RedeliveryConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java index b495a64..c17095b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.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.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQException; -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.config.Configuration; -import org.apache.activemq6.core.journal.LoaderCallback; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; -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.HornetQException; +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.config.Configuration; +import org.apache.activemq.core.journal.LoaderCallback; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test;
