http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java index 5b6cca7..9be3281 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.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.jms.connection; +package org.apache.activemq.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; @@ -23,19 +23,19 @@ import javax.jms.Session; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQSession; -import org.apache.activemq6.jms.client.HornetQTemporaryTopic; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQSession; +import org.apache.activemq.jms.client.HornetQTemporaryTopic; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.JMSTestBase; /** * @author <a href="mailto:[email protected]";>Tim Fox</a>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java index db43eb9..dd2275b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConcurrentSessionCloseTest.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.jms.connection; +package org.apache.activemq.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; @@ -21,11 +21,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.jms.Connection; import javax.jms.Session; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.tests.util.JMSTestBase; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java index 4450042..cb8e959 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactorySerializationTest.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.jms.connection; +package org.apache.activemq.tests.integration.jms.connection; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,11 +23,11 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -93,7 +93,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase { cf = (HornetQConnectionFactory) namingContext.lookup("/MyConnectionFactory"); - // apparently looking up the connection factory with the org.apache.activemq6.jms.tests.tools.container.InVMInitialContextFactory + // apparently looking up the connection factory with the org.apache.activemq.jms.tests.tools.container.InVMInitialContextFactory // is not enough to actually serialize it so we serialize it manually byte[] x = serialize(cf); HornetQConnectionFactory y = deserialize(x, HornetQConnectionFactory.class); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java index 4002c10..fdc1951 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.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.jms.connection; +package org.apache.activemq.tests.integration.jms.connection; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -21,12 +21,12 @@ import java.io.Serializable; import javax.jms.Queue; -import org.apache.activemq6.api.core.BroadcastEndpointFactoryConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.JGroupsBroadcastGroupConfiguration; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.BroadcastEndpointFactoryConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.JGroupsBroadcastGroupConfiguration; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.tests.util.JMSTestBase; import org.jgroups.JChannel; import org.jgroups.conf.PlainConfigurator; import org.junit.After; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java index 2b9e9ea..860da7d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.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.jms.connection; +package org.apache.activemq.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; @@ -26,20 +26,20 @@ import javax.jms.Session; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQInternalErrorException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.client.impl.ClientSessionInternal; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.jms.client.HornetQConnection; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQSession; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.integration.jms.server.management.NullInitialContext; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.client.impl.ClientSessionInternal; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.jms.client.HornetQConnection; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQSession; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.integration.jms.server.management.NullInitialContext; +import org.apache.activemq.tests.util.UnitTestCase; /** * @@ -66,13 +66,13 @@ public class ExceptionListenerTest extends UnitTestCase super.setUp(); Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory")); server = addServer(HornetQServers.newHornetQServer(conf, false)); jmsServer = new JMSServerManagerImpl(server); jmsServer.setContext(new NullInitialContext()); jmsServer.start(); jmsServer.createQueue(false, ExceptionListenerTest.Q_NAME, null, true, ExceptionListenerTest.Q_NAME); - cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); + cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java index 803b6e5..19ed7f0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/InvalidConnectorTest.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.jms.connection; +package org.apache.activemq.tests.integration.jms.connection; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.tests.util.JMSTestBase; import java.net.InetAddress; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java index 4a5e2b4..307cbf3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/consumer/ConsumerTest.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.jms.consumer; +package org.apache.activemq.tests.integration.jms.consumer; import javax.jms.Connection; import javax.jms.JMSConsumer; @@ -28,17 +28,17 @@ import javax.jms.TextMessage; import java.util.Enumeration; 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.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.JMSTestBase; -import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.HornetQJMSConstants; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.JMSTestBase; +import org.apache.activemq.utils.ReusableLatch; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -75,7 +75,7 @@ public class ConsumerTest extends JMSTestBase jmsServer.createQueue(false, ConsumerTest.Q_NAME, null, true, ConsumerTest.Q_NAME); jmsServer.createTopic(true, T_NAME, "/topic/" + T_NAME); jmsServer.createTopic(true, T2_NAME, "/topic/" + T2_NAME); - cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); + cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); } @Override http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java index 69cd9da..dff2015 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/divert/DivertAndACKClientTest.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.jms.divert; +package org.apache.activemq.tests.integration.jms.divert; import org.junit.Test; @@ -26,12 +26,12 @@ import javax.jms.TextMessage; import org.junit.Assert; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.tests.util.JMSTestBase; /** * A DivertAndACKClientTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java index 735b5b5..2dfc37a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/BodyTest.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.jms.jms2client; +package org.apache.activemq.tests.integration.jms.jms2client; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -20,8 +20,8 @@ import javax.jms.MessageFormatException; import javax.jms.MessageProducer; import javax.jms.Session; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.tests.util.JMSTestBase; 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/jms/jms2client/InvalidDestinationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.java index 626c15d..f7a8f3c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/InvalidDestinationTest.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.jms.jms2client; +package org.apache.activemq.tests.integration.jms.jms2client; import javax.jms.Connection; import javax.jms.Destination; @@ -26,7 +26,7 @@ import javax.jms.Topic; import java.util.HashMap; import java.util.Map; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.tests.util.JMSTestBase; 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/jms/jms2client/JmsContextTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java index 3f8bfb4..4df0af7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsContextTest.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.tests.integration.jms.jms2client; +package org.apache.activemq.tests.integration.jms.jms2client; import javax.jms.BytesMessage; import javax.jms.CompletionListener; @@ -39,7 +39,7 @@ import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.tests.util.JMSTestBase; 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/jms/jms2client/JmsProducerCompletionListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java index 03323b5..297a8a5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/JmsProducerCompletionListenerTest.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.tests.integration.jms.jms2client; +package org.apache.activemq.tests.integration.jms.jms2client; import javax.jms.CompletionListener; import javax.jms.Connection; @@ -31,8 +31,8 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.tests.util.JMSTestBase; 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/jms/jms2client/NonExistentQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java index fd237c7..d738023 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/NonExistentQueueTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.jms.jms2client; +package org.apache.activemq.tests.integration.jms.jms2client; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -26,11 +26,11 @@ import javax.jms.Queue; import javax.jms.Session; import java.util.Random; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.tests.util.JMSTestBase; 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/jms/jms2client/SharedConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.java index bbbd863..6c807cd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/jms2client/SharedConsumerTest.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.jms.jms2client; +package org.apache.activemq.tests.integration.jms.jms2client; import javax.jms.JMSConsumer; import javax.jms.JMSContext; @@ -19,9 +19,9 @@ import javax.jms.JMSRuntimeException; import javax.jms.Topic; import java.util.Random; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.tests.util.JMSTestBase; 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/jms/largemessage/JMSLargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java index b02b697..c4d2035 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/largemessage/JMSLargeMessageTest.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.jms.largemessage; +package org.apache.activemq.tests.integration.jms.largemessage; import javax.jms.BytesMessage; import javax.jms.JMSException; @@ -26,9 +26,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.tests.util.JMSTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.tests.util.JMSTestBase; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java index 1ff22c8..86392e1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.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.jms.server; +package org.apache.activemq.tests.integration.jms.server; import javax.jms.Queue; import javax.jms.Topic; import javax.naming.Context; import java.net.URI; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.core.deployers.impl.FileDeploymentManager; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.impl.JMSServerDeployer; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.core.deployers.impl.FileDeploymentManager; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.impl.JMSServerDeployer; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -73,7 +73,7 @@ public class JMSServerDeployerTest extends ServiceTestBase String xml = "<configuration xmlns='urn:hornetq'> " + "</configuration>"; - Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq.utils.XMLUtil.stringToElement(xml); deployer.validate(rootNode); } @@ -117,7 +117,7 @@ public class JMSServerDeployerTest extends ServiceTestBase String xml = "<queue name=\"" + htmlEncodedName + "\">" + "<entry name=\"" + jndiName + "\"/>" + "</queue>"; - Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq.utils.XMLUtil.stringToElement(xml); deployer.deploy(rootNode); @@ -136,7 +136,7 @@ public class JMSServerDeployerTest extends ServiceTestBase "<topic name=\"" + htmlEncodedName + "\">" + "<entry name=\"" + jndiName + "\"/>" + "</topic>"; - Element rootNode = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); + Element rootNode = org.apache.activemq.utils.XMLUtil.stringToElement(xml); deployer.deploy(rootNode); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java index ed0ef6e..bfc3957 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.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.jms.server; +package org.apache.activemq.tests.integration.jms.server; import javax.jms.Connection; import javax.jms.MessageConsumer; @@ -21,19 +21,19 @@ import javax.jms.TextMessage; import java.util.HashSet; import java.util.Set; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.config.impl.FileConfiguration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.spi.core.security.HornetQSecurityManager; -import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.impl.FileConfiguration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java index 8cdcf2b..8ff97b2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSConfigurationTest.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.jms.server.config; +package org.apache.activemq.tests.integration.jms.server.config; import org.junit.Test; @@ -25,23 +25,23 @@ import javax.naming.Context; import org.junit.Assert; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.JMSConfiguration; -import org.apache.activemq6.jms.server.config.TopicConfiguration; -import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl; -import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.apache.activemq6.jms.server.config.impl.TopicConfigurationImpl; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.RandomUtil; -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.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; +import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl; +import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl; +import org.apache.activemq.jms.server.config.impl.TopicConfigurationImpl; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; /** * A JMSConfigurationTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java index 981d728..b790c52 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.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.jms.server.config; +package org.apache.activemq.tests.integration.jms.server.config; import org.junit.Test; import java.io.InputStream; import java.net.URL; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.jms.server.JMSServerConfigParser; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.JMSConfiguration; -import org.apache.activemq6.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq6.jms.server.config.TopicConfiguration; -import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl; -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.jms.server.JMSServerConfigParser; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; +import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl; +import org.apache.activemq.tests.util.ServiceTestBase; /** * A JMSServerConfigParserTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java index 4e5b90e..1e51871 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/ConnectionFactoryControlTest.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import java.util.ArrayList; import java.util.List; @@ -19,20 +19,20 @@ import javax.management.Notification; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; -import org.apache.activemq6.api.jms.management.JMSServerControl; -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.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.jms.server.management.JMSNotificationType; -import org.apache.activemq6.tests.integration.management.ManagementControlHelper; -import org.apache.activemq6.tests.integration.management.ManagementTestBase; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq.api.jms.management.JMSServerControl; +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.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.jms.server.management.JMSNotificationType; +import org.apache.activemq.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.tests.integration.management.ManagementTestBase; +import org.apache.activemq.tests.unit.util.InVMNamingContext; /** * A Connection Factory Control Test http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java index 0d7115f..b4fa223 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSMessagingProxy.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import javax.jms.Message; import javax.jms.Queue; @@ -18,7 +18,7 @@ import javax.jms.QueueRequestor; import javax.jms.QueueSession; import javax.jms.Session; -import org.apache.activemq6.api.jms.management.JMSManagementHelper; +import org.apache.activemq.api.jms.management.JMSManagementHelper; /** * A MBeanUsingCoreMessage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java index 5a29438..1adabc0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.JMSException; @@ -27,35 +27,35 @@ import java.util.List; import java.util.Map; import java.util.Set; -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.core.management.ObjectNameBuilder; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.api.jms.management.JMSQueueControl; -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -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.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQQueue; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.jms.server.management.JMSNotificationType; -import org.apache.activemq6.tests.integration.management.ManagementControlHelper; -import org.apache.activemq6.tests.integration.management.ManagementTestBase; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.utils.UUIDGenerator; -import org.apache.activemq6.utils.json.JSONArray; +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.core.management.ObjectNameBuilder; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.api.jms.management.JMSQueueControl; +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +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.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQQueue; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.jms.server.management.JMSNotificationType; +import org.apache.activemq.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.tests.integration.management.ManagementTestBase; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.utils.json.JSONArray; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -829,7 +829,7 @@ public class JMSQueueControlTest extends ManagementTestBase { ClientMessage msg = session.createMessage(true); - msg.putStringProperty(org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); + msg.putStringProperty(org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); prod1.send(msg); if (i < 5) @@ -910,7 +910,7 @@ public class JMSQueueControlTest extends ManagementTestBase { ClientMessage msg = session.createMessage(true); - msg.putStringProperty(org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); + msg.putStringProperty(org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-" + i)); msg.setUserID(UUIDGenerator.getInstance().generateUUID()); @@ -992,7 +992,7 @@ public class JMSQueueControlTest extends ManagementTestBase ClientMessage msg = session.createMessage(true); - msg.putStringProperty(org.apache.activemq6.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-1")); + msg.putStringProperty(org.apache.activemq.api.core.Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("dupl-1")); prod1.send(msg); prod2.send(msg); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java index c960d32..c206f27 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import org.junit.Before; import org.junit.After; @@ -20,14 +20,14 @@ import javax.jms.QueueConnection; import javax.jms.QueueSession; import javax.jms.Session; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.api.jms.management.JMSQueueControl; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQQueue; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.api.jms.management.JMSQueueControl; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQQueue; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java index acea7bd..b057e59 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControl2Test.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -28,30 +28,30 @@ import java.util.Arrays; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.QueueControl; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.management.JMSConnectionInfo; -import org.apache.activemq6.api.jms.management.JMSConsumerInfo; -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.api.jms.management.JMSSessionInfo; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.ra.HornetQResourceAdapter; -import org.apache.activemq6.ra.inflow.HornetQActivation; -import org.apache.activemq6.ra.inflow.HornetQActivationSpec; -import org.apache.activemq6.tests.integration.management.ManagementControlHelper; -import org.apache.activemq6.tests.integration.management.ManagementTestBase; -import org.apache.activemq6.tests.unit.ra.MessageEndpointFactory; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.QueueControl; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.management.JMSConnectionInfo; +import org.apache.activemq.api.jms.management.JMSConsumerInfo; +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.api.jms.management.JMSSessionInfo; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.jms.client.HornetQMessage; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.ra.HornetQResourceAdapter; +import org.apache.activemq.ra.inflow.HornetQActivation; +import org.apache.activemq.ra.inflow.HornetQActivationSpec; +import org.apache.activemq.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.tests.integration.management.ManagementTestBase; +import org.apache.activemq.tests.unit.ra.MessageEndpointFactory; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.RandomUtil; import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -521,10 +521,10 @@ public class JMSServerControl2Test extends ManagementTestBase ra = new HornetQResourceAdapter(); - ra.setConnectorClassName("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"); + ra.setConnectorClassName("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"); ra.setUserName("userGlobal"); ra.setPassword("passwordGlobal"); - ra.start(new org.apache.activemq6.tests.unit.ra.BootstrapContext()); + ra.start(new org.apache.activemq.tests.unit.ra.BootstrapContext()); ra.setClientID("my-client-id"); ra.setUserName("user"); Connection conn = ra.getDefaultHornetQConnectionFactory().createConnection(); @@ -608,10 +608,10 @@ public class JMSServerControl2Test extends ManagementTestBase ra = new HornetQResourceAdapter(); - ra.setConnectorClassName("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"); + ra.setConnectorClassName("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"); ra.setUserName("userGlobal"); ra.setPassword("passwordGlobal"); - ra.start(new org.apache.activemq6.tests.unit.ra.BootstrapContext()); + ra.start(new org.apache.activemq.tests.unit.ra.BootstrapContext()); Connection conn = ra.getDefaultHornetQConnectionFactory().createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java index 136823b..e0f5e9e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlRestartTest.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.Message; @@ -19,25 +19,25 @@ import javax.jms.QueueRequestor; import javax.jms.QueueSession; import javax.jms.Session; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.api.jms.management.JMSManagementHelper; -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.integration.management.ManagementControlHelper; -import org.apache.activemq6.tests.integration.management.ManagementTestBase; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.api.jms.management.JMSManagementHelper; +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.tests.integration.management.ManagementTestBase; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.After; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java index 342bbc7..d9ee560 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -34,38 +34,38 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.HornetQObjectClosedException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.management.AddressControl; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.jms.client.HornetQConnection; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQMessageConsumer; -import org.apache.activemq6.jms.client.HornetQQueueConnectionFactory; -import org.apache.activemq6.jms.persistence.JMSStorageManager; -import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq6.jms.persistence.config.PersistedDestination; -import org.apache.activemq6.jms.persistence.config.PersistedJNDI; -import org.apache.activemq6.jms.persistence.config.PersistedType; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.integration.management.ManagementControlHelper; -import org.apache.activemq6.tests.integration.management.ManagementTestBase; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.HornetQObjectClosedException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.management.AddressControl; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.jms.client.HornetQConnection; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQMessageConsumer; +import org.apache.activemq.jms.client.HornetQQueueConnectionFactory; +import org.apache.activemq.jms.persistence.JMSStorageManager; +import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.jms.persistence.config.PersistedDestination; +import org.apache.activemq.jms.persistence.config.PersistedJNDI; +import org.apache.activemq.jms.persistence.config.PersistedType; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.tests.integration.management.ManagementTestBase; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.json.JSONArray; import org.junit.After; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java index db17bd8..6a17716 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import org.junit.Before; import org.junit.After; @@ -20,16 +20,16 @@ import javax.jms.QueueConnection; import javax.jms.QueueSession; import javax.jms.Session; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQQueue; -import org.apache.activemq6.jms.client.HornetQQueueConnectionFactory; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQQueue; +import org.apache.activemq.jms.client.HornetQQueueConnectionFactory; /** * A JMSServerControlUsingCoreTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java index ef5b285..2089e5f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -32,25 +32,25 @@ import java.util.Collection; import java.util.Set; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.client.SessionFailureListener; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.client.impl.Topology; -import org.apache.activemq6.core.client.impl.TopologyMemberImpl; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.cluster.ClusterManager; -import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; -import org.apache.activemq6.jms.client.HornetQConnection; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; -import org.apache.activemq6.tests.integration.cluster.failover.FailoverTestBase; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.client.SessionFailureListener; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.cluster.ClusterManager; +import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq.jms.client.HornetQConnection; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq.tests.integration.cluster.failover.FailoverTestBase; +import org.apache.activemq.tests.util.RandomUtil; /** * A JMSUtil http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java index d953bd9..da8c563 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/NullInitialContext.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import javax.naming.InitialContext; import javax.naming.Name; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java index 1a21d18..dd21a43 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlClusterTest.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import org.junit.Before; import org.junit.After; import org.junit.Test; -import org.apache.activemq6.api.jms.management.TopicControl; -import org.apache.activemq6.tests.integration.management.ManagementControlHelper; -import org.apache.activemq6.tests.util.JMSClusteredTestBase; +import org.apache.activemq.api.jms.management.TopicControl; +import org.apache.activemq.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.tests.util.JMSClusteredTestBase; import javax.jms.Connection; import javax.jms.Session; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java index 59bb7b2..b059503 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlTest.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.jms.server.management; +package org.apache.activemq.tests.integration.jms.server.management; import javax.jms.Connection; import javax.jms.Message; @@ -25,27 +25,27 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.api.jms.management.SubscriptionInfo; -import org.apache.activemq6.api.jms.management.TopicControl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQTopic; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.jms.server.management.JMSNotificationType; -import org.apache.activemq6.tests.integration.management.ManagementControlHelper; -import org.apache.activemq6.tests.integration.management.ManagementTestBase; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.api.jms.management.SubscriptionInfo; +import org.apache.activemq.api.jms.management.TopicControl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQTopic; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.jms.server.management.JMSNotificationType; +import org.apache.activemq.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.tests.integration.management.ManagementTestBase; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.utils.json.JSONArray; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -597,7 +597,7 @@ public class TopicControlTest extends ManagementTestBase super.setUp(); Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")); + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory")); server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start();
