activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [01/11] activemq-artemis git commit: Moving artemis-tools to artemis-cli and improving the tooling
Date Mon, 04 May 2015 15:30:32 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master dc58e431a -> 7965cb71c


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
index c45f8e2..98061d1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
@@ -16,15 +16,12 @@
  */
 package org.apache.activemq.artemis.tests.integration.persistence;
 
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.jms.JMSFactoryType;
-import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.server.JMSServerManager;
-import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.artemis.tests.unit.util.InVMContext;
-import org.junit.Test;
-
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
@@ -32,29 +29,29 @@ import java.util.List;
 
 import org.apache.activemq.artemis.api.core.Message;
 import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ClientConsumer;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
 import org.apache.activemq.artemis.api.core.client.ClientProducer;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
-import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.cli.commands.tools.XmlDataExporter;
+import org.apache.activemq.artemis.cli.commands.tools.XmlDataImporter;
 import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
 import org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl;
-import org.apache.activemq.artemis.tools.XmlDataConstants;
-import org.apache.activemq.artemis.tools.XmlDataExporter;
-import org.apache.activemq.artemis.tools.XmlDataImporter;
+import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.artemis.tests.unit.util.InVMContext;
 import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
+import org.junit.Test;
 
 /**
  * A test of the XML export/import functionality
@@ -114,8 +111,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -125,8 +122,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
       ClientConsumer consumer = session.createConsumer(QUEUE_NAME);
       session.start();
 
@@ -209,8 +206,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -220,8 +217,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
       ClientConsumer consumer = session.createConsumer(QUEUE_NAME);
       session.start();
 
@@ -263,8 +260,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -274,8 +271,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
       ClientConsumer consumer = session.createConsumer(QUEUE_NAME);
       session.start();
 
@@ -299,8 +296,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -310,8 +307,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
 
       ClientSession.QueueQuery queueQuery = session.queueQuery(new SimpleString("queueName1"));
 
@@ -411,8 +408,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -422,8 +419,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
 
       ConnectionFactory cf1 = (ConnectionFactory) namingContext.lookup(jndi_binding1);
       assertNotNull(cf1);
@@ -479,8 +476,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -490,8 +487,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
 
 
       assertNotNull(namingContext.lookup("myQueueJndiBinding1"));
@@ -519,58 +516,6 @@ public class XmlImportExportTest extends ServiceTestBase
    }
 
    @Test
-   public void testJmsDestinationWithAppServerCompatibility() throws Exception
-   {
-      ClientSession session = basicSetUp();
-
-      jmsServer.createQueue(true, "myQueue", null, true, "myQueueJndiBinding1", "myQueueJndiBinding2");
-      jmsServer.createTopic(true, "myTopic", "myTopicJndiBinding1", "myTopicJndiBinding2");
-
-      session.close();
-      locator.close();
-      server.stop();
-
-      ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
-      System.out.print(new String(xmlOutputStream.toByteArray()));
-
-      clearDataRecreateServerDirs();
-      session = basicSetUp();
-
-      ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session, true);
-      xmlDataImporter.processXml();
-
-      assertNotNull(namingContext.lookup("myQueueJndiBinding1"));
-      assertNotNull(namingContext.lookup(XmlDataConstants.JNDI_COMPATIBILITY_PREFIX + "myQueueJndiBinding1"));
-      assertNotNull(namingContext.lookup("myQueueJndiBinding2"));
-      assertNotNull(namingContext.lookup(XmlDataConstants.JNDI_COMPATIBILITY_PREFIX + "myQueueJndiBinding2"));
-      assertNotNull(namingContext.lookup("myTopicJndiBinding1"));
-      assertNotNull(namingContext.lookup(XmlDataConstants.JNDI_COMPATIBILITY_PREFIX + "myTopicJndiBinding1"));
-      assertNotNull(namingContext.lookup("myTopicJndiBinding2"));
-      assertNotNull(namingContext.lookup(XmlDataConstants.JNDI_COMPATIBILITY_PREFIX + "myTopicJndiBinding2"));
-
-      jmsServer.createConnectionFactory("test-cf", false, JMSFactoryType.CF, Arrays.asList("in-vm1"), "test-cf");
-
-      ConnectionFactory cf = (ConnectionFactory) namingContext.lookup("test-cf");
-      Connection connection = cf.createConnection();
-      Session jmsSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-      MessageProducer producer = jmsSession.createProducer((Destination) namingContext.lookup("myQueueJndiBinding1"));
-      producer.send(jmsSession.createTextMessage());
-      MessageConsumer consumer = jmsSession.createConsumer((Destination) namingContext.lookup(XmlDataConstants.JNDI_COMPATIBILITY_PREFIX + "myQueueJndiBinding1"));
-      connection.start();
-      assertNotNull(consumer.receive(3000));
-
-      consumer = jmsSession.createConsumer((Destination) namingContext.lookup("myTopicJndiBinding1"));
-      producer = jmsSession.createProducer((Destination) namingContext.lookup(XmlDataConstants.JNDI_COMPATIBILITY_PREFIX + "myTopicJndiBinding1"));
-      producer.send(jmsSession.createTextMessage());
-      assertNotNull(consumer.receive(3000));
-
-      connection.close();
-   }
-
-   @Test
    public void testLargeMessage() throws Exception
    {
       server = createServer(true);
@@ -608,8 +553,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -619,8 +564,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
       session.close();
       session = factory.createSession(false, false);
       session.start();
@@ -667,8 +612,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -678,8 +623,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
       consumer = session.createConsumer("myQueue1");
       session.start();
       msg = consumer.receive(CONSUMER_TIMEOUT);
@@ -736,8 +681,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -747,8 +692,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
 
       ClientConsumer consumer = session.createConsumer(MY_QUEUE);
 
@@ -807,8 +752,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -818,8 +763,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
 
       ClientConsumer consumer = session.createConsumer(MY_QUEUE);
 
@@ -892,8 +837,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       //System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -903,8 +848,8 @@ public class XmlImportExportTest extends ServiceTestBase
       session = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session);
 
       ClientConsumer consumer = session.createConsumer(MY_QUEUE);
 
@@ -951,8 +896,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -963,8 +908,8 @@ public class XmlImportExportTest extends ServiceTestBase
       ClientSession managementSession = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session, managementSession);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session, managementSession);
       ClientConsumer consumer = session.createConsumer(QUEUE_NAME);
       session.start();
 
@@ -995,8 +940,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -1007,8 +952,8 @@ public class XmlImportExportTest extends ServiceTestBase
       ClientSession managementSession = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session, managementSession);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session, managementSession);
       ClientConsumer consumer = session.createConsumer(QUEUE_NAME);
       session.start();
 
@@ -1050,8 +995,8 @@ public class XmlImportExportTest extends ServiceTestBase
       server.stop();
 
       ByteArrayOutputStream xmlOutputStream = new ByteArrayOutputStream();
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(xmlOutputStream, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       System.out.print(new String(xmlOutputStream.toByteArray()));
 
       clearDataRecreateServerDirs();
@@ -1062,8 +1007,8 @@ public class XmlImportExportTest extends ServiceTestBase
       ClientSession managementSession = factory.createSession(false, true, true);
 
       ByteArrayInputStream xmlInputStream = new ByteArrayInputStream(xmlOutputStream.toByteArray());
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session, managementSession);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session, managementSession);
       ClientConsumer consumer = session.createConsumer(QUEUE_NAME);
       session.start();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/tools/TransferMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/tools/TransferMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/tools/TransferMessageTest.java
deleted file mode 100644
index 83d28b6..0000000
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/tools/TransferMessageTest.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.tests.integration.tools;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.client.ClientConsumer;
-import org.apache.activemq.artemis.api.core.client.ClientMessage;
-import org.apache.activemq.artemis.api.core.client.ClientSession;
-import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
-import org.apache.activemq.artemis.core.postoffice.Binding;
-import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl;
-import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.artemis.core.server.Consumer;
-import org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge;
-import org.apache.activemq.artemis.core.server.impl.QueueImpl;
-import org.apache.activemq.artemis.tools.Main;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TransferMessageTest extends ClusterTestBase
-{
-
-   public static final int NUM_MESSAGES = 2000;
-
-   @Override
-   @Before
-   public void setUp() throws Exception
-   {
-      super.setUp();
-
-      setupServers();
-   }
-
-   @Override
-   @After
-   public void tearDown() throws Exception
-   {
-      stopServers();
-
-      super.tearDown();
-   }
-
-   protected boolean isNetty()
-   {
-      return true;
-   }
-
-
-   public void setupServers() throws Exception
-   {
-      setupServer(0, isFileStorage(), isNetty());
-      setupServer(1, isFileStorage(), isNetty());
-      setupServer(2, isFileStorage(), isNetty());
-      setupServer(3, isFileStorage(), isNetty());
-      setupServer(4, isFileStorage(), isNetty());
-   }
-
-
-   @Test
-   public void testFreezeMessages() throws Throwable
-   {
-      try
-      {
-         setupCluster();
-
-         startServers();
-
-         setupSessionFactory(0, isNetty());
-         setupSessionFactory(1, isNetty());
-         setupSessionFactory(2, isNetty());
-         setupSessionFactory(3, isNetty());
-         setupSessionFactory(4, isNetty());
-
-         createQueue(0, "queues.testaddress", "queue0", null, true);
-         createQueue(1, "queues.testaddress", "queue0", null, true);
-         createQueue(2, "queues.testaddress", "queue0", null, true);
-         createQueue(3, "queues.testaddress", "queue0", null, true);
-         createQueue(4, "queues.testaddress", "queue0", null, true);
-
-         addConsumer(0, 0, "queue0", null);
-         addConsumer(1, 1, "queue0", null);
-         addConsumer(2, 2, "queue0", null);
-         addConsumer(3, 3, "queue0", null);
-         addConsumer(4, 4, "queue0", null);
-
-         waitForBindings(0, "queues.testaddress", 1, 1, true);
-         waitForBindings(1, "queues.testaddress", 1, 1, true);
-         waitForBindings(2, "queues.testaddress", 1, 1, true);
-         waitForBindings(3, "queues.testaddress", 1, 1, true);
-         waitForBindings(4, "queues.testaddress", 1, 1, true);
-
-         waitForBindings(0, "queues.testaddress", 4, 4, false);
-         waitForBindings(1, "queues.testaddress", 4, 4, false);
-         waitForBindings(2, "queues.testaddress", 4, 4, false);
-         waitForBindings(3, "queues.testaddress", 4, 4, false);
-         waitForBindings(4, "queues.testaddress", 4, 4, false);
-
-
-         PostOfficeImpl postOffice = (PostOfficeImpl) servers[0].getPostOffice();
-
-         ArrayList<String> queuesToTransfer = new ArrayList<String>();
-
-//         System.out.println("bindings = " + postOffice.getAddressManager().getBindings().size());
-         for (Map.Entry<SimpleString, Binding> entry : postOffice.getAddressManager().getBindings().entrySet())
-         {
-//            System.out.println("entry: " + entry + " / " + entry.getValue() + " class = " + entry.getValue().getClass());
-
-            if (entry.getValue() instanceof LocalQueueBinding)
-            {
-               LocalQueueBinding localQueueBinding = (LocalQueueBinding) entry.getValue();
-
-               if (localQueueBinding.getBindable() instanceof QueueImpl)
-               {
-                  QueueImpl queue = (QueueImpl) localQueueBinding.getBindable();
-                  for (Consumer consumer : queue.getConsumers())
-                  {
-
-                     if (consumer instanceof ClusterConnectionBridge)
-                     {
-                        queuesToTransfer.add(entry.getKey().toString());
-//                        System.out.println("Removing bridge from consumers, so messages should get stuck");
-                        queue.removeConsumer(consumer);
-                     }
-                  }
-               }
-            }
-         }
-
-         consumers[0].getConsumer().close();
-
-         send(0, "queues.testaddress", NUM_MESSAGES, true, null);
-
-
-         createQueue(0, "output-result", "output-result", null, true);
-
-         queuesToTransfer.add("queue0");
-
-         closeAllConsumers();
-
-         for (String str : queuesToTransfer)
-         {
-            callTransfer("transfer-queue",
-                         "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest",
-                         str,
-                         "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest",
-                         "output-result",
-                         "500", "100");
-         }
-
-         ClientSession session = sfs[0].createSession(false, false);
-         ClientConsumer consumer = session.createConsumer("output-result");
-
-         session.start();
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            ClientMessage msg = consumer.receive(5000);
-            Assert.assertNotNull(msg);
-            msg.acknowledge();
-
-            if (i % 100 == 0)
-            {
-               session.commit();
-            }
-         }
-
-         Assert.assertNull(consumer.receiveImmediate());
-
-         session.commit();
-
-         session.close();
-
-      }
-      catch (Throwable e)
-      {
-         throw e;
-      }
-
-   }
-
-
-   public static void callTransfer(String... args) throws Exception
-   {
-      Main.main(args);
-   }
-
-
-   @Test
-   public void testFreezeMessagesWithFilter() throws Throwable
-   {
-      try
-      {
-         setupCluster();
-
-         startServers();
-
-         setupSessionFactory(0, isNetty());
-         setupSessionFactory(1, isNetty());
-         setupSessionFactory(2, isNetty());
-         setupSessionFactory(3, isNetty());
-         setupSessionFactory(4, isNetty());
-
-         createQueue(0, "queues.testaddress", "queue0", null, true);
-         createQueue(1, "queues.testaddress", "queue0", null, true);
-         createQueue(2, "queues.testaddress", "queue0", null, true);
-         createQueue(3, "queues.testaddress", "queue0", null, true);
-         createQueue(4, "queues.testaddress", "queue0", null, true);
-
-         createQueue(0, "queues2.testaddress", "queue2", null, true);
-         createQueue(1, "queues2.testaddress", "queue2", null, true);
-         createQueue(2, "queues2.testaddress", "queue2", null, true);
-         createQueue(3, "queues2.testaddress", "queue2", null, true);
-         createQueue(4, "queues2.testaddress", "queue2", null, true);
-
-         addConsumer(0, 0, "queue0", null);
-         addConsumer(1, 1, "queue0", null);
-         addConsumer(2, 2, "queue0", null);
-         addConsumer(3, 3, "queue0", null);
-         addConsumer(4, 4, "queue0", null);
-
-         addConsumer(5, 0, "queue2", null);
-         addConsumer(6, 1, "queue2", null);
-         addConsumer(7, 2, "queue2", null);
-         addConsumer(8, 3, "queue2", null);
-         addConsumer(9, 4, "queue2", null);
-
-         waitForBindings(0, "queues.testaddress", 1, 1, true);
-         waitForBindings(1, "queues.testaddress", 1, 1, true);
-         waitForBindings(2, "queues.testaddress", 1, 1, true);
-         waitForBindings(3, "queues.testaddress", 1, 1, true);
-         waitForBindings(4, "queues.testaddress", 1, 1, true);
-
-         waitForBindings(0, "queues.testaddress", 4, 4, false);
-         waitForBindings(1, "queues.testaddress", 4, 4, false);
-         waitForBindings(2, "queues.testaddress", 4, 4, false);
-         waitForBindings(3, "queues.testaddress", 4, 4, false);
-         waitForBindings(4, "queues.testaddress", 4, 4, false);
-
-
-         waitForBindings(0, "queues2.testaddress", 1, 1, true);
-         waitForBindings(1, "queues2.testaddress", 1, 1, true);
-         waitForBindings(2, "queues2.testaddress", 1, 1, true);
-         waitForBindings(3, "queues2.testaddress", 1, 1, true);
-         waitForBindings(4, "queues2.testaddress", 1, 1, true);
-
-         waitForBindings(0, "queues2.testaddress", 4, 4, false);
-         waitForBindings(1, "queues2.testaddress", 4, 4, false);
-         waitForBindings(2, "queues2.testaddress", 4, 4, false);
-         waitForBindings(3, "queues2.testaddress", 4, 4, false);
-         waitForBindings(4, "queues2.testaddress", 4, 4, false);
-
-
-         PostOfficeImpl postOffice = (PostOfficeImpl) servers[0].getPostOffice();
-
-         ArrayList<String> queuesToTransfer = new ArrayList<String>();
-
-//         System.out.println("bindings = " + postOffice.getAddressManager().getBindings().size());
-         for (Map.Entry<SimpleString, Binding> entry : postOffice.getAddressManager().getBindings().entrySet())
-         {
-//            System.out.println("entry: " + entry + " / " + entry.getValue() + " class = " + entry.getValue().getClass());
-
-            if (entry.getValue() instanceof LocalQueueBinding)
-            {
-               LocalQueueBinding localQueueBinding = (LocalQueueBinding) entry.getValue();
-
-               if (localQueueBinding.getBindable() instanceof QueueImpl)
-               {
-                  QueueImpl queue = (QueueImpl) localQueueBinding.getBindable();
-                  for (Consumer consumer : queue.getConsumers())
-                  {
-
-                     if (consumer instanceof ClusterConnectionBridge)
-                     {
-                        queuesToTransfer.add(entry.getKey().toString());
-//                        System.out.println("Removing bridge from consumers, so messages should get stuck");
-                        queue.removeConsumer(consumer);
-                     }
-                  }
-               }
-            }
-         }
-
-         closeAllConsumers();
-
-         send(0, "queues.testaddress", NUM_MESSAGES, true, null);
-
-         send(0, "queues2.testaddress", 1000, true, null);
-
-
-         createQueue(0, "tmp-queue", "tmp-queue", null, true);
-
-         queuesToTransfer.add("queue0");
-
-         queuesToTransfer.add("queue2");
-
-         for (String str : queuesToTransfer)
-         {
-            callTransfer("transfer-queue",
-                         "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest",
-                         str,
-                         "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest",
-                         "tmp-queue",
-                         "500", "100");
-         }
-
-
-         createQueue(0, "output-result", "output-result", null, true);
-
-
-         System.out.println("Transferring the main output-queue now");
-
-
-         callTransfer("transfer-queue",
-                      "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest",
-                      "tmp-queue",
-                      "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest",
-                      "output-result",
-                      "500", "100",
-                      "_AMQ_TOOL_original_address='queues.testaddress'");
-
-
-         ClientSession session = sfs[0].createSession(false, false);
-         ClientConsumer consumer = session.createConsumer("output-result");
-
-         session.start();
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            ClientMessage msg = consumer.receive(5000);
-            Assert.assertNotNull(msg);
-            msg.acknowledge();
-
-            if (i % 100 == 0)
-            {
-               session.commit();
-            }
-         }
-
-
-         Assert.assertNull(consumer.receiveImmediate());
-
-         session.commit();
-
-         stopServers(1, 2, 3, 4);
-
-
-         System.out.println("Last transfer!!!");
-
-         callTransfer("transfer-queue",
-                      "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest",
-                      "tmp-queue",
-                      "127.0.0.1", "" + TransportConstants.DEFAULT_PORT, "guest", "guest",
-                      "output-result",
-                      "500", "100",
-                      "_AMQ_TOOL_original_address='queues2.testaddress'");
-
-         session.start();
-
-
-         for (int i = 0; i < 1000; i++)
-         {
-            ClientMessage msg = consumer.receive(5000);
-            Assert.assertNotNull(msg);
-            msg.acknowledge();
-
-            if (i % 100 == 0)
-            {
-               session.commit();
-            }
-         }
-
-         Assert.assertNull(consumer.receiveImmediate());
-
-         session.commit();
-
-         session.close();
-
-      }
-      catch (Throwable e)
-      {
-         throw e;
-      }
-
-   }
-
-
-   protected void setupCluster() throws Exception
-   {
-      setupCluster(false);
-   }
-
-
-   protected void startServers() throws Exception
-   {
-      startServers(0, 1, 2, 3, 4);
-   }
-
-
-   protected void setupCluster(final boolean forwardWhenNoConsumers) throws Exception
-   {
-      setupClusterConnection("cluster0", "queues", forwardWhenNoConsumers, 1, isNetty(), 0, 1, 2, 3, 4);
-
-      setupClusterConnection("cluster1", "queues", forwardWhenNoConsumers, 1, isNetty(), 1, 0, 2, 3, 4);
-
-      setupClusterConnection("cluster2", "queues", forwardWhenNoConsumers, 1, isNetty(), 2, 0, 1, 3, 4);
-
-      setupClusterConnection("cluster3", "queues", forwardWhenNoConsumers, 1, isNetty(), 3, 0, 1, 2, 4);
-
-      setupClusterConnection("cluster4", "queues", forwardWhenNoConsumers, 1, isNetty(), 4, 0, 1, 2, 3);
-   }
-
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 27c6d0e..e58199b 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -74,7 +74,7 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-bootstrap</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/joram-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index 04c4ca7..9e6771e 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -46,7 +46,7 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-bootstrap</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index fa2db0b..e630cbe 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -72,7 +72,7 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-bootstrap</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/soak-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index da88aec..9cff664 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -72,7 +72,7 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-bootstrap</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/stress-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index d48d112..3fc2818 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -79,7 +79,7 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-bootstrap</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java
----------------------------------------------------------------------
diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java
index ff344ed..1f10fd5 100644
--- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java
+++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/XmlImportExportStressTest.java
@@ -16,24 +16,23 @@
  */
 package org.apache.activemq.artemis.tests.stress.journal;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
 import org.apache.activemq.artemis.api.core.client.ClientConsumer;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
 import org.apache.activemq.artemis.api.core.client.ClientProducer;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.cli.commands.tools.XmlDataExporter;
