http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java index 24c6837..fd1a4ea 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.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; +package org.apache.activemq.tests.integration.jms; import javax.jms.JMSContext; import javax.jms.JMSSecurityException; @@ -18,7 +18,7 @@ import javax.jms.JMSSecurityRuntimeException; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; -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/JmsProducerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java index 4b70fff..e947ab3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JmsProducerTest.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.tests.integration.jms; +package org.apache.activemq.tests.integration.jms; import javax.jms.DeliveryMode; import javax.jms.JMSConsumer; @@ -25,13 +25,13 @@ import javax.jms.TextMessage; import java.util.ArrayList; import java.util.Random; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.client.impl.ClientSessionImpl; -import org.apache.activemq6.core.client.impl.DelegatingSession; -import org.apache.activemq6.jms.client.HornetQJMSContext; -import org.apache.activemq6.jms.client.HornetQSession; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.client.impl.ClientSessionImpl; +import org.apache.activemq.core.client.impl.DelegatingSession; +import org.apache.activemq.jms.client.HornetQJMSContext; +import org.apache.activemq.jms.client.HornetQSession; +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/ManualReconnectionToSingleServerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.java index 912b40c..0caa138 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/ManualReconnectionToSingleServerTest.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; +package org.apache.activemq.tests.integration.jms; import org.junit.Before; import org.junit.After; @@ -37,19 +37,19 @@ 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.server.HornetQServer; -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.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.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.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +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.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.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.ServiceTestBase; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</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/bridge/BridgeTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/BridgeTestBase.java index 422cc56..3abde27 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/BridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/BridgeTestBase.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.bridge; +package org.apache.activemq.tests.integration.jms.bridge; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -33,29 +33,29 @@ import java.util.Set; import com.arjuna.ats.arjuna.coordinator.TransactionReaper; import com.arjuna.ats.arjuna.coordinator.TxControl; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -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.api.jms.management.TopicControl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.DestinationFactory; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQJMSConnectionFactory; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; -import org.apache.activemq6.jms.server.JMSServerManager; -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.UnitTestCase; +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.api.jms.management.TopicControl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq.jms.bridge.DestinationFactory; +import org.apache.activemq.jms.bridge.QualityOfServiceMode; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQJMSConnectionFactory; +import org.apache.activemq.jms.client.HornetQMessage; +import org.apache.activemq.jms.client.HornetQXAConnectionFactory; +import org.apache.activemq.jms.server.JMSServerManager; +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.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/bridge/ClusteredBridgeTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java index 5c14021..6fcaeeb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.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.bridge; +package org.apache.activemq.tests.integration.jms.bridge; import javax.jms.ConnectionFactory; import javax.jms.Destination; @@ -23,32 +23,32 @@ import java.util.concurrent.TimeUnit; import com.arjuna.ats.arjuna.coordinator.TransactionReaper; import com.arjuna.ats.arjuna.coordinator.TxControl; -import org.apache.activemq6.api.core.HornetQException; -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.FailoverEventListener; -import org.apache.activemq6.api.core.client.FailoverEventType; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.DestinationFactory; -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.tests.unit.util.InVMContext; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQException; +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.FailoverEventListener; +import org.apache.activemq.api.core.client.FailoverEventType; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq.jms.bridge.DestinationFactory; +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.tests.unit.util.InVMContext; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.After; 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/bridge/JMSBridgeClusteredTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java index e3a2044..a1fa2e5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.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.jms.bridge; +package org.apache.activemq.tests.integration.jms.bridge; import javax.transaction.TransactionManager; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.DestinationFactory; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; -import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq.jms.bridge.DestinationFactory; +import org.apache.activemq.jms.bridge.QualityOfServiceMode; +import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl; 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/bridge/JMSBridgeReconnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java index 4c7922f..3f14e17 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/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.tests.integration.jms.bridge; - -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.jms.bridge.ConnectionFactoryFactory; -import org.apache.activemq6.jms.bridge.QualityOfServiceMode; -import org.apache.activemq6.jms.bridge.impl.JMSBridgeImpl; -import org.apache.activemq6.jms.client.HornetQXAConnectionFactory; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.integration.ra.DummyTransactionManager; +package org.apache.activemq.tests.integration.jms.bridge; + +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.jms.bridge.ConnectionFactoryFactory; +import org.apache.activemq.jms.bridge.QualityOfServiceMode; +import org.apache.activemq.jms.bridge.impl.JMSBridgeImpl; +import org.apache.activemq.jms.client.HornetQXAConnectionFactory; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.ra.DummyTransactionManager; 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/bridge/JMSBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeTest.java index bae45e9..adb7742 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeTest.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.bridge; +package org.apache.activemq.tests.integration.jms.bridge; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -30,13 +30,13 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -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.client.HornetQMessage; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.api.jms.HornetQJMSConstants; +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.client.HornetQMessage; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.utils.DefaultSensitiveStringCodec; 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/client/AutoGroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.java index 11b80f8..05c1745 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/AutoGroupingTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.ConnectionFactory; import javax.jms.Message; -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.HornetQJMSConnectionFactory; +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.HornetQJMSConnectionFactory; /** * A AutoGroupingTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java index c424836..9cc886f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ConnectionTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -27,7 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.tests.util.JMSTestBase; 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/client/CreateQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.java index 8e4127c..b59dbe0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/CreateQueueTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -18,9 +18,9 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.Topic; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.JMSTestBase; 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/client/ExpiryMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.java index b7b5ad0..6cc223e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ExpiryMessageTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.MessageProducer; @@ -18,10 +18,10 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.apache.activemq6.api.jms.management.TopicControl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.tests.integration.management.ManagementControlHelper; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.jms.management.TopicControl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.tests.integration.management.ManagementControlHelper; +import org.apache.activemq.tests.util.JMSTestBase; 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/client/GroupIDTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java index f3dbee0..0a8a8cf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupIDTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.jms.client; +package org.apache.activemq.tests.integration.jms.client; import org.junit.Test; import javax.jms.ConnectionFactory; import javax.jms.Message; -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.HornetQJMSConnectionFactory; +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.HornetQJMSConnectionFactory; /** * A GroupIDTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java index eb7278d..2aca0ad 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.JMSException; @@ -21,13 +21,13 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.client.HornetQTextMessage; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQMessage; +import org.apache.activemq.jms.client.HornetQTextMessage; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.JMSTestBase; import org.junit.After; import org.junit.Assume; import org.junit.Before; @@ -63,7 +63,7 @@ public class GroupingTest extends JMSTestBase protected void setProperty(Message message) { - ((HornetQMessage)message).getCoreMessage().putStringProperty(org.apache.activemq6.api.core.Message.HDR_GROUP_ID, new SimpleString("foo")); + ((HornetQMessage)message).getCoreMessage().putStringProperty(org.apache.activemq.api.core.Message.HDR_GROUP_ID, new SimpleString("foo")); } protected ConnectionFactory getCF() throws Exception http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java index d081b7f..d54c15a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageProducerTest.java @@ -13,7 +13,7 @@ /** * */ -package org.apache.activemq6.tests.integration.jms.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.JMSException; import javax.jms.Message; @@ -21,7 +21,7 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -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/client/MessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.java index 66913f6..d0939b1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/MessageTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.Message; @@ -21,9 +21,9 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.StreamMessage; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.JMSTestBase; 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/client/NewQueueRequestorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.java index 72054fb..b3a9755 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NewQueueRequestorTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.Destination; import javax.jms.JMSException; @@ -25,8 +25,8 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.JMSTestBase; 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/client/NoLocalSubscriberTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.java index 3a72fd3..7d748f7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/NoLocalSubscriberTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import org.junit.Test; @@ -24,9 +24,9 @@ import javax.jms.TextMessage; import javax.jms.Topic; import javax.jms.TopicSubscriber; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.JMSTestBase; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.JMSTestBase; +import org.apache.activemq.tests.util.RandomUtil; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</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/client/PreACKJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.java index cb29ba2..e08f0f0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/PreACKJMSTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -20,10 +20,10 @@ import javax.jms.TextMessage; import java.util.ArrayList; import java.util.List; -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.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.tests.util.JMSTestBase; 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/client/ReSendMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.java index cd44138..18057ca 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReSendMessageTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.BytesMessage; import javax.jms.MapMessage; @@ -25,12 +25,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.jms.HornetQJMSConstants; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.tests.util.JMSTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.jms.HornetQJMSConstants; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.tests.util.JMSTestBase; +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/client/ReceiveNoWaitTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.java index 8656c0d..d19355f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/ReceiveNoWaitTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import org.junit.Before; import org.junit.After; @@ -24,7 +24,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.activemq6.tests.util.JMSTestBase; +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/client/RemoteConnectionStressTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java index 990c438..079bcb4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/RemoteConnectionStressTest.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.jms.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.MessageProducer; @@ -21,16 +21,16 @@ import javax.jms.TextMessage; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; -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.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.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.ServiceTestBase; +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.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.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -53,7 +53,7 @@ public class RemoteConnectionStressTest extends ServiceTestBase super.setUp(); Configuration conf = ServiceTestBase.createBasicConfigNoDataFolder(); - conf.getAcceptorConfigurations().add(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory")); + conf.getAcceptorConfigurations().add(new TransportConfiguration("org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory")); mbeanServer = MBeanServerFactory.createMBeanServer(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java index dc875dc..4f41749 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import org.junit.Test; @@ -27,15 +27,15 @@ import javax.jms.Session; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -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.client.impl.ClientSessionInternal; -import org.apache.activemq6.jms.client.HornetQSession; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.HornetQNotConnectedException; +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.client.impl.ClientSessionInternal; +import org.apache.activemq.jms.client.HornetQSession; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +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/client/SessionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.java index 5fcae6f..4c82700 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.QueueConnection; @@ -18,8 +18,8 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.Topic; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.tests.util.JMSTestBase; 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/client/StoreConfigTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.java index 3122419..f7954d2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/StoreConfigTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import org.junit.Test; @@ -26,9 +26,9 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.naming.NamingException; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.tests.util.JMSTestBase; /** * A CreateCFTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java index f66c57e..a6fd633 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TextMessageTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -19,11 +19,11 @@ import javax.jms.Session; import javax.jms.TextMessage; import java.util.List; -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.tests.util.JMSTestBase; -import org.apache.activemq6.tests.util.RandomUtil; +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.tests.util.JMSTestBase; +import org.apache.activemq.tests.util.RandomUtil; 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/client/TopicCleanupTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.java index 1789c7c..9d03cce 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/TopicCleanupTest.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.client; +package org.apache.activemq.tests.integration.jms.client; import javax.jms.Connection; import javax.jms.MessageConsumer; @@ -19,14 +19,14 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.impl.FilterImpl; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.QueueImpl; -import org.apache.activemq6.tests.util.JMSTestBase; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.impl.FilterImpl; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.QueueImpl; +import org.apache.activemq.tests.util.JMSTestBase; 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/cluster/BindingsClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java index 3a57f40..d501a93 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.jms.cluster; - -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -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.FailureListener; -import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq6.core.server.cluster.Bridge; -import org.apache.activemq6.core.server.cluster.impl.BridgeImpl; -import org.apache.activemq6.core.server.cluster.impl.ClusterConnectionImpl; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.JMSClusteredTestBase; +package org.apache.activemq.tests.integration.jms.cluster; + +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQNotConnectedException; +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.FailureListener; +import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; +import org.apache.activemq.core.server.cluster.Bridge; +import org.apache.activemq.core.server.cluster.impl.BridgeImpl; +import org.apache.activemq.core.server.cluster.impl.ClusterConnectionImpl; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.JMSClusteredTestBase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java index 53f94a9..2324a6c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverListenerTest.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.cluster; +package org.apache.activemq.tests.integration.jms.cluster; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -26,33 +26,33 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.FailoverEventListener; -import org.apache.activemq6.api.core.client.FailoverEventType; -import org.apache.activemq6.api.jms.HornetQJMSClient; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.impl.InVMNodeManager; -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.HornetQSession; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.integration.jms.server.management.JMSUtil; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.InVMNodeManagerServer; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.FailoverEventListener; +import org.apache.activemq.api.core.client.FailoverEventType; +import org.apache.activemq.api.jms.HornetQJMSClient; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.impl.InVMNodeManager; +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.HornetQSession; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.jms.server.management.JMSUtil; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.InVMNodeManagerServer; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; 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/cluster/JMSFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java index 933096a..6cd456d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.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.cluster; +package org.apache.activemq.tests.integration.jms.cluster; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -28,38 +28,38 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.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.core.config.Configuration; -import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.protocol.core.Packet; -import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; -import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.impl.InVMNodeManager; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQSession; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.integration.jms.server.management.JMSUtil; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.InVMNodeManagerServer; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.ServiceTestBase; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.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.core.config.Configuration; +import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.protocol.core.Packet; +import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage; +import org.apache.activemq.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.impl.InVMNodeManager; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQSession; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.integration.jms.server.management.JMSUtil; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.InVMNodeManagerServer; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.ServiceTestBase; 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/cluster/JMSReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java index 5d1feaa..f38bf31 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.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.cluster; +package org.apache.activemq.tests.integration.jms.cluster; import org.junit.Before; import org.junit.After; @@ -31,24 +31,24 @@ import javax.jms.Topic; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.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.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; -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.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQSession; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.SimpleString; +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.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMRegistry; +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.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQSession; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.UnitTestCase; /** * @@ -79,7 +79,7 @@ public class JMSReconnectTest extends UnitTestCase private void testReconnectOrReattachSameNode(boolean reattach) throws Exception { - HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); @@ -183,7 +183,7 @@ public class JMSReconnectTest extends UnitTestCase //Test that non durable JMS sub gets recreated in auto reconnect private void testReconnectSameNodeServerRestartedWithNonDurableSubOrTempQueue(final boolean nonDurableSub) throws Exception { - HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(-1); @@ -259,7 +259,7 @@ public class JMSReconnectTest extends UnitTestCase @Test public void testNoReconnectCloseAfterFailToReconnectWithTopicConsumer() throws Exception { - HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(0); @@ -291,7 +291,7 @@ public class JMSReconnectTest extends UnitTestCase @Test public void testNoReconnectCloseAfterFailToReconnectWithTempQueue() throws Exception { - HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(0); @@ -325,7 +325,7 @@ public class JMSReconnectTest extends UnitTestCase Configuration liveConf = createBasicConfig() .setJournalType(getDefaultJournalType()) - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")) + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory")) .setBindingsDirectory(getBindingsDir()) .setJournalMinFiles(2) .setJournalDirectory(getJournalDir()) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java index ded4c7d..64ebbc2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/LargeMessageOverBridgeTest.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.cluster; +package org.apache.activemq.tests.integration.jms.cluster; import javax.jms.BytesMessage; import javax.jms.Connection; @@ -20,13 +20,13 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -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.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.tests.util.JMSClusteredTestBase; +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.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.tests.util.JMSClusteredTestBase; 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/cluster/MultipleThreadsOpeningTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java index abab755..aa645e4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.jms.cluster; +package org.apache.activemq.tests.integration.jms.cluster; import javax.jms.Connection; import javax.jms.Session; import java.util.concurrent.CountDownLatch; -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.JMSClusteredTestBase; +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.JMSClusteredTestBase; 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/cluster/ReplicatedJMSFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java index 28e8ea6..4157f81 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.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.jms.cluster; +package org.apache.activemq.tests.integration.jms.cluster; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; /** * A ReplicatedJMSFailoverTest @@ -58,7 +58,7 @@ public class ReplicatedJMSFailoverTest extends JMSFailoverTest liveConf = createBasicConfig() .setJournalType(getDefaultJournalType()) .addConnectorConfiguration("toBackup", new TransportConfiguration(INVM_CONNECTOR_FACTORY, backupParams)) - .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory")) + .addAcceptorConfiguration(new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory")) .setBindingsDirectory(getBindingsDir(0, false)) .setJournalMinFiles(2) .setJournalDirectory(getJournalDir(0, false)) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java index 4db4317..9aebc45 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TemporaryQueueClusterTest.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.cluster; +package org.apache.activemq.tests.integration.jms.cluster; import org.junit.Before; import org.junit.After; @@ -23,7 +23,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.activemq6.tests.util.JMSClusteredTestBase; +import org.apache.activemq.tests.util.JMSClusteredTestBase; /** * A TopicClusterTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java index ece8c4c..edae043 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/TopicClusterTest.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.cluster; +package org.apache.activemq.tests.integration.jms.cluster; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -20,7 +20,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; -import org.apache.activemq6.tests.util.JMSClusteredTestBase; +import org.apache.activemq.tests.util.JMSClusteredTestBase; 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/jms/connection/CloseConnectionFactoryOnGCest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java index d4e5f8f..68f9a8f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.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 java.util.concurrent.atomic.AtomicInteger; import javax.jms.Connection; -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.ServerLocatorImpl; -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.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.tests.util.JMSTestBase; /** * @@ -53,7 +53,7 @@ public class CloseConnectionFactoryOnGCest extends JMSTestBase for (int i = 0; i < 100; i++) { HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, - new TransportConfiguration("org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory")); + new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); Connection conn = cf.createConnection(); cf = null; conn.close(); 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/CloseConnectionOnGCTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.java index d8b94ec..7e676ad 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseConnectionOnGCTest.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,14 +26,14 @@ import javax.jms.Session; import org.junit.Assert; -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.CloseListener; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.tests.util.JMSTestBase; -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.remoting.CloseListener; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.tests.util.JMSTestBase; +import org.apache.activemq.tests.util.UnitTestCase; /** * @@ -53,7 +53,7 @@ public class CloseConnectionOnGCTest extends JMSTestBase { super.setUp(); - 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); }
