http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java index d53ab9e..eec0236 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.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.util; +package org.apache.activemq.tests.util; import javax.management.MBeanServer; import java.io.File; @@ -23,52 +23,52 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.core.client.impl.Topology; -import org.apache.activemq6.core.client.impl.TopologyMemberImpl; -import org.apache.activemq6.core.config.Configuration; -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.JournalFile; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.JournalReaderCallback; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq6.core.remoting.impl.invm.InVMRegistry; -import org.apache.activemq6.core.remoting.impl.invm.TransportConstants; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.HornetQServers; -import org.apache.activemq6.core.server.NodeManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.cluster.RemoteQueueBinding; -import org.apache.activemq6.core.server.impl.Activation; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.core.server.impl.SharedNothingBackupActivation; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.spi.core.security.HornetQSecurityManager; -import org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.core.client.impl.Topology; +import org.apache.activemq.core.client.impl.TopologyMemberImpl; +import org.apache.activemq.core.config.Configuration; +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.JournalFile; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.JournalReaderCallback; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.Bindings; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.core.remoting.impl.invm.InVMRegistry; +import org.apache.activemq.core.remoting.impl.invm.TransportConstants; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.NodeManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.cluster.RemoteQueueBinding; +import org.apache.activemq.core.server.impl.Activation; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.core.server.impl.SharedNothingBackupActivation; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl; +import org.apache.activemq.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -249,12 +249,12 @@ public abstract class ServiceTestBase extends UnitTestCase if (netty) { - params.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + node); + params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + node); } else { - params.put(org.apache.activemq6.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); + params.put(org.apache.activemq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, node); } return params; @@ -269,8 +269,8 @@ public abstract class ServiceTestBase extends UnitTestCase Map<String, Object> server1Params = new HashMap<String, Object>(); - server1Params.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); return new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, server1Params); } @@ -284,8 +284,8 @@ public abstract class ServiceTestBase extends UnitTestCase Map<String, Object> server1Params = new HashMap<String, Object>(); - server1Params.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, - org.apache.activemq6.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.apache.activemq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); return new TransportConfiguration(NETTY_CONNECTOR_FACTORY, server1Params); }
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java index 7940de9..bdd0ee9 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.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.util; +package org.apache.activemq.tests.util; import org.junit.Test; @@ -19,8 +19,8 @@ import java.util.concurrent.CountDownLatch; import org.junit.Assert; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.utils.DataConstants; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java index 336b1bb..8f81180 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.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.util; +package org.apache.activemq.tests.util; -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.core.config.Configuration; -import org.apache.activemq6.core.server.HornetQServer; +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.core.config.Configuration; +import org.apache.activemq.core.server.HornetQServer; import org.junit.Before; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java index 8eef61a..c0edcff 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.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.util; +package org.apache.activemq.tests.util; import javax.naming.Context; import javax.transaction.xa.XAException; @@ -49,60 +49,60 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientConsumer; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryImpl; -import org.apache.activemq6.core.client.impl.ServerLocatorImpl; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; -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.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; -import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; -import org.apache.activemq6.core.persistence.impl.journal.OperationContextImpl; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; -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.InVMRegistry; -import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnector; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.core.server.cluster.ClusterManager; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.core.transaction.impl.XidImpl; -import org.apache.activemq6.tests.CoreUnitTestCase; -import org.apache.activemq6.utils.OrderedExecutorFactory; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; +import org.apache.activemq.core.client.impl.ServerLocatorImpl; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.ConfigurationImpl; +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.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; +import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq.core.persistence.impl.journal.OperationContextImpl; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.Bindings; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; +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.InVMRegistry; +import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.apache.activemq.core.remoting.impl.netty.NettyConnector; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.core.server.cluster.ClusterManager; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.core.transaction.impl.XidImpl; +import org.apache.activemq.tests.CoreUnitTestCase; +import org.apache.activemq.utils.OrderedExecutorFactory; +import org.apache.activemq.utils.UUIDGenerator; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -113,7 +113,7 @@ import org.junit.rules.TestName; /** * Helper base class for our unit tests. * <p/> - * See {@code org.apache.activemq6.tests.util.ServiceTestBase} for a test case with server set-up. + * See {@code org.apache.activemq.tests.util.ServiceTestBase} for a test case with server set-up. * * @author <a href="mailto:[email protected]";>Tim Fox</a> * @author <a href="mailto:[email protected]";>Clebert</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/ConfigurationTest-full-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml index 4149d87..5d6faef 100644 --- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml +++ b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml @@ -21,7 +21,7 @@ <replication-clustername>cluster-connection1</replication-clustername> <scale-down-clustername>cluster-connection2</scale-down-clustername> <max-saved-replicated-journals-size>5</max-saved-replicated-journals-size> - <password-codec>org.apache.activemq6.utils.DefaultSensitiveStringCodec</password-codec> + <password-codec>org.apache.activemq.utils.DefaultSensitiveStringCodec</password-codec> <mask-password>true</mask-password> <log-delegate-factory-class-name>com.foo</log-delegate-factory-class-name> <jmx-management-enabled>false</jmx-management-enabled> @@ -38,8 +38,8 @@ <id-cache-size>127</id-cache-size> <persist-id-cache>true</persist-id-cache> <remoting-interceptors> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2</class-name> </remoting-interceptors> <backup>true</backup> <allow-failback>true</allow-failback> @@ -52,26 +52,26 @@ <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery> <connectors> <connector name="connector1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> <param key="a1" value="v1"/> <param key="a2" value="123"/> <param key="a3" value="345"/> <param key="a4" value="v4"/> </connector> <connector name="connector2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> <param key="b1" value="w1"/> <param key="b2" value="234"/> </connector> </connectors> <acceptors> <acceptor name="acceptor1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> <param key="d1" value="y1"/> <param key="d2" value="456"/> </acceptor> <acceptor name="acceptor2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> <param key="e1" value="z1"/> <param key="e2" value="567"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/InvalidConfigurationTest0.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml index d5c759e..cce37ed 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml @@ -52,32 +52,32 @@ <memory-measure-interval>54321</memory-measure-interval> <remoting-interceptors> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2</class-name> </remoting-interceptors> <connectors> <connector name="connector1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> <param key="a1" value="v1"/> <param key="a2" value="123"/> <param key="a3" value="345"/> <param key="a4" value="v4"/> </connector> <connector name="connector2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> <param key="b1" value="w1"/> <param key="b2" value="234"/> </connector> </connectors> <acceptors> <acceptor name="acceptor1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> <param key="d1" value="y1"/> <param key="d2" value="456"/> </acceptor> <acceptor name="acceptor2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> <param key="e1" value="z1"/> <param key="e2" value="567"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/InvalidConfigurationTest1.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml index e410c59..13c68b1 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml @@ -52,32 +52,32 @@ <memory-measure-interval>54321</memory-measure-interval> <remoting-interceptors> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2</class-name> </remoting-interceptors> <connectors> <connector name="connector1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> <param key="a1" value="v1"/> <param key="a2" value="123"/> <param key="a3" value="345"/> <param key="a4" value="v4"/> </connector> <connector name="connector2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> <param key="b1" value="w1"/> <param key="b2" value="234"/> </connector> </connectors> <acceptors> <acceptor name="acceptor1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> <param key="d1" value="y1"/> <param key="d2" value="456"/> </acceptor> <acceptor name="acceptor2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> <param key="e1" value="z1"/> <param key="e2" value="567"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/InvalidConfigurationTest2.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml index 22b0277..fe76cf5 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml @@ -52,32 +52,32 @@ <memory-measure-interval>54321</memory-measure-interval> <remoting-interceptors> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2</class-name> </remoting-interceptors> <connectors> <connector name="connector1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> <param key="a1" value="v1"/> <param key="a2" value="123"/> <param key="a3" value="345"/> <param key="a4" value="v4"/> </connector> <connector name="connector2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> <param key="b1" value="w1"/> <param key="b2" value="234"/> </connector> </connectors> <acceptors> <acceptor name="acceptor1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> <param key="d1" value="y1"/> <param key="d2" value="456"/> </acceptor> <acceptor name="acceptor2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> <param key="e1" value="z1"/> <param key="e2" value="567"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/InvalidConfigurationTest3.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml index 9743f27..2b3dec2 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml @@ -52,32 +52,32 @@ <memory-measure-interval>54321</memory-measure-interval> <remoting-interceptors> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2</class-name> </remoting-interceptors> <connectors> <connector name="connector1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> <param key="a1" value="v1"/> <param key="a2" value="123"/> <param key="a3" value="345"/> <param key="a4" value="v4"/> </connector> <connector name="connector2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> <param key="b1" value="w1"/> <param key="b2" value="234"/> </connector> </connectors> <acceptors> <acceptor name="acceptor1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> <param key="d1" value="y1"/> <param key="d2" value="456"/> </acceptor> <acceptor name="acceptor2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> <param key="e1" value="z1"/> <param key="e2" value="567"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/InvalidConfigurationTest4.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml index 5b58285..5399be6 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml @@ -52,32 +52,32 @@ <memory-measure-interval>54321</memory-measure-interval> <remoting-interceptors> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2</class-name> </remoting-interceptors> <connectors> <connector name="connector1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> <param key="a1" value="v1"/> <param key="a2" value="123"/> <param key="a3" value="345"/> <param key="a4" value="v4"/> </connector> <connector name="connector2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> <param key="b1" value="w1"/> <param key="b2" value="234"/> </connector> </connectors> <acceptors> <acceptor name="acceptor1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> <param key="d1" value="y1"/> <param key="d2" value="456"/> </acceptor> <acceptor name="acceptor2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> <param key="e1" value="z1"/> <param key="e2" value="567"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/InvalidConfigurationTest5.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml index 032552f..90d7771 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml @@ -52,32 +52,32 @@ <memory-measure-interval>54321</memory-measure-interval> <remoting-interceptors> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor1</class-name> - <class-name>org.apache.activemq6.tests.unit.core.config.impl.TestInterceptor2</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor1</class-name> + <class-name>org.apache.activemq.tests.unit.core.config.impl.TestInterceptor2</class-name> </remoting-interceptors> <connectors> <connector name="connector1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> <param key="a1" value="v1"/> <param key="a2" value="123"/> <param key="a3" value="345"/> <param key="a4" value="v4"/> </connector> <connector name="connector2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> <param key="b1" value="w1"/> <param key="b2" value="234"/> </connector> </connectors> <acceptors> <acceptor name="acceptor1"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> <param key="d1" value="y1"/> <param key="d2" value="456"/> </acceptor> <acceptor name="acceptor2"> - <factory-class>org.apache.activemq6.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> + <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> <param key="e1" value="z1"/> <param key="e2" value="567"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml index b46f513..7504205 100644 --- a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml +++ b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml @@ -17,14 +17,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> <!-- This connector corresponds to the New York server --> <connector name="newyork-connector"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -33,7 +33,7 @@ <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> @@ -59,7 +59,7 @@ <address>jms.topic.priceUpdates</address> <forwarding-address>jms.queue.priceForwarding</forwarding-address> <filter string="office='New York'"/> - <transformer-class-name>org.apache.activemq6.jms.example.AddForwardingTimeTransformer</transformer-class-name> + <transformer-class-name>org.apache.activemq.jms.example.AddForwardingTimeTransformer</transformer-class-name> <exclusive>true</exclusive> </divert> </diverts> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/test/resources/logging.properties ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/logging.properties b/activemq-server/src/test/resources/logging.properties index 485bdcd..fe033b1 100644 --- a/activemq-server/src/test/resources/logging.properties +++ b/activemq-server/src/test/resources/logging.properties @@ -22,11 +22,11 @@ # Additional logger names to configure (root logger is always configured) # Root logger option -loggers=org.jboss.logging,org.apache.activemq6.core.server +loggers=org.jboss.logging,org.apache.activemq.core.server # Dump system environment at boot by default logger.org.jboss.logging=TRACE -logger.org.apache.activemq6.core.server=TRACE +logger.org.apache.activemq.core.server=TRACE # Root logger level logger.level=INFO @@ -50,7 +50,7 @@ handler.FILE.formatter=PATTERN # Console handler configuration -handler.TEST=org.apache.activemq6.tests.logging.AssertionLoggerHandler +handler.TEST=org.apache.activemq.tests.logging.AssertionLoggerHandler handler.TEST.level=TRACE handler.TEST.formatter=PATTERN http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-service-sar/pom.xml b/activemq-service-sar/pom.xml index 9a31e49..f6e8492 100644 --- a/activemq-service-sar/pom.xml +++ b/activemq-service-sar/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-service-sar</artifactId> + <artifactId>activemq-service-sar</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 JBoss AS4 Integration</name> @@ -30,18 +30,18 @@ <artifactId>jboss-logging</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jboss-as-integration</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jboss-as-integration</artifactId> <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java index efbce8f..6d20f96 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.FileConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.FileConfiguration; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java index 9527fcc..4fd9e2a 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; -import org.apache.activemq6.core.config.Configuration; +import org.apache.activemq.core.config.Configuration; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java index 16154f0..433044a 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; -import org.apache.activemq6.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java index da7efd9..7859eaf 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java index 053615c..7e4d0e0 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; import org.jboss.logging.annotations.MessageBundle; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java index 6b0f75a..4f6a31a 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; import org.jboss.logging.annotations.MessageLogger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java index c523153..4008d00 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; import javax.management.MBeanRegistration; import javax.management.MBeanServer; import javax.management.ObjectName; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.impl.HornetQServerImpl; -import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.ConfigurationImpl; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.impl.HornetQServerImpl; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; /** * @author <a href="mailto:[email protected]";>Lucaz Amador</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java index 1aacad1..6f96f2b 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; -import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServer; /** * @author <a href="mailto:[email protected]";>Lucaz Amador</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java index b75bd4f..36dd27c 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; -import org.apache.activemq6.integration.jboss.security.JBossASSecurityManager; +import org.apache.activemq.integration.jboss.security.JBossASSecurityManager; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java ---------------------------------------------------------------------- diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java index d744e35..dd051f2 100644 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java +++ b/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.service; +package org.apache.activemq.service; -import org.apache.activemq6.integration.jboss.security.JBossASSecurityManager; +import org.apache.activemq.integration.jboss.security.JBossASSecurityManager; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-tools/pom.xml b/activemq-tools/pom.xml index 741a353..2453ced 100644 --- a/activemq-tools/pom.xml +++ b/activemq-tools/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-tools</artifactId> + <artifactId>activemq-tools</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 Tools</name> @@ -22,13 +22,13 @@ <artifactId>jboss-logging-processor</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-server</artifactId> <version>${project.version}</version> </dependency> </dependencies> @@ -44,7 +44,7 @@ <configuration> <archive> <manifest> - <mainClass>org.apache.activemq6.tools.Main</mainClass> + <mainClass>org.apache.activemq.tools.Main</mainClass> </manifest> </archive> <descriptorRefs> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java b/activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java index 60c2814..8b294ba 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/DataTool.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; import java.io.File; import java.util.ArrayList; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; -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.activemq.core.config.impl.ConfigurationImpl; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; /** * @author Clebert Suconic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/HornetQToolsLogger.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/HornetQToolsLogger.java b/activemq-tools/src/main/java/org/apache/activemq/tools/HornetQToolsLogger.java index 5027fab..d87410c 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/HornetQToolsLogger.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/HornetQToolsLogger.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/Main.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/Main.java b/activemq-tools/src/main/java/org/apache/activemq/tools/Main.java index 7546d12..0a59d47 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/Main.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/Main.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; public class Main { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java b/activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java index 28a34c5..26085ae 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/PrintData.java @@ -11,21 +11,21 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; import java.io.File; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; -import org.apache.activemq6.core.server.impl.FileLockNodeManager; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq.core.server.impl.FileLockNodeManager; /** - * Writes a human-readable interpretation of the contents of a HornetQ {@link org.apache.activemq6.core.journal.Journal}. + * Writes a human-readable interpretation of the contents of a HornetQ {@link org.apache.activemq.core.journal.Journal}. * <p> * To run this class with Maven, use: * * <pre> * cd hornetq-server - * mvn -q exec:java -Dexec.args="/foo/hornetq/bindings /foo/hornetq/journal" -Dexec.mainClass="org.apache.activemq6.tools.PrintData" + * mvn -q exec:java -Dexec.args="/foo/hornetq/bindings /foo/hornetq/journal" -Dexec.mainClass="org.apache.activemq.tools.PrintData" * </pre> * @author clebertsuconic */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java b/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java index 84e2015..d05260b 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/PrintPages.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; import java.util.ArrayList; import java.util.HashMap; @@ -24,34 +24,34 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; -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.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.PagingStoreFactory; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; -import org.apache.activemq6.core.paging.impl.PagingManagerImpl; -import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.apache.activemq6.core.persistence.impl.nullpm.NullStorageManager; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq6.utils.ExecutorFactory; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.config.impl.ConfigurationImpl; +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.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.PagingStoreFactory; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq.core.paging.impl.PagingManagerImpl; +import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq.core.persistence.impl.nullpm.NullStorageManager; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq.utils.ExecutorFactory; /** * A PrintPage http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java b/activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java index e571a1c..8bac92a 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/TransferQueue.java @@ -11,23 +11,23 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; import java.util.HashMap; import java.util.LinkedList; 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.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientConsumer; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; /** * @author Clebert Suconic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java index af03b27..88fa440 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataConstants.java @@ -11,11 +11,11 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; /** - * The constants shared by <code>org.apache.activemq6.tools.XmlDataImporter</code> and - * <code>org.apache.activemq6.tools.XmlDataExporter</code>. + * The constants shared by <code>org.apache.activemq.tools.XmlDataImporter</code> and + * <code>org.apache.activemq.tools.XmlDataExporter</code>. * * @author Justin Bertram */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java index 4a55c87..409741d 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; @@ -33,61 +33,61 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -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.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.jms.JMSFactoryType; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; -import org.apache.activemq6.core.journal.Journal; -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.TransactionFailureCallback; -import org.apache.activemq6.core.journal.impl.JournalImpl; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.message.BodyEncoder; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.PagingStoreFactory; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.paging.cursor.impl.PagePositionImpl; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.paging.impl.PageTransactionInfoImpl; -import org.apache.activemq6.core.paging.impl.PagingManagerImpl; -import org.apache.activemq6.core.paging.impl.PagingStoreFactoryNIO; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal.MessageDescribe; -import org.apache.activemq6.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; -import org.apache.activemq6.core.persistence.impl.journal.JournalRecordIds; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.AckDescribe; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; -import org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager.PersistentQueueBindingEncoding; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq6.jms.persistence.config.PersistedConnectionFactory; -import org.apache.activemq6.jms.persistence.config.PersistedDestination; -import org.apache.activemq6.jms.persistence.config.PersistedJNDI; -import org.apache.activemq6.jms.persistence.config.PersistedType; -import org.apache.activemq6.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; -import org.apache.activemq6.utils.Base64; -import org.apache.activemq6.utils.ExecutorFactory; +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.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.impl.ConfigurationImpl; +import org.apache.activemq.core.journal.Journal; +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.TransactionFailureCallback; +import org.apache.activemq.core.journal.impl.JournalImpl; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.message.BodyEncoder; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.PagingStoreFactory; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.paging.cursor.impl.PagePositionImpl; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.paging.impl.PageTransactionInfoImpl; +import org.apache.activemq.core.paging.impl.PagingManagerImpl; +import org.apache.activemq.core.paging.impl.PagingStoreFactoryNIO; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal.MessageDescribe; +import org.apache.activemq.core.persistence.impl.journal.DescribeJournal.ReferenceDescribe; +import org.apache.activemq.core.persistence.impl.journal.JournalRecordIds; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.AckDescribe; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding; +import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.PersistentQueueBindingEncoding; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; +import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory; +import org.apache.activemq.jms.persistence.config.PersistedDestination; +import org.apache.activemq.jms.persistence.config.PersistedJNDI; +import org.apache.activemq.jms.persistence.config.PersistedType; +import org.apache.activemq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl; +import org.apache.activemq.utils.Base64; +import org.apache.activemq.utils.ExecutorFactory; /** * Read the journal, page, and large-message data from a stopped instance of HornetQ and save it in an XML format to * a file. It uses the StAX <code>javax.xml.stream.XMLStreamWriter</code> for speed and simplicity. Output can be - * read by <code>org.apache.activemq6.core.persistence.impl.journal.XmlDataImporter</code>. + * read by <code>org.apache.activemq.core.persistence.impl.journal.XmlDataImporter</code>. * * @author Justin Bertram */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java index d18153e..5e959db 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataImporter.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.tools; +package org.apache.activemq.tools; import javax.xml.stream.XMLInputFactory; @@ -31,26 +31,26 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClientMessage; -import org.apache.activemq6.api.core.client.ClientProducer; -import org.apache.activemq6.api.core.client.ClientRequestor; -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.ManagementHelper; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory; -import org.apache.activemq6.core.remoting.impl.netty.TransportConstants; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.utils.Base64; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.api.core.client.ClientProducer; +import org.apache.activemq.api.core.client.ClientRequestor; +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.ManagementHelper; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.utils.Base64; /** - * Read XML output from <code>org.apache.activemq6.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and + * Read XML output from <code>org.apache.activemq.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and * send the messages to a running instance of HornetQ. It uses the StAX <code>javax.xml.stream.XMLStreamReader</code> * for speed and simplicity. * @@ -85,7 +85,7 @@ public final class XmlDataImporter /** * This is the normal constructor for programmatic access to the - * <code>org.apache.activemq6.core.persistence.impl.journal.XmlDataImporter</code> if the session passed + * <code>org.apache.activemq.core.persistence.impl.journal.XmlDataImporter</code> if the session passed * in uses auto-commit for sends. * <p/> * If the session needs to be transactional then use the constructor which takes 2 sessions. @@ -101,7 +101,7 @@ public final class XmlDataImporter /** * This is the normal constructor for programmatic access to the - * <code>org.apache.activemq6.core.persistence.impl.journal.XmlDataImporter</code> if the session passed + * <code>org.apache.activemq.core.persistence.impl.journal.XmlDataImporter</code> if the session passed * in uses auto-commit for sends. * <p/> * If the session needs to be transactional then use the constructor which takes 2 sessions. @@ -239,7 +239,7 @@ public final class XmlDataImporter Byte priority = 0; Long expiration = 0L; Long timestamp = 0L; - org.apache.activemq6.utils.UUID userId = null; + org.apache.activemq.utils.UUID userId = null; ArrayList<String> queues = new ArrayList<>(); // get message's attributes @@ -261,7 +261,7 @@ public final class XmlDataImporter timestamp = Long.parseLong(reader.getAttributeValue(i)); break; case XmlDataConstants.MESSAGE_USER_ID: - userId = org.apache.activemq6.utils.UUIDGenerator.getInstance().generateUUID(); + userId = org.apache.activemq.utils.UUIDGenerator.getInstance().generateUUID(); break; } }
