activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [02/11] activemq-artemis git commit: Moving artemis-tools to artemis-cli and improving the tooling
Date Mon, 04 May 2015 15:30:33 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataImporter.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataImporter.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataImporter.java
deleted file mode 100644
index 8ce2563..0000000
--- a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/XmlDataImporter.java
+++ /dev/null
@@ -1,1076 +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.tools;
-
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-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.ClientMessage;
-import org.apache.activemq.artemis.api.core.client.ClientProducer;
-import org.apache.activemq.artemis.api.core.client.ClientRequestor;
-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.core.management.ManagementHelper;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
-import org.apache.activemq.artemis.core.message.impl.MessageImpl;
-import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
-import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.apache.activemq.artemis.utils.Base64;
-
-/**
- * Read XML output from <code>org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and
- * send the messages to a running instance of ActiveMQ.  It uses the StAX <code>javax.xml.stream.XMLStreamReader</code>
- * for speed and simplicity.
- */
-public final class XmlDataImporter
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   private final XMLStreamReader reader;
-
-   // this session is really only needed if the "session" variable does not auto-commit sends
-   final ClientSession managementSession;
-
-   final boolean localSession;
-
-   final Map<String, String> addressMap = new HashMap<>();
-
-   final Map<String, Long> queueIDs = new HashMap<>();
-
-   String tempFileName = "";
-
-   private final ClientSession session;
-
-   private boolean applicationServerCompatibility = false;
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   /**
-    * This is the normal constructor for programmatic access to the
-    * <code>org.apache.activemq.artemis.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.
-    *
-    * @param inputStream the stream from which to read the XML for import
-    * @param session     used for sending messages, must use auto-commit for sends
-    * @throws Exception
-    */
-   public XmlDataImporter(InputStream inputStream, ClientSession session) throws Exception
-   {
-      this(inputStream, session, null, false);
-   }
-
-   /**
-    * This is the normal constructor for programmatic access to the
-    * <code>org.apache.activemq.artemis.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.
-    *
-    * @param inputStream                    the stream from which to read the XML for import
-    * @param session                        used for sending messages, must use auto-commit for sends
-    * @param applicationServerCompatibility whether or not the JNDI entries for JMS connection factories and
-    *                                       destinations should be compatible with JBoss AS 7.x, EAP 6.x,
-    *                                       Wildfly, etc. which requires different bindings for local and remote
-    *                                       clients
-    * @throws Exception
-    */
-   public XmlDataImporter(InputStream inputStream, ClientSession session, boolean applicationServerCompatibility) throws Exception
-   {
-      this(inputStream, session, null, applicationServerCompatibility);
-   }
-
-   /**
-    * This is the constructor to use if you wish to import all messages transactionally.
-    * <p/>
-    * Pass in a session which doesn't use auto-commit for sends, and one that does (for management
-    * operations necessary during import).
-    *
-    * @param inputStream                    the stream from which to read the XML for import
-    * @param session                        used for sending messages, doesn't need to auto-commit sends
-    * @param managementSession              used for management queries, must use auto-commit for sends
-    * @param applicationServerCompatibility whether or not the JNDI entries for JMS connection factories and
-    *                                       destinations should be compatible with JBoss AS 7.x, EAP 6.x,
-    *                                       Wildfly, etc. which requires different bindings for local and remote
-    *                                       clients
-    */
-   public XmlDataImporter(InputStream inputStream, ClientSession session, ClientSession managementSession, boolean applicationServerCompatibility) throws Exception
-   {
-      reader = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
-      this.session = session;
-      if (managementSession != null)
-      {
-         this.managementSession = managementSession;
-      }
-      else
-      {
-         this.managementSession = session;
-      }
-      localSession = false;
-      this.applicationServerCompatibility = applicationServerCompatibility;
-   }
-
-   /**
-    * This is the constructor to use if you wish to import all messages transactionally.
-    * <p/>
-    * Pass in a session which doesn't use auto-commit for sends, and one that does (for management
-    * operations necessary during import).
-    *
-    * @param inputStream       the stream from which to read the XML for import
-    * @param session           used for sending messages, doesn't need to auto-commit sends
-    * @param managementSession used for management queries, must use auto-commit for sends
-    */
-   public XmlDataImporter(InputStream inputStream, ClientSession session, ClientSession managementSession) throws Exception
-   {
-      this(inputStream, session, managementSession, false);
-   }
-
-   public XmlDataImporter(InputStream inputStream, String host, String port, boolean transactional, boolean applicationServerCompatibility) throws Exception
-   {
-      reader = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
-      HashMap<String, Object> connectionParams = new HashMap<>();
-      connectionParams.put(TransportConstants.HOST_PROP_NAME, host);
-      connectionParams.put(TransportConstants.PORT_PROP_NAME, port);
-      ServerLocator serverLocator =
-         ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(
-            NettyConnectorFactory.class.getName(),
-            connectionParams));
-      ClientSessionFactory sf = serverLocator.createSessionFactory();
-      session = sf.createSession(false, !transactional, true);
-      managementSession = sf.createSession(false, true, true);
-      localSession = true;
-      this.applicationServerCompatibility = applicationServerCompatibility;
-   }
-
-   public XmlDataImporter(String inputFile, String host, String port, boolean transactional, boolean applicationServerCompatibility) throws Exception
-   {
-      this(new FileInputStream(inputFile), host, port, transactional, applicationServerCompatibility);
-   }
-
-   // Public --------------------------------------------------------
-
-   public void processXml() throws Exception
-   {
-      try
-      {
-         while (reader.hasNext())
-         {
-            ActiveMQServerLogger.LOGGER.debug("EVENT:[" + reader.getLocation().getLineNumber() + "][" + reader.getLocation().getColumnNumber() + "] ");
-            if (reader.getEventType() == XMLStreamConstants.START_ELEMENT)
-            {
-               if (XmlDataConstants.BINDINGS_CHILD.equals(reader.getLocalName()))
-               {
-                  bindQueue();
-               }
-               else if (XmlDataConstants.MESSAGES_CHILD.equals(reader.getLocalName()))
-               {
-                  processMessage();
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORIES.equals(reader.getLocalName()))
-               {
-                  createJmsConnectionFactories();
-               }
-               else if (XmlDataConstants.JMS_DESTINATIONS.equals(reader.getLocalName()))
-               {
-                  createJmsDestinations();
-               }
-            }
-            reader.next();
-         }
-
-         if (!session.isAutoCommitSends())
-         {
-            session.commit();
-         }
-      }
-      finally
-      {
-         // if the session was created in our constructor then close it (otherwise the caller will close it)
-         if (localSession)
-         {
-            session.close();
-            managementSession.close();
-         }
-      }
-   }
-
-   private void processMessage() throws Exception
-   {
-      Byte type = 0;
-      Byte priority = 0;
-      Long expiration = 0L;
-      Long timestamp = 0L;
-      org.apache.activemq.artemis.utils.UUID userId = null;
-      ArrayList<String> queues = new ArrayList<>();
-
-      // get message's attributes
-      for (int i = 0; i < reader.getAttributeCount(); i++)
-      {
-         String attributeName = reader.getAttributeLocalName(i);
-         switch (attributeName)
-         {
-            case XmlDataConstants.MESSAGE_TYPE:
-               type = getMessageType(reader.getAttributeValue(i));
-               break;
-            case XmlDataConstants.MESSAGE_PRIORITY:
-               priority = Byte.parseByte(reader.getAttributeValue(i));
-               break;
-            case XmlDataConstants.MESSAGE_EXPIRATION:
-               expiration = Long.parseLong(reader.getAttributeValue(i));
-               break;
-            case XmlDataConstants.MESSAGE_TIMESTAMP:
-               timestamp = Long.parseLong(reader.getAttributeValue(i));
-               break;
-            case XmlDataConstants.MESSAGE_USER_ID:
-               userId = UUIDGenerator.getInstance().generateUUID();
-               break;
-         }
-      }
-
-      Message message = session.createMessage(type, true, expiration, timestamp, priority);
-      message.setUserID(userId);
-
-      boolean endLoop = false;
-
-      // loop through the XML and gather up all the message's data (i.e. body, properties, queues, etc.)
-      while (reader.hasNext())
-      {
-         int eventType = reader.getEventType();
-         switch (eventType)
-         {
-            case XMLStreamConstants.START_ELEMENT:
-               if (XmlDataConstants.MESSAGE_BODY.equals(reader.getLocalName()))
-               {
-                  processMessageBody(message);
-               }
-               else if (XmlDataConstants.PROPERTIES_CHILD.equals(reader.getLocalName()))
-               {
-                  processMessageProperties(message);
-               }
-               else if (XmlDataConstants.QUEUES_CHILD.equals(reader.getLocalName()))
-               {
-                  processMessageQueues(queues);
-               }
-               break;
-            case XMLStreamConstants.END_ELEMENT:
-               if (XmlDataConstants.MESSAGES_CHILD.equals(reader.getLocalName()))
-               {
-                  endLoop = true;
-               }
-               break;
-         }
-         if (endLoop)
-         {
-            break;
-         }
-         reader.next();
-      }
-
-      sendMessage(queues, message);
-   }
-
-   private Byte getMessageType(String value)
-   {
-      Byte type = Message.DEFAULT_TYPE;
-      switch (value)
-      {
-         case XmlDataConstants.DEFAULT_TYPE_PRETTY:
-            type = Message.DEFAULT_TYPE;
-            break;
-         case XmlDataConstants.BYTES_TYPE_PRETTY:
-            type = Message.BYTES_TYPE;
-            break;
-         case XmlDataConstants.MAP_TYPE_PRETTY:
-            type = Message.MAP_TYPE;
-            break;
-         case XmlDataConstants.OBJECT_TYPE_PRETTY:
-            type = Message.OBJECT_TYPE;
-            break;
-         case XmlDataConstants.STREAM_TYPE_PRETTY:
-            type = Message.STREAM_TYPE;
-            break;
-         case XmlDataConstants.TEXT_TYPE_PRETTY:
-            type = Message.TEXT_TYPE;
-            break;
-      }
-      return type;
-   }
-
-   private void sendMessage(ArrayList<String> queues, Message message) throws Exception
-   {
-      StringBuilder logMessage = new StringBuilder();
-      String destination = addressMap.get(queues.get(0));
-
-      logMessage.append("Sending ").append(message).append(" to address: ").append(destination).append("; routed to queues: ");
-      ByteBuffer buffer = ByteBuffer.allocate(queues.size() * 8);
-
-      for (String queue : queues)
-      {
-         long queueID;
-
-         if (queueIDs.containsKey(queue))
-         {
-            queueID = queueIDs.get(queue);
-         }
-         else
-         {
-            // Get the ID of the queues involved so the message can be routed properly.  This is done because we cannot
-            // send directly to a queue, we have to send to an address instead but not all the queues related to the
-            // address may need the message
-            ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management");
-            ClientMessage managementMessage = managementSession.createMessage(false);
-            ManagementHelper.putAttribute(managementMessage, "core.queue." + queue, "ID");
-            managementSession.start();
-            ActiveMQServerLogger.LOGGER.debug("Requesting ID for: " + queue);
-            ClientMessage reply = requestor.request(managementMessage);
-            queueID = (Integer) ManagementHelper.getResult(reply);
-            requestor.close();
-            ActiveMQServerLogger.LOGGER.debug("ID for " + queue + " is: " + queueID);
-            queueIDs.put(queue, queueID);  // store it so we don't have to look it up every time
-         }
-
-         logMessage.append(queue).append(", ");
-         buffer.putLong(queueID);
-      }
-
-      logMessage.delete(logMessage.length() - 2, logMessage.length()); // take off the trailing comma
-      ActiveMQServerLogger.LOGGER.debug(logMessage);
-
-      message.putBytesProperty(MessageImpl.HDR_ROUTE_TO_IDS, buffer.array());
-      ClientProducer producer = session.createProducer(destination);
-      producer.send(message);
-      producer.close();
-
-      if (tempFileName.length() > 0)
-      {
-         File tempFile = new File(tempFileName);
-         if (!tempFile.delete())
-         {
-            ActiveMQServerLogger.LOGGER.warn("Could not delete: " + tempFileName);
-         }
-         tempFileName = "";
-      }
-   }
-
-   private void processMessageQueues(ArrayList<String> queues)
-   {
-      for (int i = 0; i < reader.getAttributeCount(); i++)
-      {
-         if (XmlDataConstants.QUEUE_NAME.equals(reader.getAttributeLocalName(i)))
-         {
-            queues.add(reader.getAttributeValue(i));
-         }
-      }
-   }
-
-   private void processMessageProperties(Message message)
-   {
-      String key = "";
-      String value = "";
-      String propertyType = "";
-      String realValue = null;
-
-      for (int i = 0; i < reader.getAttributeCount(); i++)
-      {
-         String attributeName = reader.getAttributeLocalName(i);
-         switch (attributeName)
-         {
-            case XmlDataConstants.PROPERTY_NAME:
-               key = reader.getAttributeValue(i);
-               break;
-            case XmlDataConstants.PROPERTY_VALUE:
-               value = reader.getAttributeValue(i);
-               break;
-            case XmlDataConstants.PROPERTY_TYPE:
-               propertyType = reader.getAttributeValue(i);
-               break;
-         }
-      }
-
-      switch (propertyType)
-      {
-         case XmlDataConstants.PROPERTY_TYPE_SHORT:
-            message.putShortProperty(key, Short.parseShort(value));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_BOOLEAN:
-            message.putBooleanProperty(key, Boolean.parseBoolean(value));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_BYTE:
-            message.putByteProperty(key, Byte.parseByte(value));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_BYTES:
-            message.putBytesProperty(key, decode(value));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_DOUBLE:
-            message.putDoubleProperty(key, Double.parseDouble(value));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_FLOAT:
-            message.putFloatProperty(key, Float.parseFloat(value));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_INTEGER:
-            message.putIntProperty(key, Integer.parseInt(value));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_LONG:
-            message.putLongProperty(key, Long.parseLong(value));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_SIMPLE_STRING:
-            if (!value.equals(XmlDataConstants.NULL))
-            {
-               realValue = value;
-            }
-            message.putStringProperty(new SimpleString(key), new SimpleString(realValue));
-            break;
-         case XmlDataConstants.PROPERTY_TYPE_STRING:
-            if (!value.equals(XmlDataConstants.NULL))
-            {
-               realValue = value;
-            }
-            message.putStringProperty(key, realValue);
-            break;
-      }
-   }
-
-   private void processMessageBody(Message message) throws XMLStreamException, IOException
-   {
-      boolean isLarge = false;
-
-      for (int i = 0; i < reader.getAttributeCount(); i++)
-      {
-         String attributeName = reader.getAttributeLocalName(i);
-         if (XmlDataConstants.MESSAGE_IS_LARGE.equals(attributeName))
-         {
-            isLarge = Boolean.parseBoolean(reader.getAttributeValue(i));
-         }
-      }
-      reader.next();
-      if (isLarge)
-      {
-         tempFileName = UUID.randomUUID().toString() + ".tmp";
-         ActiveMQServerLogger.LOGGER.debug("Creating temp file " + tempFileName + " for large message.");
-         try (OutputStream out = new FileOutputStream(tempFileName))
-         {
-            while (reader.hasNext())
-            {
-               if (reader.getEventType() == XMLStreamConstants.END_ELEMENT)
-               {
-                  break;
-               }
-               else
-               {
-                  String characters = new String(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
-                  String trimmedCharacters = characters.trim();
-                  if (trimmedCharacters.length() > 0)  // this will skip "indentation" characters
-                  {
-                     byte[] data = decode(trimmedCharacters);
-                     out.write(data);
-                  }
-               }
-               reader.next();
-            }
-         }
-         FileInputStream fileInputStream = new FileInputStream(tempFileName);
-         BufferedInputStream bufferedInput = new BufferedInputStream(fileInputStream);
-         ((ClientMessage) message).setBodyInputStream(bufferedInput);
-      }
-      else
-      {
-         reader.next(); // step past the "indentation" characters to get to the CDATA with the message body
-         String characters = new String(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
-         message.getBodyBuffer().writeBytes(decode(characters.trim()));
-      }
-   }
-
-   private void bindQueue() throws Exception
-   {
-      String queueName = "";
-      String address = "";
-      String filter = "";
-
-      for (int i = 0; i < reader.getAttributeCount(); i++)
-      {
-         String attributeName = reader.getAttributeLocalName(i);
-         switch (attributeName)
-         {
-            case XmlDataConstants.BINDING_ADDRESS:
-               address = reader.getAttributeValue(i);
-               break;
-            case XmlDataConstants.BINDING_QUEUE_NAME:
-               queueName = reader.getAttributeValue(i);
-               break;
-            case XmlDataConstants.BINDING_FILTER_STRING:
-               filter = reader.getAttributeValue(i);
-               break;
-         }
-      }
-
-      ClientSession.QueueQuery queueQuery = session.queueQuery(new SimpleString(queueName));
-
-      if (!queueQuery.isExists())
-      {
-         session.createQueue(address, queueName, filter, true);
-         ActiveMQServerLogger.LOGGER.debug("Binding queue(name=" + queueName + ", address=" + address + ", filter=" + filter + ")");
-      }
-      else
-      {
-         ActiveMQServerLogger.LOGGER.debug("Binding " + queueName + " already exists so won't re-bind.");
-      }
-
-      addressMap.put(queueName, address);
-   }
-
-   private void createJmsConnectionFactories() throws Exception
-   {
-      boolean endLoop = false;
-
-      while (reader.hasNext())
-      {
-         int eventType = reader.getEventType();
-         switch (eventType)
-         {
-            case XMLStreamConstants.START_ELEMENT:
-               if (XmlDataConstants.JMS_CONNECTION_FACTORY.equals(reader.getLocalName()))
-               {
-                  createJmsConnectionFactory();
-               }
-               break;
-            case XMLStreamConstants.END_ELEMENT:
-               if (XmlDataConstants.JMS_CONNECTION_FACTORIES.equals(reader.getLocalName()))
-               {
-                  endLoop = true;
-               }
-               break;
-         }
-         if (endLoop)
-         {
-            break;
-         }
-         reader.next();
-      }
-   }
-
-   private void createJmsDestinations() throws Exception
-   {
-      boolean endLoop = false;
-
-      while (reader.hasNext())
-      {
-         int eventType = reader.getEventType();
-         switch (eventType)
-         {
-            case XMLStreamConstants.START_ELEMENT:
-               if (XmlDataConstants.JMS_DESTINATION.equals(reader.getLocalName()))
-               {
-                  createJmsDestination();
-               }
-               break;
-            case XMLStreamConstants.END_ELEMENT:
-               if (XmlDataConstants.JMS_DESTINATIONS.equals(reader.getLocalName()))
-               {
-                  endLoop = true;
-               }
-               break;
-         }
-         if (endLoop)
-         {
-            break;
-         }
-         reader.next();
-      }
-   }
-
-   private void createJmsConnectionFactory() throws Exception
-   {
-      String name = "";
-      String callFailoverTimeout = "";
-      String callTimeout = "";
-      String clientFailureCheckPeriod = "";
-      String clientId = "";
-      String confirmationWindowSize = "";
-      String connectionTtl = "";
-      String connectors = "";
-      String consumerMaxRate = "";
-      String consumerWindowSize = "";
-      String discoveryGroupName = "";
-      String dupsOkBatchSize = "";
-      String groupId = "";
-      String loadBalancingPolicyClassName = "";
-      String maxRetryInterval = "";
-      String minLargeMessageSize = "";
-      String producerMaxRate = "";
-      String producerWindowSize = "";
-      String reconnectAttempts = "";
-      String retryInterval = "";
-      String retryIntervalMultiplier = "";
-      String scheduledThreadMaxPoolSize = "";
-      String threadMaxPoolSize = "";
-      String transactionBatchSize = "";
-      String type = "";
-      String entries = "";
-      String autoGroup = "";
-      String blockOnAcknowledge = "";
-      String blockOnDurableSend = "";
-      String blockOnNonDurableSend = "";
-      String cacheLargeMessagesClient = "";
-      String compressLargeMessages = "";
-      String failoverOnInitialConnection = "";
-      String ha = "";
-      String preacknowledge = "";
-      String useGlobalPools = "";
-
-      boolean endLoop = false;
-
-      while (reader.hasNext())
-      {
-         int eventType = reader.getEventType();
-         switch (eventType)
-         {
-            case XMLStreamConstants.START_ELEMENT:
-               if (XmlDataConstants.JMS_CONNECTION_FACTORY_CALL_FAILOVER_TIMEOUT.equals(reader.getLocalName()))
-               {
-                  callFailoverTimeout = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory callFailoverTimeout: " + callFailoverTimeout);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CALL_TIMEOUT.equals(reader.getLocalName()))
-               {
-                  callTimeout = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory callTimeout: " + callTimeout);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CLIENT_FAILURE_CHECK_PERIOD.equals(reader.getLocalName()))
-               {
-                  clientFailureCheckPeriod = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory clientFailureCheckPeriod: " + clientFailureCheckPeriod);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CLIENT_ID.equals(reader.getLocalName()))
-               {
-                  clientId = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory clientId: " + clientId);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CONFIRMATION_WINDOW_SIZE.equals(reader.getLocalName()))
-               {
-                  confirmationWindowSize = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory confirmationWindowSize: " + confirmationWindowSize);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CONNECTION_TTL.equals(reader.getLocalName()))
-               {
-                  connectionTtl = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory connectionTtl: " + connectionTtl);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CONNECTOR.equals(reader.getLocalName()))
-               {
-                  connectors = getConnectors();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory getLocalName: " + connectors);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CONSUMER_MAX_RATE.equals(reader.getLocalName()))
-               {
-                  consumerMaxRate = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory consumerMaxRate: " + consumerMaxRate);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CONSUMER_WINDOW_SIZE.equals(reader.getLocalName()))
-               {
-                  consumerWindowSize = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory consumerWindowSize: " + consumerWindowSize);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_DISCOVERY_GROUP_NAME.equals(reader.getLocalName()))
-               {
-                  discoveryGroupName = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory discoveryGroupName: " + discoveryGroupName);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_DUPS_OK_BATCH_SIZE.equals(reader.getLocalName()))
-               {
-                  dupsOkBatchSize = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory dupsOkBatchSize: " + dupsOkBatchSize);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_GROUP_ID.equals(reader.getLocalName()))
-               {
-                  groupId = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory groupId: " + groupId);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_LOAD_BALANCING_POLICY_CLASS_NAME.equals(reader.getLocalName()))
-               {
-                  loadBalancingPolicyClassName = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory loadBalancingPolicyClassName: " + loadBalancingPolicyClassName);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_MAX_RETRY_INTERVAL.equals(reader.getLocalName()))
-               {
-                  maxRetryInterval = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory maxRetryInterval: " + maxRetryInterval);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_MIN_LARGE_MESSAGE_SIZE.equals(reader.getLocalName()))
-               {
-                  minLargeMessageSize = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory minLargeMessageSize: " + minLargeMessageSize);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_NAME.equals(reader.getLocalName()))
-               {
-                  name = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory name: " + name);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_PRODUCER_MAX_RATE.equals(reader.getLocalName()))
-               {
-                  producerMaxRate = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory producerMaxRate: " + producerMaxRate);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_PRODUCER_WINDOW_SIZE.equals(reader.getLocalName()))
-               {
-                  producerWindowSize = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory producerWindowSize: " + producerWindowSize);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_RECONNECT_ATTEMPTS.equals(reader.getLocalName()))
-               {
-                  reconnectAttempts = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory reconnectAttempts: " + reconnectAttempts);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_RETRY_INTERVAL.equals(reader.getLocalName()))
-               {
-                  retryInterval = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory retryInterval: " + retryInterval);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_RETRY_INTERVAL_MULTIPLIER.equals(reader.getLocalName()))
-               {
-                  retryIntervalMultiplier = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory retryIntervalMultiplier: " + retryIntervalMultiplier);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_SCHEDULED_THREAD_POOL_MAX_SIZE.equals(reader.getLocalName()))
-               {
-                  scheduledThreadMaxPoolSize = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory scheduledThreadMaxPoolSize: " + scheduledThreadMaxPoolSize);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_THREAD_POOL_MAX_SIZE.equals(reader.getLocalName()))
-               {
-                  threadMaxPoolSize = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory threadMaxPoolSize: " + threadMaxPoolSize);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_TRANSACTION_BATCH_SIZE.equals(reader.getLocalName()))
-               {
-                  transactionBatchSize = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory transactionBatchSize: " + transactionBatchSize);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_TYPE.equals(reader.getLocalName()))
-               {
-                  type = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory type: " + type);
-               }
-               else if (XmlDataConstants.JMS_JNDI_ENTRIES.equals(reader.getLocalName()))
-               {
-                  entries = getEntries();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory entries: " + entries);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_AUTO_GROUP.equals(reader.getLocalName()))
-               {
-                  autoGroup = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory autoGroup: " + autoGroup);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_BLOCK_ON_ACKNOWLEDGE.equals(reader.getLocalName()))
-               {
-                  blockOnAcknowledge = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory blockOnAcknowledge: " + blockOnAcknowledge);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_BLOCK_ON_DURABLE_SEND.equals(reader.getLocalName()))
-               {
-                  blockOnDurableSend = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory blockOnDurableSend: " + blockOnDurableSend);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_BLOCK_ON_NON_DURABLE_SEND.equals(reader.getLocalName()))
-               {
-                  blockOnNonDurableSend = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory blockOnNonDurableSend: " + blockOnNonDurableSend);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_CACHE_LARGE_MESSAGES_CLIENT.equals(reader.getLocalName()))
-               {
-                  cacheLargeMessagesClient = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.info("JMS connection factory " + name + " cacheLargeMessagesClient: " + cacheLargeMessagesClient);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_COMPRESS_LARGE_MESSAGES.equals(reader.getLocalName()))
-               {
-                  compressLargeMessages = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory compressLargeMessages: " + compressLargeMessages);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_FAILOVER_ON_INITIAL_CONNECTION.equals(reader.getLocalName()))
-               {
-                  failoverOnInitialConnection = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory failoverOnInitialConnection: " + failoverOnInitialConnection);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_HA.equals(reader.getLocalName()))
-               {
-                  ha = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory ha: " + ha);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_PREACKNOWLEDGE.equals(reader.getLocalName()))
-               {
-                  preacknowledge = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory preacknowledge: " + preacknowledge);
-               }
-               else if (XmlDataConstants.JMS_CONNECTION_FACTORY_USE_GLOBAL_POOLS.equals(reader.getLocalName()))
-               {
-                  useGlobalPools = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS connection factory useGlobalPools: " + useGlobalPools);
-               }
-               break;
-            case XMLStreamConstants.END_ELEMENT:
-               if (XmlDataConstants.JMS_CONNECTION_FACTORY.equals(reader.getLocalName()))
-               {
-                  endLoop = true;
-               }
-               break;
-         }
-         if (endLoop)
-         {
-            break;
-         }
-         reader.next();
-      }
-
-      ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management");
-      ClientMessage managementMessage = managementSession.createMessage(false);
-      ManagementHelper.putOperationInvocation(managementMessage,
-                                              ResourceNames.JMS_SERVER,
-                                              "createConnectionFactory",
-                                              name,
-                                              Boolean.parseBoolean(ha),
-                                              discoveryGroupName.length() > 0,
-                                              Integer.parseInt(type),
-                                              connectors,
-                                              entries,
-                                              clientId,
-                                              Long.parseLong(clientFailureCheckPeriod),
-                                              Long.parseLong(connectionTtl),
-                                              Long.parseLong(callTimeout),
-                                              Long.parseLong(callFailoverTimeout),
-                                              Integer.parseInt(minLargeMessageSize),
-                                              Boolean.parseBoolean(compressLargeMessages),
-                                              Integer.parseInt(consumerWindowSize),
-                                              Integer.parseInt(consumerMaxRate),
-                                              Integer.parseInt(confirmationWindowSize),
-                                              Integer.parseInt(producerWindowSize),
-                                              Integer.parseInt(producerMaxRate),
-                                              Boolean.parseBoolean(blockOnAcknowledge),
-                                              Boolean.parseBoolean(blockOnDurableSend),
-                                              Boolean.parseBoolean(blockOnNonDurableSend),
-                                              Boolean.parseBoolean(autoGroup),
-                                              Boolean.parseBoolean(preacknowledge),
-                                              loadBalancingPolicyClassName,
-                                              Integer.parseInt(transactionBatchSize),
-                                              Integer.parseInt(dupsOkBatchSize),
-                                              Boolean.parseBoolean(useGlobalPools),
-                                              Integer.parseInt(scheduledThreadMaxPoolSize),
-                                              Integer.parseInt(threadMaxPoolSize),
-                                              Long.parseLong(retryInterval),
-                                              Double.parseDouble(retryIntervalMultiplier),
-                                              Long.parseLong(maxRetryInterval),
-                                              Integer.parseInt(reconnectAttempts),
-                                              Boolean.parseBoolean(failoverOnInitialConnection),
-                                              groupId);
-      //Boolean.parseBoolean(cacheLargeMessagesClient));
-      managementSession.start();
-      ClientMessage reply = requestor.request(managementMessage);
-      if (ManagementHelper.hasOperationSucceeded(reply))
-      {
-         ActiveMQServerLogger.LOGGER.debug("Created connection factory " + name);
-      }
-      else
-      {
-         ActiveMQServerLogger.LOGGER.error("Problem creating " + name);
-      }
-
-      requestor.close();
-   }
-
-   private void createJmsDestination() throws Exception
-   {
-      String name = "";
-      String selector = "";
-      String entries = "";
-      String type = "";
-      boolean endLoop = false;
-
-      while (reader.hasNext())
-      {
-         int eventType = reader.getEventType();
-         switch (eventType)
-         {
-            case XMLStreamConstants.START_ELEMENT:
-               if (XmlDataConstants.JMS_DESTINATION_NAME.equals(reader.getLocalName()))
-               {
-                  name = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS destination name: " + name);
-               }
-               else if (XmlDataConstants.JMS_DESTINATION_SELECTOR.equals(reader.getLocalName()))
-               {
-                  selector = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS destination selector: " + selector);
-               }
-               else if (XmlDataConstants.JMS_DESTINATION_TYPE.equals(reader.getLocalName()))
-               {
-                  type = reader.getElementText();
-                  ActiveMQServerLogger.LOGGER.debug("JMS destination type: " + type);
-               }
-               else if (XmlDataConstants.JMS_JNDI_ENTRIES.equals(reader.getLocalName()))
-               {
-                  entries = getEntries();
-               }
-               break;
-            case XMLStreamConstants.END_ELEMENT:
-               if (XmlDataConstants.JMS_DESTINATION.equals(reader.getLocalName()))
-               {
-                  endLoop = true;
-               }
-               break;
-         }
-         if (endLoop)
-         {
-            break;
-         }
-         reader.next();
-      }
-
-      ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management");
-      ClientMessage managementMessage = managementSession.createMessage(false);
-      if ("Queue".equals(type))
-      {
-         ManagementHelper.putOperationInvocation(managementMessage, ResourceNames.JMS_SERVER, "createQueue", name, entries, selector);
-      }
-      else if ("Topic".equals(type))
-      {
-         ManagementHelper.putOperationInvocation(managementMessage, ResourceNames.JMS_SERVER, "createTopic", name, entries);
-      }
-      managementSession.start();
-      ClientMessage reply = requestor.request(managementMessage);
-      if (ManagementHelper.hasOperationSucceeded(reply))
-      {
-         ActiveMQServerLogger.LOGGER.debug("Created " + type.toLowerCase() + " " + name);
-      }
-      else
-      {
-         ActiveMQServerLogger.LOGGER.error("Problem creating " + name);
-      }
-
-      requestor.close();
-   }
-
-   private String getEntries() throws Exception
-   {
-      StringBuilder entry = new StringBuilder();
-      boolean endLoop = false;
-
-      while (reader.hasNext())
-      {
-         int eventType = reader.getEventType();
-         switch (eventType)
-         {
-            case XMLStreamConstants.START_ELEMENT:
-               if (XmlDataConstants.JMS_JNDI_ENTRY.equals(reader.getLocalName()))
-               {
-                  String elementText = reader.getElementText();
-                  entry.append(elementText).append(", ");
-                  if (applicationServerCompatibility)
-                  {
-                     entry.append(XmlDataConstants.JNDI_COMPATIBILITY_PREFIX).append(elementText).append(", ");
-                  }
-                  ActiveMQServerLogger.LOGGER.debug("JMS admin object JNDI entry: " + entry.toString());
-               }
-               break;
-            case XMLStreamConstants.END_ELEMENT:
-               if (XmlDataConstants.JMS_JNDI_ENTRIES.equals(reader.getLocalName()))
-               {
-                  endLoop = true;
-               }
-               break;
-         }
-         if (endLoop)
-         {
-            break;
-         }
-         reader.next();
-      }
-
-      return entry.delete(entry.length() - 2, entry.length()).toString();
-   }
-
-   private String getConnectors() throws Exception
-   {
-      StringBuilder entry = new StringBuilder();
-      boolean endLoop = false;
-
-      while (reader.hasNext())
-      {
-         int eventType = reader.getEventType();
-         switch (eventType)
-         {
-            case XMLStreamConstants.START_ELEMENT:
-               if (XmlDataConstants.JMS_CONNECTION_FACTORY_CONNECTOR.equals(reader.getLocalName()))
-               {
-                  entry.append(reader.getElementText()).append(", ");
-               }
-               break;
-            case XMLStreamConstants.END_ELEMENT:
-               if (XmlDataConstants.JMS_CONNECTION_FACTORY_CONNECTORS.equals(reader.getLocalName()))
-               {
-                  endLoop = true;
-               }
-               break;
-         }
-         if (endLoop)
-         {
-            break;
-         }
-         reader.next();
-      }
-
-      return entry.delete(entry.length() - 2, entry.length()).toString();
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   private static byte[] decode(String data)
-   {
-      return Base64.decode(data, Base64.DONT_BREAK_LINES | Base64.URL_SAFE);
-   }
-
-   // Inner classes -------------------------------------------------
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/artemis-web/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-web/pom.xml b/artemis-web/pom.xml
index cbb1810..52e22db 100644
--- a/artemis-web/pom.xml
+++ b/artemis-web/pom.xml
@@ -39,7 +39,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/docs/user-manual/en/tools.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/tools.md b/docs/user-manual/en/tools.md
index 63a56ac..218f6a7 100644
--- a/docs/user-manual/en/tools.md
+++ b/docs/user-manual/en/tools.md
@@ -1,94 +1,145 @@
 # Tools
 
-Apache ActiveMQ Artemis ships with several helpful command line tools. All tools are
-available from the activemq-tools-\<version\>-jar-with-dependencies.jar.
-As the name suggests, this Java archive contains ActiveMQ along with all
-of its dependencies. This is done to simplify the execution of the tools
-by eliminating the need so specify a classpath. These tools are:
-
--   **`print-data`**. Used for low-level inspection of the bindings and
-    message journals. It takes two parameters - `bindings-directory` and
-    `journal-directory`. These are the paths to the directories where
-    the bindings and message journals are stored, respectively. For
-    example:
-
-```sh
-java -jar activemq-tools-<version>-jar-with-dependencies.jar print-data /home/user/activemq/data/bindings /home/user/activemq/data/journal
-```
 
--   **`print-pages`**. Used for low-level inspection of paged message
-    data. It takes two parameters - `paging-directory` and
-    `journal-directory`. These are the paths to the directories where
-    paged messages and the message journals are stored, respectively.
-    For example:
+You can use the artemis cli interface to execute data maintenance tools:
+
+
+This is a list of sub-commands available
+
+
+Name | Description
+:--- | :---
+exp     | Export the message data using a special and independent XML format
+imp  | Imports the journal to a running broker using the output from expt
+data     | Prints a report about journal records and summary of existent records, as well a report on paging
+encode | shows an internal format of the journal encoded to String
+decode | imports the internal journal format from encode
+
+
+
+
+You can use the help at the tool for more information on how to execute each of the tools. For example:
 
-```sh
-java -jar activemq-tools-<version>-jar-with-dependencies.jar print-pages /home/user/activemq/data/paging-directory /home/user/activemq/data/journal
 ```
+$ ./artemis help data print
+NAME
+        artemis data print - Print data records information (WARNING: don't use
+        while a production server is running)
 
--   **`export`**. Used for exporting all binding and message data
-    (including paged and large messages) as well as JMS destinations and
-    connection factories (including JNDI bindings). The export is
-    structured as XML. This data can then be imported to another server
-    even if the server is a different version than the original. It
-    takes 4 parameters:
+SYNOPSIS
+        artemis data print [--bindings <binding>] [--journal <journal>]
+                [--paging <paging>]
 
-    -   `bindings-directory` - the path to the bindings directory.
+OPTIONS
+        --bindings <binding>
+            The folder used for bindings (default ../data/bindings)
 
-    -   `journal-directory` - the path to the journal directory.
+        --journal <journal>
+            The folder used for messages journal (default ../data/journal)
 
-    -   `paging-directory` - the path to the paging directory.
+        --paging <paging>
+            The folder used for paging (default ../data/paging)
 
-    -   `large-messages-directory` - the path to the large-messages
-        directory.
 
-    Here's an example:
 ```
-java -jar activemq-tools-<version>-jar-with-dependencies.jar export /home/user/activemq/data/bindings-directory /home/user/activemq/data/journal-directory /home/user/activemq/data/paging-directory /home/user/activemq/data/large-messages
+
+
+For a full list of data tools commands available use:
+
 ```
+$ ./artemis help data
+NAME
+        artemis data - data tools like (print|exp|imp|exp|encode|decode)
+        (example ./artemis data print)
+
+SYNOPSIS
+        artemis data
+        artemis data decode [--prefix <prefix>] [--directory <directory>]
+                [--suffix <suffix>] [--file-size <size>]
+        artemis data encode [--prefix <prefix>] [--directory <directory>]
+                [--suffix <suffix>] [--file-size <size>]
+        artemis data exp [--bindings <binding>]
+                [--large-messages <largeMessges>] [--paging <paging>]
+                [--journal <journal>]
+        artemis data imp [--password <password>] [--port <port>] [--host <host>]
+                [--user <user>] [--transaction]
+        artemis data print [--bindings <binding>] [--paging <paging>]
+                [--journal <journal>]
+
+COMMANDS
+        With no arguments, Display help information
+
+        print
+            Print data records information (WARNING: don't use while a
+            production server is running)
+
+            With --bindings option, The folder used for bindings (default
+            ../data/bindings)
+
+            With --paging option, The folder used for paging (default
+            ../data/paging)
+
+            With --journal option, The folder used for messages journal (default
+            ../data/journal)
+
+        exp
+            Export all message-data using an XML that could be interpreted by
+            any system.
+
+            With --bindings option, The folder used for bindings (default
+            ../data/bindings)
+
+            With --large-messages option, The folder used for large-messages
+            (default ../data/largemessages)
+
+            With --paging option, The folder used for paging (default
+            ../data/paging)
+
+            With --journal option, The folder used for messages journal (default
+            ../data/journal)
+
+        imp
+            Import all message-data using an XML that could be interpreted by
+            any system.
+
+            With --password option, User name used to import the data. (default
+            null)
+
+            With --port option, The port used to import the data (default 61616)
+
+            With --host option, The host used to import the data (default
+            localhost)
+
+            With --user option, User name used to import the data. (default
+            null)
+
+            With --transaction option, If this is set to true you will need a
+            whole transaction to commit at the end. (default false)
+
+        decode
+            Decode a journal's internal format into a new journal set of files
 
-    This tool will export directly to standard out so if the data needs
-    to be stored in a file please redirect as appropriate for the
-    operation system in use. Also, please note that the `export` tool is
-    single threaded so depending on the size of the journal it could
-    take awhile to complete.
+            With --prefix option, The journal prefix (default activemq-datal)
 
--   **`import`**. Used for importing data from an XML document generated
-    by the `export` tool. The `import` tool reads the XML document and
-    connects to an Apache ActiveMQ Artemis server via Netty to import all the data. It
-    takes 5 parameters:
+            With --directory option, The journal folder (default
+            ../data/journal)
 
-    -   `input-file` - the path to the XML file generated by the
-        `export` tool.
+            With --suffix option, The journal suffix (default amq)
 
-    -   `host` - the IP address or hostname of the server where the data
-        should be imported.
+            With --file-size option, The journal size (default 10485760)
 
-    -   `port` - the port where ActiveMQ is listening.
+        encode
+            Encode a set of journal files into an internal encoded data format
 
-    -   `transactional` - a `boolean` flag to indicate whether or not to
-        send all the *message* data in a single transaction. Valid
-        values are `true` or `false`.
+            With --prefix option, The journal prefix (default activemq-datal)
 
-    -   `application-server-compatibility` - a `boolean` flag to
-        indicate whether or not JNDI bindings need special treatment to
-        account for the way JBoss AS7, Wildfly, and JBoss EAP 6 handle
-        JNDI for remote clients. Each of these application servers
-        require a special JNDI binding to allow access from remote
-        clients. If this is `true` then every JNDI binding in the XML
-        will be duplicated in the "java:jboss/exported/" namespace thus
-        allowing both local and remote clients to use the same name when
-        accessing resources via JNDI. Valid values are `true` or
-        `false`.
+            With --directory option, The journal folder (default
+            ../data/journal)
 
-    Here's an example:
+            With --suffix option, The journal suffix (default amq)
 
-    ```sh
-    java -jar activemq-tools-<version>-jar-with-dependencies.jar import /home/user/exportData.xml 127.0.0.1 61616 false false
-    ```
+            With --file-size option, The journal size (default 10485760)
 
-    Like the `export` tool the `import` tool is single threaded so
-    depending on the size of the XML file it may take awhile for the
-    process to complete.
 
 
+```
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b19c006..258973c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -489,7 +489,7 @@
             <module>artemis-dto</module>
             <module>artemis-web</module>
             <module>artemis-website</module>
-            <module>artemis-bootstrap</module>
+            <module>artemis-cli</module>
             <module>artemis-commons</module>
             <module>artemis-selector</module>
             <module>artemis-core-client</module>
@@ -500,7 +500,6 @@
             <module>artemis-journal</module>
             <module>artemis-ra</module>
             <module>artemis-rest</module>
-            <module>artemis-tools</module>
             <module>artemis-service-extensions</module>
             <module>artemis-maven-plugin</module>
             <module>integration/activemq-spring-integration</module>
@@ -516,7 +515,7 @@
             <module>artemis-dto</module>
             <module>artemis-web</module>
             <module>artemis-website</module>
-            <module>artemis-bootstrap</module>
+            <module>artemis-cli</module>
             <module>artemis-commons</module>
             <module>artemis-selector</module>
             <module>artemis-core-client</module>
@@ -527,7 +526,6 @@
             <module>artemis-journal</module>
             <module>artemis-ra</module>
             <module>artemis-rest</module>
-            <module>artemis-tools</module>
             <module>artemis-service-extensions</module>
             <module>artemis-maven-plugin</module>
             <module>integration/activemq-spring-integration</module>
@@ -546,7 +544,7 @@
             <module>artemis-dto</module>
             <module>artemis-web</module>
             <module>artemis-website</module>
-            <module>artemis-bootstrap</module>
+            <module>artemis-cli</module>
             <module>artemis-commons</module>
             <module>artemis-selector</module>
             <module>artemis-core-client</module>
@@ -557,7 +555,6 @@
             <module>artemis-journal</module>
             <module>artemis-ra</module>
             <module>artemis-rest</module>
-            <module>artemis-tools</module>
             <module>artemis-service-extensions</module>
             <module>artemis-maven-plugin</module>
             <module>integration/activemq-spring-integration</module>
@@ -586,7 +583,7 @@
          <modules>
             <module>artemis-dto</module>
             <module>artemis-web</module>
-            <module>artemis-bootstrap</module>
+            <module>artemis-cli</module>
             <module>artemis-commons</module>
             <module>artemis-selector</module>
             <module>artemis-core-client</module>
@@ -597,7 +594,6 @@
             <module>artemis-journal</module>
             <module>artemis-ra</module>
             <module>artemis-rest</module>
-            <module>artemis-tools</module>
             <module>artemis-service-extensions</module>
             <module>artemis-maven-plugin</module>
             <module>integration/activemq-spring-integration</module>
@@ -620,7 +616,7 @@
          <modules>
             <module>artemis-dto</module>
             <module>artemis-web</module>
-            <module>artemis-bootstrap</module>
+            <module>artemis-cli</module>
             <module>artemis-commons</module>
             <module>artemis-selector</module>
             <module>artemis-core-client</module>
@@ -631,7 +627,6 @@
             <module>artemis-journal</module>
             <module>artemis-ra</module>
             <module>artemis-rest</module>
-            <module>artemis-tools</module>
             <module>artemis-service-extensions</module>
             <module>artemis-maven-plugin</module>
             <module>integration/activemq-spring-integration</module>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea3370b3/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index df74869..8727e62 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -124,7 +124,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/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 6f850e0..12a038f 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -78,7 +78,7 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-bootstrap</artifactId>
+         <artifactId>artemis-cli</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -88,7 +88,7 @@
       </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/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
index 64edd82..028a8f3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
@@ -49,7 +49,6 @@ import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
 import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase;
 import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
 import org.apache.activemq.artemis.tests.util.UnitTestCase;
-import org.apache.activemq.artemis.tools.ExportJournal;
 import org.apache.activemq.artemis.utils.IDGenerator;
 import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
 import org.apache.activemq.artemis.utils.SimpleIDGenerator;
@@ -1428,8 +1427,6 @@ public class NIOJournalCompactTest extends JournalImplTestBase
       journal.forceMoveNextFile();
       journal.checkReclaimStatus();
 
-      ExportJournal.exportJournal(getTestDir(), filePrefix, fileExtension, 2, this.fileSize, "/tmp/out4.dmp");
-
       journal.testCompact();
 
       stopJournal();

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/ExportFormatTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
index e37f659..87ccd02 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
@@ -16,11 +16,6 @@
  */
 package org.apache.activemq.artemis.tests.integration.persistence;
 
-import org.apache.activemq.artemis.tools.ExportJournal;
-import org.apache.activemq.artemis.tools.ImportJournal;
-import org.junit.Ignore;
-import org.junit.Test;
-
 import java.io.StringReader;
 
 import org.apache.activemq.artemis.api.core.client.ClientConsumer;
@@ -29,8 +24,12 @@ 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.DecodeJournal;
+import org.apache.activemq.artemis.cli.commands.tools.EncodeJournal;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.tests.util.ServiceTestBase;
+import org.junit.Ignore;
+import org.junit.Test;
 
 public class ExportFormatTest extends ServiceTestBase
 {
@@ -113,19 +112,19 @@ public class ExportFormatTest extends ServiceTestBase
       System.out.println();
       System.out.println("copy & paste the following as bindingsFile:");
 
-      ExportJournal.exportJournal(getBindingsDir(), "activemq-bindings", "bindings", 2, 1048576, System.out);
+      EncodeJournal.exportJournal(getBindingsDir(), "activemq-bindings", "bindings", 2, 1048576, System.out);
 
       System.out.println();
       System.out.println("copy & paste the following as dataFile:");
 
-      ExportJournal.exportJournal(getJournalDir(), "activemq-data", "amq", 2, 102400, System.out);
+      EncodeJournal.exportJournal(getJournalDir(), "activemq-data", "amq", 2, 102400, System.out);
    }
 
    @Test
    public void testConsumeFromFormat() throws Exception
    {
-      ImportJournal.importJournal(getJournalDir(), "activemq-data", "amq", 2, 102400, new StringReader(journalFile));
-      ImportJournal.importJournal(getBindingsDir(),
+      DecodeJournal.importJournal(getJournalDir(), "activemq-data", "amq", 2, 102400, new StringReader(journalFile));
+      DecodeJournal.importJournal(getBindingsDir(),
                                   "activemq-bindings",
                                   "bindings",
                                   2,


Mime
View raw message