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/TopicControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java index 90e16de..78533b6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java @@ -10,13 +10,13 @@ * 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 static org.apache.activemq6.tests.util.RandomUtil.randomString; +import static org.apache.activemq.tests.util.RandomUtil.randomString; import javax.jms.Connection; import javax.jms.Message; @@ -28,22 +28,22 @@ import javax.jms.TopicSubscriber; import org.junit.Assert; -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.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.HornetQServers; -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.client.HornetQTopic; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -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.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.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.HornetQServers; +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.client.HornetQTopic; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.integration.management.ManagementTestBase; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.RandomUtil; public class TopicControlUsingJMSTest extends ManagementTestBase { @@ -438,7 +438,7 @@ public class TopicControlUsingJMSTest 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();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java index e9ee909..c076fd8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOImportExportTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.journal; +package org.apache.activemq.tests.integration.journal; import java.io.File; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; import org.junit.BeforeClass; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java index 66d2797..71796d5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalCompactTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.journal; +package org.apache.activemq.tests.integration.journal; import java.io.File; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq6.core.journal.impl.JournalConstants; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalConstants; import org.junit.BeforeClass; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java index 29a5188..dd517d8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOJournalImplTest.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.journal; +package org.apache.activemq.tests.integration.journal; import java.io.File; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq6.core.journal.impl.JournalConstants; -import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestUnit; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalConstants; +import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestUnit; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java index 4eb73c2..0360e28 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/AIOSequentialFileFactoryTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.journal; +package org.apache.activemq.tests.integration.journal; import java.nio.ByteBuffer; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq6.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; import org.junit.Assert; import org.junit.BeforeClass; 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/journal/JournalPerfTuneTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java index 9505e26..ac1927f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java @@ -10,24 +10,24 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.journal; +package org.apache.activemq.tests.integration.journal; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.IOCompletion; -import org.apache.activemq6.core.journal.Journal; -import org.apache.activemq6.core.journal.LoaderCallback; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.IOCompletion; +import org.apache.activemq.core.journal.Journal; +import org.apache.activemq.core.journal.LoaderCallback; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.DataConstants; import org.junit.Before; import org.junit.Ignore; 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/journal/NIOBufferedJournalCompactTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java index d3b2d3e..76c04d0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOBufferedJournalCompactTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.journal; +package org.apache.activemq.tests.integration.journal; import java.io.File; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; /** * A NIOBufferedJournalCompactTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java index 0c018bd..e405dd7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOImportExportTest.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.journal; +package org.apache.activemq.tests.integration.journal; import org.junit.After; import org.junit.Test; import java.io.File; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; -import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding; /** * A NIOImportExportTest @@ -34,7 +34,7 @@ public class NIOImportExportTest extends JournalImplTestBase { /* (non-Javadoc) - * @see org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() + * @see org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() */ @Override protected SequentialFileFactory getFileFactory() 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/journal/NIOJournalCompactTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.java index 289c16e..3bce13b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalCompactTest.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.journal; +package org.apache.activemq.tests.integration.journal; import java.io.File; import java.io.FilenameFilter; @@ -26,29 +26,29 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.AbstractJournalUpdateTask; -import org.apache.activemq6.core.journal.impl.ExportJournal; -import org.apache.activemq6.core.journal.impl.JournalCompactor; -import org.apache.activemq6.core.journal.impl.JournalFile; -import org.apache.activemq6.core.journal.impl.JournalFileImpl; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; -import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; -import org.apache.activemq6.tests.unit.core.journal.impl.fakes.SimpleEncoding; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.IDGenerator; -import org.apache.activemq6.utils.OrderedExecutorFactory; -import org.apache.activemq6.utils.SimpleIDGenerator; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.AbstractJournalUpdateTask; +import org.apache.activemq.core.journal.impl.ExportJournal; +import org.apache.activemq.core.journal.impl.JournalCompactor; +import org.apache.activemq.core.journal.impl.JournalFile; +import org.apache.activemq.core.journal.impl.JournalFileImpl; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq.tests.unit.core.journal.impl.fakes.SimpleEncoding; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.IDGenerator; +import org.apache.activemq.utils.OrderedExecutorFactory; +import org.apache.activemq.utils.SimpleIDGenerator; 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/journal/NIOJournalImplTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.java index a90dd9d..8c6ba56 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOJournalImplTest.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.journal; +package org.apache.activemq.tests.integration.journal; import java.io.File; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestUnit; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestUnit; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java index 47d33ac..c638df7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONoBufferJournalImplTest.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.journal; +package org.apache.activemq.tests.integration.journal; import java.io.File; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestUnit; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestUnit; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java index af2f06b..5364365 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.journal; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; +package org.apache.activemq.tests.integration.journal; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java index 184eaa7..4ce89c9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/NIOSequentialFileFactoryTest.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.journal; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; +package org.apache.activemq.tests.integration.journal; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.tests.unit.core.journal.impl.SequentialFileFactoryTestBase; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java index 681c378..a837f3a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/OldFormatTest.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.journal; +package org.apache.activemq.tests.integration.journal; import java.nio.ByteBuffer; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase; +import org.apache.activemq.utils.DataConstants; import org.junit.Test; /** @@ -139,7 +139,7 @@ public class OldFormatTest extends JournalImplTestBase } /* (non-Javadoc) - * @see org.apache.activemq6.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() + * @see org.apache.activemq.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory() */ @Override protected SequentialFileFactory getFileFactory() 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/journal/ValidateTransactionHealthTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java index f7ed87c..e2470eb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/ValidateTransactionHealthTest.java @@ -10,23 +10,23 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.journal; +package org.apache.activemq.tests.integration.journal; import java.io.File; import java.nio.ByteBuffer; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq6.core.journal.LoaderCallback; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq6.core.journal.impl.JournalConstants; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.tests.util.SpawnedVMSupport; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.core.journal.LoaderCallback; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalConstants; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.tests.util.SpawnedVMSupport; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java index e48ebff..6f6b66c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.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.largemessage; +package org.apache.activemq.tests.integration.largemessage; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -23,25 +23,25 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.MessageHandler; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.tests.integration.IntegrationTestLogger; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.DataConstants; -import org.apache.activemq6.utils.DeflaterReader; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.MessageHandler; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.tests.integration.IntegrationTestLogger; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.DataConstants; +import org.apache.activemq.utils.DeflaterReader; import org.junit.Assert; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java index d784592..8f5bd69 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/ServerLargeMessageTest.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.largemessage; - -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; -import org.apache.activemq6.core.persistence.impl.journal.LargeServerMessageImpl; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.ServiceTestBase; -import org.apache.activemq6.tests.util.UnitTestCase; +package org.apache.activemq.tests.integration.largemessage; + +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq.core.persistence.impl.journal.LargeServerMessageImpl; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.ServiceTestBase; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java index dc89e29..2de534e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.management; +package org.apache.activemq.tests.integration.management; import org.junit.Test; import java.util.HashMap; import org.junit.Assert; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.AcceptorControl; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.tests.integration.SimpleNotificationService; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.AcceptorControl; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.tests.integration.SimpleNotificationService; +import org.apache.activemq.tests.util.RandomUtil; /** * A AcceptorControlTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java index 4937d34..5236efc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlUsingCoreTest.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.management; +package org.apache.activemq.tests.integration.management; import org.junit.Test; import java.util.Map; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.AcceptorControl; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.AcceptorControl; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.tests.util.UnitTestCase; /** * A AcceptorControlUsingCoreTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java index 365405b..1be5728 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java @@ -10,36 +10,36 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.management; +package org.apache.activemq.tests.integration.management; import java.util.HashSet; import java.util.Set; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.AddressControl; -import org.apache.activemq6.api.core.management.RoleInfo; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.impl.QueueImpl; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.AddressControl; +import org.apache.activemq.api.core.management.RoleInfo; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.impl.QueueImpl; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.UnitTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import static org.apache.activemq6.tests.util.RandomUtil.randomString; +import static org.apache.activemq.tests.util.RandomUtil.randomString; /** * A QueueControlTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java index 9f22639..bd31b49 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlUsingCoreTest.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.management; +package org.apache.activemq.tests.integration.management; import org.junit.Before; import org.junit.After; import org.junit.Test; -import static org.apache.activemq6.tests.util.RandomUtil.randomString; +import static org.apache.activemq.tests.util.RandomUtil.randomString; import java.util.HashSet; import java.util.Set; import org.junit.Assert; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.AddressControl; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.tests.util.RandomUtil; +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.ClientSessionFactory; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.AddressControl; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.tests.util.RandomUtil; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java index 91cf8be..69cbfea 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlTest.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.management; +package org.apache.activemq.tests.integration.management; import org.junit.Before; import org.junit.Test; @@ -23,22 +23,22 @@ import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import org.junit.Assert; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.BridgeControl; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -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.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.tests.integration.SimpleNotificationService; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.BridgeControl; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +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.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.tests.integration.SimpleNotificationService; +import org.apache.activemq.tests.util.RandomUtil; /** * A BridgeControlTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java index c92f17b..1d5ae75 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BridgeControlUsingCoreTest.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.management; +package org.apache.activemq.tests.integration.management; import org.junit.Before; import org.junit.Test; @@ -24,22 +24,22 @@ import javax.management.MBeanServerFactory; import org.junit.Assert; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -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.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +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.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.tests.util.RandomUtil; /** * A BridgeControlTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java index 35fa665..0de7ab0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlTest.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.management; +package org.apache.activemq.tests.integration.management; import org.junit.Test; @@ -19,16 +19,16 @@ import java.util.List; import org.junit.Assert; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.management.BroadcastGroupControl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.core.management.BroadcastGroupControl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.utils.json.JSONArray; /** * @author <a href="[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/management/BroadcastGroupControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java index 438bf4c..4810edf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.management; +package org.apache.activemq.tests.integration.management; -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.BroadcastGroupControl; -import org.apache.activemq6.api.core.management.ResourceNames; +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.BroadcastGroupControl; +import org.apache.activemq.api.core.management.ResourceNames; /** * A BroadcastGroupControlUsingCoreTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java index feb728b..13a45d1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControl2Test.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.management; +package org.apache.activemq.tests.integration.management; import org.junit.Before; import org.junit.After; @@ -26,18 +26,18 @@ import javax.management.MBeanServerFactory; import org.junit.Assert; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.management.ClusterConnectionControl; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.tests.util.RandomUtil; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.core.management.ClusterConnectionControl; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.tests.util.RandomUtil; /** * A BridgeControlTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java index d6da5be..69162cc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlTest.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.management; +package org.apache.activemq.tests.integration.management; import org.junit.Before; import org.junit.After; import org.junit.Test; @@ -24,25 +24,25 @@ import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import org.junit.Assert; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.management.ClusterConnectionControl; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -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.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.tests.integration.SimpleNotificationService; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.core.management.ClusterConnectionControl; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +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.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.tests.integration.SimpleNotificationService; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.utils.json.JSONArray; /** * A BridgeControlTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java index 9b1d8b8..1661632 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ClusterConnectionControlUsingCoreTest.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.management; +package org.apache.activemq.tests.integration.management; import java.util.Map; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.ClusterConnectionControl; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.tests.util.UnitTestCase; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.ClusterConnectionControl; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.tests.util.UnitTestCase; 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/management/CoreMessagingProxy.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java index 14811b0..6a6d2a2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.management; +package org.apache.activemq.tests.integration.management; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientRequestor; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.management.ManagementHelper; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientRequestor; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.management.ManagementHelper; /** * 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/management/DivertControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.java index 45ac298..0d0d5cb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlTest.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.management; +package org.apache.activemq.tests.integration.management; import org.junit.Before; import org.junit.After; @@ -18,17 +18,17 @@ import org.junit.Test; import org.junit.Assert; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.DivertControl; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.config.DivertConfiguration; -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.tests.util.RandomUtil; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.DivertControl; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.config.DivertConfiguration; +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.tests.util.RandomUtil; /** * A BridgeControlTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java index 4bc500a..7596fb7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/DivertControlUsingCoreTest.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.management; - -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.DivertControl; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.tests.util.UnitTestCase; +package org.apache.activemq.tests.integration.management; + +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.DivertControl; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.tests.util.UnitTestCase; 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/management/HornetQServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlTest.java index c9b5118..f780374 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlTest.java @@ -10,43 +10,43 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.management; +package org.apache.activemq.tests.integration.management; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import java.util.HashMap; 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.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.AddressSettingsInfo; -import org.apache.activemq6.api.core.management.BridgeControl; -import org.apache.activemq6.api.core.management.DivertControl; -import org.apache.activemq6.api.core.management.HornetQServerControl; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.api.core.management.QueueControl; -import org.apache.activemq6.api.core.management.RoleInfo; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.messagecounter.impl.MessageCounterManagerImpl; -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.settings.impl.SlowConsumerPolicy; -import org.apache.activemq6.core.transaction.impl.XidImpl; -import org.apache.activemq6.tests.util.RandomUtil; -import org.apache.activemq6.tests.util.UnitTestCase; -import org.apache.activemq6.utils.UUIDGenerator; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.AddressSettingsInfo; +import org.apache.activemq.api.core.management.BridgeControl; +import org.apache.activemq.api.core.management.DivertControl; +import org.apache.activemq.api.core.management.HornetQServerControl; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.api.core.management.QueueControl; +import org.apache.activemq.api.core.management.RoleInfo; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.messagecounter.impl.MessageCounterManagerImpl; +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.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.core.transaction.impl.XidImpl; +import org.apache.activemq.tests.util.RandomUtil; +import org.apache.activemq.tests.util.UnitTestCase; +import org.apache.activemq.utils.UUIDGenerator; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; 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/management/HornetQServerControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlUsingCoreTest.java index b2ab383..1f8744b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/HornetQServerControlUsingCoreTest.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.management; - -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.management.HornetQServerControl; -import org.apache.activemq6.api.core.management.Parameter; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.tests.util.UnitTestCase; +package org.apache.activemq.tests.integration.management; + +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.management.HornetQServerControl; +import org.apache.activemq.api.core.management.Parameter; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.tests.util.UnitTestCase; 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/management/JMXDomainTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java index e4e53af..98f25a7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.integration.management; +package org.apache.activemq.tests.integration.management; import java.util.HashMap; import java.util.Map; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.ObjectNameBuilder; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory; -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.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.ObjectNameBuilder; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; +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.junit.After; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java index d41e63e..72bb0cd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementActivationTest.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.management; +package org.apache.activemq.tests.integration.management; import javax.jms.ConnectionFactory; import javax.jms.Queue; @@ -19,13 +19,13 @@ import javax.naming.NameNotFoundException; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; -import org.apache.activemq6.tests.integration.cluster.failover.FailoverTestBase; -import org.apache.activemq6.tests.unit.util.InVMNamingContext; -import org.apache.activemq6.tests.util.TransportConfigurationUtils; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.tests.integration.cluster.failover.FailoverTestBase; +import org.apache.activemq.tests.unit.util.InVMNamingContext; +import org.apache.activemq.tests.util.TransportConfigurationUtils; import org.junit.After; import org.junit.Before; import org.junit.Test;