+import org.apache.activemq.artemis.cli.commands.tools.XmlDataImporter;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.tests.util.ServiceTestBase;
 import org.junit.Test;
 
-import org.apache.activemq.artemis.tools.XmlDataExporter;
-import org.apache.activemq.artemis.tools.XmlDataImporter;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
 public class XmlImportExportStressTest extends ServiceTestBase
 {
    public static final int CONSUMER_TIMEOUT = 5000;
@@ -85,8 +84,8 @@ public class XmlImportExportStressTest extends ServiceTestBase
       System.out.println("Writing XML...");
       FileOutputStream xmlOutputStream = new FileOutputStream(FILE_NAME);
       BufferedOutputStream bufferOut = new BufferedOutputStream(xmlOutputStream);
-      XmlDataExporter xmlDataExporter = new XmlDataExporter(bufferOut, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
-      xmlDataExporter.writeXMLData();
+      XmlDataExporter xmlDataExporter = new XmlDataExporter();
+      xmlDataExporter.process(bufferOut, getBindingsDir(), getJournalDir(), getPageDir(), getLargeMessagesDir());
       bufferOut.close();
       System.out.println("Done writing XML.");
 
@@ -102,8 +101,8 @@ public class XmlImportExportStressTest extends ServiceTestBase
 
       System.out.println("Reading XML...");
       FileInputStream xmlInputStream = new FileInputStream(FILE_NAME);
-      XmlDataImporter xmlDataImporter = new XmlDataImporter(xmlInputStream, session, managementSession);
-      xmlDataImporter.processXml();
+      XmlDataImporter xmlDataImporter = new XmlDataImporter();
+      xmlDataImporter.process(xmlInputStream, session, managementSession);
       xmlInputStream.close();
       System.out.println("Done reading XML.");
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/timing-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index df7d514..b9f072b 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -61,7 +61,7 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-bootstrap</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 708ace5..7be22e4 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -62,12 +62,12 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-bootstrap</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-tools</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
index 0bf7928..9648ed6 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestBase.java
@@ -15,12 +15,6 @@
  * limitations under the License.
  */
 package org.apache.activemq.artemis.tests.unit.core.journal.impl;
-import org.apache.activemq.artemis.tests.util.UnitTestCase;
-import org.apache.activemq.artemis.tools.ExportJournal;
-import org.apache.activemq.artemis.tools.ImportJournal;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.ArrayList;
@@ -31,15 +25,19 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
-import org.junit.Assert;
-
+import org.apache.activemq.artemis.cli.commands.tools.DecodeJournal;
+import org.apache.activemq.artemis.cli.commands.tools.EncodeJournal;
 import org.apache.activemq.artemis.core.journal.EncodingSupport;
 import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
 import org.apache.activemq.artemis.core.journal.RecordInfo;
 import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
 import org.apache.activemq.artemis.core.journal.TestableJournal;
 import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
+import org.apache.activemq.artemis.tests.util.UnitTestCase;
 import org.apache.activemq.artemis.utils.ReusableLatch;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
 
 public abstract class JournalImplTestBase extends UnitTestCase
 {
@@ -226,7 +224,7 @@ public abstract class JournalImplTestBase extends UnitTestCase
    {
       System.out.println("Exporting to " + getTestDir() + "/output.log");
 
-      ExportJournal.exportJournal(getTestDir(),
+      EncodeJournal.exportJournal(getTestDir(),
                                   this.filePrefix,
                                   this.fileExtension,
                                   this.minFiles,
@@ -253,7 +251,7 @@ public abstract class JournalImplTestBase extends UnitTestCase
          file.delete();
       }
 
-      ImportJournal.importJournal(getTestDir(),
+      DecodeJournal.importJournal(getTestDir(),
                                   filePrefix,
                                   fileExtension,
                                   minFiles,


Mime
View raw message