http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/JMSBridgeReconnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/JMSBridgeReconnectionTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/JMSBridgeReconnectionTest.java index ccea710..768eb51 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/JMSBridgeReconnectionTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/JMSBridgeReconnectionTest.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; -import org.apache.activemq6.core.client.impl.ClientProducerCredits; -import org.apache.activemq6.core.message.impl.MessageInternal; -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.wireformat.SessionSendMessage; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; -import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.tests.integration.jms.bridge.BridgeTestBase; +import org.apache.activemq.core.client.impl.ClientProducerCredits; +import org.apache.activemq.core.message.impl.MessageInternal; +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.wireformat.SessionSendMessage; +import org.apache.activemq.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq.jms.bridge.QualityOfServiceMode; +import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.tests.integration.jms.bridge.BridgeTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -42,18 +42,18 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase @BMRule ( name = "trace clientsessionimpl send", - targetClass = "org.apache.activemq6.core.protocol.core.impl.ChannelImpl", + targetClass = "org.apache.activemq.core.protocol.core.impl.ChannelImpl", targetMethod = "send", targetLocation = "ENTRY", - action = "org.apache.activemq6.byteman.tests.JMSBridgeReconnectionTest.pause($1);" + action = "org.apache.activemq.byteman.tests.JMSBridgeReconnectionTest.pause($1);" ), @BMRule ( name = "trace sendRegularMessage", - targetClass = "org.apache.activemq6.core.client.impl.ClientProducerImpl", + targetClass = "org.apache.activemq.core.client.impl.ClientProducerImpl", targetMethod = "sendRegularMessage", targetLocation = "ENTRY", - action = "org.apache.activemq6.byteman.tests.JMSBridgeReconnectionTest.pause2($1,$2,$3);" + action = "org.apache.activemq.byteman.tests.JMSBridgeReconnectionTest.pause2($1,$2,$3);" ) } )
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/LatencyTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/LatencyTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/LatencyTest.java index 1994248..56d4eaf 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/LatencyTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/LatencyTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; -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.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.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java index b89b359..fc32ddb 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.tests.util.RandomUtil; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -43,7 +43,7 @@ public class MessageCopyTest @BMRule ( name = "message-copy0", - targetClass = "org.apache.activemq6.core.server.impl.ServerMessageImpl", + targetClass = "org.apache.activemq.core.server.impl.ServerMessageImpl", targetMethod = "copy()", targetLocation = "ENTRY", action = "System.out.println(\"copy\"), waitFor(\"encode-done\")" @@ -51,15 +51,15 @@ public class MessageCopyTest @BMRule ( name = "message-copy-done", - targetClass = "org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage", - targetMethod = "encode(org.apache.activemq6.spi.core.protocol.RemotingConnection)", + targetClass = "org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage", + targetMethod = "encode(org.apache.activemq.spi.core.protocol.RemotingConnection)", targetLocation = "EXIT", action = "System.out.println(\"encodeDone\"), signalWake(\"encode-done\", true)" ), @BMRule ( name = "message-copy1", - targetClass = "org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper", + targetClass = "org.apache.activemq.core.buffers.impl.ChannelBufferWrapper", targetMethod = "copy(int, int)", condition = "Thread.currentThread().getName().equals(\"T1\")", targetLocation = "EXIT", @@ -67,7 +67,7 @@ public class MessageCopyTest ), @BMRule( name = "JMSServer.stop wait-init", - targetClass = "org.apache.activemq6.byteman.tests.MessageCopyTest", + targetClass = "org.apache.activemq.byteman.tests.MessageCopyTest", targetMethod = "simulateRead", targetLocation = "EXIT", action = "signalWake(\"finish-read\", true)" http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/OrphanedConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/OrphanedConsumerTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/OrphanedConsumerTest.java index 68101bc..7cfbdf9 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/OrphanedConsumerTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/OrphanedConsumerTest.java @@ -11,19 +11,19 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; - - -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.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.tests.util.ServiceTestBase; +package org.apache.activemq.byteman.tests; + + +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.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -126,20 +126,20 @@ public class OrphanedConsumerTest extends ServiceTestBase @BMRule ( name = "closeExit", - targetClass = "org.apache.activemq6.core.server.impl.ServerConsumerImpl", + targetClass = "org.apache.activemq.core.server.impl.ServerConsumerImpl", targetMethod = "close", targetLocation = "AT EXIT", - condition = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.isConditionActive()", + condition = "org.apache.activemq.byteman.tests.OrphanedConsumerTest.isConditionActive()", action = "System.out.println(\"throwing stuff\");throw new InterruptedException()" ), @BMRule ( name = "closeEnter", - targetClass = "org.apache.activemq6.core.server.impl.ServerConsumerImpl", + targetClass = "org.apache.activemq.core.server.impl.ServerConsumerImpl", targetMethod = "close", targetLocation = "ENTRY", - condition = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.isConditionActive()", - action = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()" + condition = "org.apache.activemq.byteman.tests.OrphanedConsumerTest.isConditionActive()", + action = "org.apache.activemq.byteman.tests.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()" ) } @@ -165,20 +165,20 @@ public class OrphanedConsumerTest extends ServiceTestBase @BMRule ( name = "closeExit", - targetClass = "org.apache.activemq6.core.server.impl.ServerConsumerImpl", + targetClass = "org.apache.activemq.core.server.impl.ServerConsumerImpl", targetMethod = "close", targetLocation = "AT EXIT", - condition = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.isConditionActive()", + condition = "org.apache.activemq.byteman.tests.OrphanedConsumerTest.isConditionActive()", action = "System.out.println(\"throwing stuff\");throw new InterruptedException()" ), @BMRule ( name = "closeEnter", - targetClass = "org.apache.activemq6.core.server.impl.ServerConsumerImpl", + targetClass = "org.apache.activemq.core.server.impl.ServerConsumerImpl", targetMethod = "close", targetLocation = "ENTRY", - condition = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.isConditionActive()", - action = "org.apache.activemq6.byteman.tests.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()" + condition = "org.apache.activemq.byteman.tests.OrphanedConsumerTest.isConditionActive()", + action = "org.apache.activemq.byteman.tests.OrphanedConsumerTest.leavingCloseOnTestCountersWhileClosing()" ) } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/PagingLeakTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/PagingLeakTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/PagingLeakTest.java index 9bba2e4..a99b63c 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/PagingLeakTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/PagingLeakTest.java @@ -11,27 +11,27 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -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.core.config.Configuration; -import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -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.ServerLocator; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -70,18 +70,18 @@ public class PagingLeakTest extends ServiceTestBase @BMRule ( name = "newPosition", - targetClass = "org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl", + targetClass = "org.apache.activemq.core.paging.cursor.impl.PagePositionImpl", targetMethod = "<init>()", targetLocation = "ENTRY", - action = "org.apache.activemq6.byteman.tests.PagingLeakTest.newPosition()" + action = "org.apache.activemq.byteman.tests.PagingLeakTest.newPosition()" ), @BMRule ( name = "finalPosition", - targetClass = "org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl", + targetClass = "org.apache.activemq.core.paging.cursor.impl.PagePositionImpl", targetMethod = "finalize", targetLocation = "ENTRY", - action = "org.apache.activemq6.byteman.tests.PagingLeakTest.deletePosition()" + action = "org.apache.activemq.byteman.tests.PagingLeakTest.deletePosition()" ) } ) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailoverTest.java index 74969f9..dcc323b 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailoverTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailoverTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; - -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.core.config.ScaleDownConfiguration; -import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +package org.apache.activemq.byteman.tests; + +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.core.config.ScaleDownConfiguration; +import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.After; @@ -96,11 +96,11 @@ public class ScaleDownFailoverTest extends ClusterTestBase @BMRule ( name = "blow-up", - targetClass = "org.apache.activemq6.api.core.client.ServerLocator", - targetMethod = "createSessionFactory(org.apache.activemq6.api.core.TransportConfiguration, int, boolean)", + targetClass = "org.apache.activemq.api.core.client.ServerLocator", + targetMethod = "createSessionFactory(org.apache.activemq.api.core.TransportConfiguration, int, boolean)", isInterface = true, targetLocation = "ENTRY", - action = "org.apache.activemq6.byteman.tests.ScaleDownFailoverTest.fail($1);" + action = "org.apache.activemq.byteman.tests.ScaleDownFailoverTest.fail($1);" ) public void testScaleDownWhenFirstServerFails() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailureTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailureTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailureTest.java index f109933..1896e43 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailureTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownFailureTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.core.config.ScaleDownConfiguration; -import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq6.tests.integration.cluster.distribution.ClusterTestBase; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.core.config.ScaleDownConfiguration; +import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.tests.integration.cluster.distribution.ClusterTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; import org.junit.After; @@ -74,8 +74,8 @@ public class ScaleDownFailureTest extends ClusterTestBase @BMRule ( name = "blow-up", - targetClass = "org.apache.activemq6.api.core.client.ServerLocator", - targetMethod = "createSessionFactory(org.apache.activemq6.api.core.TransportConfiguration, int, boolean)", + targetClass = "org.apache.activemq.api.core.client.ServerLocator", + targetMethod = "createSessionFactory(org.apache.activemq.api.core.TransportConfiguration, int, boolean)", isInterface = true, targetLocation = "ENTRY", action = "throw new Exception()" http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailoverTest.java index 83c0b2e..c46b06b 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailoverTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailoverTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; public class ScaleDownGroupedFailoverTest extends ScaleDownFailoverTest { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailureTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailureTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailureTest.java index 7e51c6a..edbd405 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailureTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ScaleDownGroupedFailureTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; public class ScaleDownGroupedFailureTest extends ScaleDownFailureTest { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StartStopDeadlockTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StartStopDeadlockTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StartStopDeadlockTest.java index 58ce3fd..f7aa15b 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StartStopDeadlockTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StartStopDeadlockTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -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.TransportConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +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.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -51,7 +51,7 @@ public class StartStopDeadlockTest extends ServiceTestBase @BMRule ( name = "Server.start wait-init", - targetClass = "org.apache.activemq6.core.server.impl.HornetQServerImpl", + targetClass = "org.apache.activemq.core.server.impl.HornetQServerImpl", targetMethod = "initialisePart2", targetLocation = "ENTRY", condition = "incrementCounter(\"server-Init\") == 2", @@ -59,14 +59,14 @@ public class StartStopDeadlockTest extends ServiceTestBase ), @BMRule( name = "JMSServer.stop wait-init", - targetClass = "org.apache.activemq6.jms.server.impl.JMSServerManagerImpl", + targetClass = "org.apache.activemq.jms.server.impl.JMSServerManagerImpl", targetMethod = "stop", targetLocation = "ENTRY", action = "signalWake(\"start-init\", true)" ), @BMRule( name = "StartStopDeadlockTest tearDown", - targetClass = "org.apache.activemq6.byteman.tests.StartStopDeadlockTest", + targetClass = "org.apache.activemq.byteman.tests.StartStopDeadlockTest", targetMethod = "tearDown", targetLocation = "ENTRY", action = "deleteCounter(\"server-Init\")" http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StompInternalStateTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StompInternalStateTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StompInternalStateTest.java index aad3ccb..d2972a2 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StompInternalStateTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/StompInternalStateTest.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.byteman.tests; +package org.apache.activemq.byteman.tests; import java.util.HashMap; import java.util.Map; import java.util.Set; -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.ServerLocator; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.protocol.stomp.StompProtocolManagerFactory; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.management.Notification; -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.ServerLocator; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.tests.util.ServiceTestBase; import org.jboss.byteman.contrib.bmunit.BMRule; import org.jboss.byteman.contrib.bmunit.BMRules; import org.jboss.byteman.contrib.bmunit.BMUnitRunner; @@ -54,10 +54,10 @@ public class StompInternalStateTest extends ServiceTestBase @BMRule ( name = "StompProtocolManager Leak Server Rule", - targetClass = "org.apache.activemq6.core.protocol.stomp.StompProtocolManager", - targetMethod = "onNotification(org.apache.activemq6.core.server.management.Notification)", + targetClass = "org.apache.activemq.core.protocol.stomp.StompProtocolManager", + targetMethod = "onNotification(org.apache.activemq.core.server.management.Notification)", targetLocation = "EXIT", - helper = "org.apache.activemq6.byteman.tests.StompInternalStateTest", + helper = "org.apache.activemq.byteman.tests.StompInternalStateTest", action = "verifyBindingAddRemove($1, $0.destinations)" ) } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/byteman-tests/src/test/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepositoryTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepositoryTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepositoryTest.java index 378cf3f..aaeb272 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepositoryTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepositoryTest.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.core.settings.impl; +package org.apache.activemq.core.settings.impl; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -31,9 +31,9 @@ import org.junit.runner.RunWith; @RunWith(BMUnitRunner.class) @BMRules(rules = { @BMRule(name = "modify map during iteration", - targetClass = "org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository", + targetClass = "org.apache.activemq.core.settings.impl.HierarchicalObjectRepository", targetMethod = "getPossibleMatches(String)", targetLocation = "AT INVOKE java.util.HashMap.put", - action = "org.apache.activemq6.core.settings.impl.HierarchicalObjectRepositoryTest.bum()"), }) + action = "org.apache.activemq.core.settings.impl.HierarchicalObjectRepositoryTest.bum()"), }) public class HierarchicalObjectRepositoryTest { private static final String A = "a."; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/concurrent-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/concurrent-tests/pom.xml b/tests/concurrent-tests/pom.xml index add388b..481876e 100644 --- a/tests/concurrent-tests/pom.xml +++ b/tests/concurrent-tests/pom.xml @@ -15,8 +15,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.tests</groupId> - <artifactId>activemq6-tests-pom</artifactId> + <groupId>org.apache.activemq.tests</groupId> + <artifactId>activemq-tests-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> @@ -30,46 +30,46 @@ <dependencies> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-core-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> - <groupId>org.apache.activemq6.tests</groupId> + <groupId>org.apache.activemq.tests</groupId> <artifactId>unit-tests</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> - <groupId>org.apache.activemq6.tests</groupId> + <groupId>org.apache.activemq.tests</groupId> <artifactId>integration-tests</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-ra</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-ra</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-bootstrap</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-bootstrap</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/server/impl/QueueTest.java ---------------------------------------------------------------------- diff --git a/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/server/impl/QueueTest.java b/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/server/impl/QueueTest.java index 1e1c448..3abfebd 100644 --- a/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/server/impl/QueueTest.java +++ b/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/server/impl/QueueTest.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.concurrent.server.impl; +package org.apache.activemq.tests.concurrent.server.impl; import org.junit.Before; import org.junit.After; @@ -19,16 +19,16 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.HandleStatus; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.QueueImpl; -import org.apache.activemq6.tests.unit.UnitTestLogger; -import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeConsumer; -import org.apache.activemq6.tests.unit.core.server.impl.fakes.FakeQueueFactory; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.HandleStatus; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.QueueImpl; +import org.apache.activemq.tests.unit.UnitTestLogger; +import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeConsumer; +import org.apache.activemq.tests.unit.core.server.impl.fakes.FakeQueueFactory; +import org.apache.activemq.tests.util.UnitTestCase; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/stomp/ConcurrentStompTest.java ---------------------------------------------------------------------- diff --git a/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/stomp/ConcurrentStompTest.java b/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/stomp/ConcurrentStompTest.java index 097be68..4e43f2e 100644 --- a/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/stomp/ConcurrentStompTest.java +++ b/tests/concurrent-tests/src/test/java/org/apache/activemq/tests/concurrent/stomp/ConcurrentStompTest.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.concurrent.stomp; +package org.apache.activemq.tests.concurrent.stomp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -21,8 +21,8 @@ import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.core.protocol.stomp.Stomp; -import org.apache.activemq6.tests.integration.stomp.StompTestBase; +import org.apache.activemq.core.protocol.stomp.Stomp; +import org.apache.activemq.tests.integration.stomp.StompTestBase; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/config/logging.properties ---------------------------------------------------------------------- diff --git a/tests/config/logging.properties b/tests/config/logging.properties index dd71a20..e0fe0f4 100644 --- a/tests/config/logging.properties +++ b/tests/config/logging.properties @@ -22,19 +22,19 @@ # Additional logger names to configure (root logger is always configured) # Root logger option -loggers=org.jboss.logging,org.apache.activemq6.core.server,org.apache.activemq6.utils,org.apache.activemq6.journal,org.apache.activemq6.jms,org.apache.activemq6.ra,org.apache.activemq6.tests.unit,org.apache.activemq6.tests.integration,org.apache.activemq6.jms.tests +loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms,org.apache.activemq.ra,org.apache.activemq.tests.unit,org.apache.activemq.tests.integration,org.apache.activemq.jms.tests # Root logger level logger.level=INFO # HornetQ logger levels -logger.org.apache.activemq6.core.server.level=INFO -logger.org.apache.activemq6.journal.level=INFO -logger.org.apache.activemq6.utils.level=INFO -logger.org.apache.activemq6.jms.level=INFO -logger.org.apache.activemq6.ra.level=INFO -logger.org.apache.activemq6.tests.unit.level=INFO -logger.org.apache.activemq6.tests.integration.level=DEBUG -logger.org.apache.activemq6.jms.tests.level=INFO +logger.org.apache.activemq.core.server.level=INFO +logger.org.apache.activemq.journal.level=INFO +logger.org.apache.activemq.utils.level=INFO +logger.org.apache.activemq.jms.level=INFO +logger.org.apache.activemq.ra.level=INFO +logger.org.apache.activemq.tests.unit.level=INFO +logger.org.apache.activemq.tests.integration.level=DEBUG +logger.org.apache.activemq.jms.tests.level=INFO # Root logger handlers logger.handlers=CONSOLE,TEST @@ -56,7 +56,7 @@ handler.FILE.fileName=target/hornetq.log handler.FILE.formatter=PATTERN # Console handler configuration -handler.TEST=org.apache.activemq6.tests.logging.AssertionLoggerHandler +handler.TEST=org.apache.activemq.tests.logging.AssertionLoggerHandler handler.TEST.level=TRACE handler.TEST.formatter=PATTERN http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/config/logging.properties.trace ---------------------------------------------------------------------- diff --git a/tests/config/logging.properties.trace b/tests/config/logging.properties.trace index b054e39..fa38040 100644 --- a/tests/config/logging.properties.trace +++ b/tests/config/logging.properties.trace @@ -24,19 +24,19 @@ # Additional logger names to configure (root logger is always configured) # Root logger option -loggers=org.jboss.logging,org.apache.activemq6.core.server,org.apache.activemq6.utils,org.apache.activemq6.journal,org.apache.activemq6.jms,org.apache.activemq6.ra,org.apache.activemq6.tests.unit,org.apache.activemq6.tests.integration,org.apache.activemq6.jms.tests +loggers=org.jboss.logging,org.apache.activemq.core.server,org.apache.activemq.utils,org.apache.activemq.journal,org.apache.activemq.jms,org.apache.activemq.ra,org.apache.activemq.tests.unit,org.apache.activemq.tests.integration,org.apache.activemq.jms.tests # Root logger level logger.level=INFO # HornetQ logger levels -logger.org.apache.activemq6.core.server.level=TRACE -logger.org.apache.activemq6.journal.level=INFO -logger.org.apache.activemq6.utils.level=INFO -logger.org.apache.activemq6.jms.level=INFO -logger.org.apache.activemq6.ra.level=INFO -logger.org.apache.activemq6.tests.unit.level=INFO -logger.org.apache.activemq6.tests.integration.level=INFO -logger.org.apache.activemq6.jms.tests.level=INFO +logger.org.apache.activemq.core.server.level=TRACE +logger.org.apache.activemq.journal.level=INFO +logger.org.apache.activemq.utils.level=INFO +logger.org.apache.activemq.jms.level=INFO +logger.org.apache.activemq.ra.level=INFO +logger.org.apache.activemq.tests.unit.level=INFO +logger.org.apache.activemq.tests.integration.level=INFO +logger.org.apache.activemq.jms.tests.level=INFO # Root logger handlers logger.handlers=CONSOLE,TEST @@ -58,7 +58,7 @@ handler.FILE.fileName=target/hornetq.log handler.FILE.formatter=PATTERN # Console handler configuration -handler.TEST=org.apache.activemq6.tests.logging.AssertionLoggerHandler +handler.TEST=org.apache.activemq.tests.logging.AssertionLoggerHandler handler.TEST.level=TRACE handler.TEST.formatter=PATTERN http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/config/server-start-stop-backup-config1.xml ---------------------------------------------------------------------- diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml index bf822a6..f850b94 100644 --- a/tests/config/server-start-stop-backup-config1.xml +++ b/tests/config/server-start-stop-backup-config1.xml @@ -11,7 +11,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -19,7 +19,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/config/server-start-stop-live-config1.xml ---------------------------------------------------------------------- diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml index 1926b89..ce029a9 100644 --- a/tests/config/server-start-stop-live-config1.xml +++ b/tests/config/server-start-stop-live-config1.xml @@ -11,12 +11,12 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> <connector name="backup-connector"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -24,7 +24,7 @@ <!-- Acceptors --> <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml index fbf412a..10448c2 100644 --- a/tests/integration-tests/pom.xml +++ b/tests/integration-tests/pom.xml @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6.tests</groupId> - <artifactId>activemq6-tests-pom</artifactId> + <groupId>org.apache.activemq.tests</groupId> + <artifactId>activemq-tests-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> @@ -19,94 +19,94 @@ <dependencies> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> - <groupId>org.apache.activemq6.tests</groupId> + <groupId>org.apache.activemq.tests</groupId> <artifactId>unit-tests</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-core-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-ra</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-ra</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-bootstrap</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-bootstrap</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-commons</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-tools</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-tools</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-twitter-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-twitter-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-spring-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-spring-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-vertx-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-vertx-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-journal</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-journal</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-amqp-protocol</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-amqp-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-stomp-protocol</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-stomp-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-openwire-protocol</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-openwire-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-aerogear-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-aerogear-integration</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -254,7 +254,7 @@ <skipTests>${skipIntegrationTests}</skipTests> <excludes> <exclude>**/ReplicatedJMSFailoverTest.java</exclude> - <exclude>org.apache.activemq6/tests/util/*.java</exclude> + <exclude>org.apache.activemq/tests/util/*.java</exclude> </excludes> <argLine>-Djgroups.bind_addr=::1 ${hornetq-surefire-argline}</argLine> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java index 83e9be9..7775729 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration; +package org.apache.activemq.tests.integration; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQDuplicateIdException; -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.ServerLocator; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.postoffice.impl.PostOfficeImpl; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.transaction.impl.XidImpl; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.HornetQDuplicateIdException; +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.ServerLocator; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.postoffice.impl.PostOfficeImpl; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.transaction.impl.XidImpl; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.UUIDGenerator; 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/IntegrationTestLogger.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java index 7a1a816..0e62ca0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/IntegrationTestLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration; +package org.apache.activemq.tests.integration; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java index db7d859..8f4c826 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java @@ -10,34 +10,34 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.Interceptor; -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.client.impl.ClientConsumerImpl; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.ServerSessionPacketHandler; -import org.apache.activemq6.core.protocol.core.impl.ChannelImpl; -import org.apache.activemq6.core.protocol.core.impl.PacketImpl; -import org.apache.activemq6.core.protocol.core.impl.RemotingConnectionImpl; -import org.apache.activemq6.core.protocol.core.impl.wireformat.CreateQueueMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.MessagePacket; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveMessage; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.ServiceTestBase; +package org.apache.activemq.tests.integration; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.Interceptor; +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.client.impl.ClientConsumerImpl; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.ServerSessionPacketHandler; +import org.apache.activemq.core.protocol.core.impl.ChannelImpl; +import org.apache.activemq.core.protocol.core.impl.PacketImpl; +import org.apache.activemq.core.protocol.core.impl.RemotingConnectionImpl; +import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.MessagePacket; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.ServerMessage; +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/SimpleNotificationService.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.java index 5f2c518..31bbfa2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/SimpleNotificationService.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; +package org.apache.activemq.tests.integration; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.server.management.NotificationListener; -import org.apache.activemq6.core.server.management.NotificationService; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.server.management.NotificationListener; +import org.apache.activemq.core.server.management.NotificationService; /** * A SimpleNotificationService http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java index cfae5a6..018a900 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/String64KLimitTest.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; +package org.apache.activemq.tests.integration; 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.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.core.config.Configuration; -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.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.core.config.Configuration; +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; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java index 33da2ae..65eb413 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/aerogear/AeroGearBasicServerTest.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.aerogear; +package org.apache.activemq.tests.integration.aerogear; import javax.servlet.ServletException; @@ -21,27 +21,27 @@ import java.util.HashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.Message; -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.SendAcknowledgementHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.ConnectorServiceConfiguration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.integration.aerogear.AeroGearConnectorServiceFactory; -import org.apache.activemq6.integration.aerogear.AeroGearConstants; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONException; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.Message; +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.SendAcknowledgementHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.ConnectorServiceConfiguration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory; +import org.apache.activemq.integration.aerogear.AeroGearConstants; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONException; +import org.apache.activemq.utils.json.JSONObject; 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/AckBatchSizeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.java index 6525823..82327f9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AckBatchSizeTest.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.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; +package org.apache.activemq.tests.integration.client; + +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; 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/AcknowledgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java index ad5c8bb..3725966 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java @@ -10,33 +10,33 @@ * 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.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQPropertyConversionException; -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.MessageHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.protocol.core.impl.HornetQConsumerContext; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.spi.core.remoting.ConsumerContext; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.utils.UUID; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQPropertyConversionException; +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.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.protocol.core.impl.HornetQConsumerContext; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.spi.core.remoting.ConsumerContext; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.utils.UUID; 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/AddressSettingsTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.java index 17604fe..80b0438 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AddressSettingsTest.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.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.HierarchicalRepository; -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.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.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.ServiceTestBase; 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/AutoCloseCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.java index c2ecd06..e8e569c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCloseCoreTest.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.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.SingleServerTestBase; +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.SingleServerTestBase; 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/AutogroupIdTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java index 3523186..001993e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.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 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.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.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.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; 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/BlockingSendTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.java index 93cbae3..853a518 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/BlockingSendTest.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; - -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; +package org.apache.activemq.tests.integration.client; + +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.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/CommitRollbackTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java index 6dc6e63..01ca85b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.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 java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -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.MessageHandler; -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.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.MessageHandler; +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.Test;
