activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [48/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis rename
Date Tue, 28 Apr 2015 16:02:53 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java
index cc090f1..2edeb03 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientProducer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
 
 /**
  * A ClientProducer is used to send messages to a specific address. Messages are then routed on the
@@ -28,13 +28,13 @@ import org.apache.activemq.api.core.SimpleString;
  * <p>
  * The sending semantics can change depending on what blocking semantics are set via
  * {@link ServerLocator#setBlockOnDurableSend(boolean)} and
- * {@link org.apache.activemq.api.core.client.ServerLocator#setBlockOnNonDurableSend(boolean)} . If set to
+ * {@link ServerLocator#setBlockOnNonDurableSend(boolean)} . If set to
  * true then for each message type, durable and non durable respectively, any exceptions such as the
  * address not existing or security exceptions will be thrown at the time of send. Alternatively if
  * set to false then exceptions will only be logged on the server. <br>
  * <p>
  * The send rate can also be controlled via {@link ServerLocator#setProducerMaxRate(int)} and the
- * {@link org.apache.activemq.api.core.client.ServerLocator#setProducerWindowSize(int)}. <br>
+ * {@link ServerLocator#setProducerWindowSize(int)}. <br>
  * <br>
  */
 public interface ClientProducer extends AutoCloseable
@@ -59,7 +59,7 @@ public interface ClientProducer extends AutoCloseable
     * {@link ServerLocator#setBlockOnNonDurableSend(boolean)} are set to <code>true</code> for the
     * specified message type.
     * @param message the message to send
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message
+    * @throws ActiveMQException if an exception occurs while sending the message
     */
    void send(Message message) throws ActiveMQException;
 
@@ -71,7 +71,7 @@ public interface ClientProducer extends AutoCloseable
     * The handler will only get called if {@link ServerLocator#setConfirmationWindowSize(int) -1}.
     * @param message the message to send
     * @param handler handler to call after receiving a SEND acknowledgement from the server
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message
+    * @throws ActiveMQException if an exception occurs while sending the message
     */
    void send(Message message, SendAcknowledgementHandler handler) throws ActiveMQException;
 
@@ -84,7 +84,7 @@ public interface ClientProducer extends AutoCloseable
     * message type.
     * @param address the address where the message will be sent
     * @param message the message to send
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message
+    * @throws ActiveMQException if an exception occurs while sending the message
     */
    void send(SimpleString address, Message message) throws ActiveMQException;
 
@@ -97,7 +97,7 @@ public interface ClientProducer extends AutoCloseable
     * @param address the address where the message will be sent
     * @param message the message to send
     * @param handler handler to call after receiving a SEND acknowledgement from the server
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message
+    * @throws ActiveMQException if an exception occurs while sending the message
     */
    void send(SimpleString address, Message message, SendAcknowledgementHandler handler) throws ActiveMQException;
 
@@ -110,14 +110,14 @@ public interface ClientProducer extends AutoCloseable
     * message type.
     * @param address the address where the message will be sent
     * @param message the message to send
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message
+    * @throws ActiveMQException if an exception occurs while sending the message
     */
    void send(String address, Message message) throws ActiveMQException;
 
    /**
     * Closes the ClientProducer. If already closed nothing is done.
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while closing the producer
+    * @throws ActiveMQException if an exception occurs while closing the producer
     */
    void close() throws ActiveMQException;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientRequestor.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientRequestor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientRequestor.java
index 2016c5f..88cb7fc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientRequestor.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientRequestor.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
 import java.util.UUID;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.client.impl.ClientMessageImpl;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl;
 
 /**
  * The ClientRequestor class helps making requests.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
index 8bf7a9a..1a98a17 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
 import javax.transaction.xa.XAResource;
 import java.util.List;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
 
 /**
  * A ClientSession is a single-thread object required for producing and consuming messages.
@@ -37,7 +37,7 @@ public interface ClientSession extends XAResource, AutoCloseable
 
 
    /**
-    * Just like {@link org.apache.activemq.api.core.client.ClientSession.AddressQuery#JMS_SESSION_IDENTIFIER_PROPERTY} this is
+    * Just like {@link ClientSession.AddressQuery#JMS_SESSION_IDENTIFIER_PROPERTY} this is
     * used to identify the ClientID over JMS Session.
     * However this is only used when the JMS Session.clientID is set (which is optional).
     * With this property management tools and the server can identify the jms-client-id used over JMS
@@ -132,7 +132,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * Starts the session.
     * The session must be started before ClientConsumers created by the session can consume messages from the queue.
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while starting the session
+    * @throws ActiveMQException if an exception occurs while starting the session
     */
    ClientSession start() throws ActiveMQException;
 
@@ -140,14 +140,14 @@ public interface ClientSession extends XAResource, AutoCloseable
     * Stops the session.
     * ClientConsumers created by the session can not consume messages when the session is stopped.
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while stopping the session
+    * @throws ActiveMQException if an exception occurs while stopping the session
     */
    void stop() throws ActiveMQException;
 
    /**
     * Closes the session.
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while closing the session
+    * @throws ActiveMQException if an exception occurs while closing the session
     */
    void close() throws ActiveMQException;
 
@@ -204,7 +204,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
     * @param durable   whether the queue is durable or not
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createQueue(SimpleString address, SimpleString queueName, boolean durable) throws ActiveMQException;
 
@@ -216,7 +216,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
     * @param durable   if the queue is durable
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createSharedQueue(SimpleString address, SimpleString queueName, boolean durable) throws ActiveMQException;
 
@@ -229,7 +229,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param queueName the name of the queue
     * @param filter    whether the queue is durable or not
     * @param durable   if the queue is durable
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createSharedQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws ActiveMQException;
 
@@ -239,7 +239,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
     * @param durable   whether the queue is durable or not
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createQueue(String address, String queueName, boolean durable) throws ActiveMQException;
 
@@ -248,7 +248,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createQueue(String address, String queueName) throws ActiveMQException;
 
@@ -257,7 +257,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createQueue(SimpleString address, SimpleString queueName) throws ActiveMQException;
 
@@ -268,7 +268,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param queueName the name of the queue
     * @param filter    only messages which match this filter will be put in the queue
     * @param durable   whether the queue is durable or not
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws ActiveMQException;
 
@@ -279,7 +279,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param queueName the name of the queue
     * @param durable   whether the queue is durable or not
     * @param filter    only messages which match this filter will be put in the queue
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createQueue(String address, String queueName, String filter, boolean durable) throws ActiveMQException;
 
@@ -288,7 +288,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createTemporaryQueue(SimpleString address, SimpleString queueName) throws ActiveMQException;
 
@@ -297,7 +297,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createTemporaryQueue(String address, String queueName) throws ActiveMQException;
 
@@ -307,7 +307,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
     * @param filter    only messages which match this filter will be put in the queue
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createTemporaryQueue(SimpleString address, SimpleString queueName, SimpleString filter) throws ActiveMQException;
 
@@ -317,7 +317,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param address   the queue will be bound to this address
     * @param queueName the name of the queue
     * @param filter    only messages which match this filter will be put in the queue
-    * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue
+    * @throws ActiveMQException in an exception occurs while creating the queue
     */
    void createTemporaryQueue(String address, String queueName, String filter) throws ActiveMQException;
 
@@ -325,7 +325,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * Deletes the queue.
     *
     * @param queueName the name of the queue to delete
-    * @throws org.apache.activemq.api.core.ActiveMQException if there is no queue for the given name or if the queue has consumers
+    * @throws ActiveMQException if there is no queue for the given name or if the queue has consumers
     */
    void deleteQueue(SimpleString queueName) throws ActiveMQException;
 
@@ -333,7 +333,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * Deletes the queue.
     *
     * @param queueName the name of the queue to delete
-    * @throws org.apache.activemq.api.core.ActiveMQException if there is no queue for the given name or if the queue has consumers
+    * @throws ActiveMQException if there is no queue for the given name or if the queue has consumers
     */
    void deleteQueue(String queueName) throws ActiveMQException;
 
@@ -344,7 +344,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param queueName name of the queue to consume messages from
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(SimpleString queueName) throws ActiveMQException;
 
@@ -353,7 +353,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param queueName name of the queue to consume messages from
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(String queueName) throws ActiveMQException;
 
@@ -363,7 +363,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param queueName name of the queue to consume messages from
     * @param filter    only messages which match this filter will be consumed
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(SimpleString queueName, SimpleString filter) throws ActiveMQException;
 
@@ -373,7 +373,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param queueName name of the queue to consume messages from
     * @param filter    only messages which match this filter will be consumed
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(String queueName, String filter) throws ActiveMQException;
 
@@ -391,7 +391,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param queueName  name of the queue to consume messages from
     * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages.
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(SimpleString queueName, boolean browseOnly) throws ActiveMQException;
 
@@ -409,7 +409,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param queueName  name of the queue to consume messages from
     * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages.
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(String queueName, boolean browseOnly) throws ActiveMQException;
 
@@ -429,7 +429,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param filter     only messages which match this filter will be consumed
     * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages.
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(String queueName, String filter, boolean browseOnly) throws ActiveMQException;
 
@@ -449,7 +449,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param filter     only messages which match this filter will be consumed
     * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages.
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(SimpleString queueName, SimpleString filter, boolean browseOnly) throws ActiveMQException;
 
@@ -471,7 +471,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param maxRate    the maximum rate to consume messages
     * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages.
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(SimpleString queueName,
                                  SimpleString filter,
@@ -497,7 +497,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param maxRate    the maximum rate to consume messages
     * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages.
     * @return a ClientConsumer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer
+    * @throws ActiveMQException if an exception occurs while creating the ClientConsumer
     */
    ClientConsumer createConsumer(String queueName, String filter, int windowSize, int maxRate, boolean browseOnly) throws ActiveMQException;
 
@@ -508,7 +508,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * Address must be specified every time a message is sent
     *
     * @return a ClientProducer
-    * @see ClientProducer#send(SimpleString, org.apache.activemq.api.core.Message)
+    * @see ClientProducer#send(SimpleString, org.apache.activemq.artemis.api.core.Message)
     */
    ClientProducer createProducer() throws ActiveMQException;
 
@@ -517,7 +517,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param address the address to send messages to
     * @return a ClientProducer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer
+    * @throws ActiveMQException if an exception occurs while creating the ClientProducer
     */
    ClientProducer createProducer(SimpleString address) throws ActiveMQException;
 
@@ -526,7 +526,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param address the address to send messages to
     * @return a ClientProducer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer
+    * @throws ActiveMQException if an exception occurs while creating the ClientProducer
     */
    ClientProducer createProducer(String address) throws ActiveMQException;
 
@@ -536,7 +536,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * @param address the address to send messages to
     * @param rate    the producer rate
     * @return a ClientProducer
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer
+    * @throws ActiveMQException if an exception occurs while creating the ClientProducer
     */
    ClientProducer createProducer(SimpleString address, int rate) throws ActiveMQException;
 
@@ -578,7 +578,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param queueName the name of the queue to query
     * @return a QueueQuery containing information on the given queue
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while querying the queue
+    * @throws ActiveMQException if an exception occurs while querying the queue
     */
    QueueQuery queueQuery(SimpleString queueName) throws ActiveMQException;
 
@@ -587,7 +587,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     *
     * @param address the address of the biding to query
     * @return a AddressQuery containing information on the binding attached to the given address
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while querying the binding
+    * @throws ActiveMQException if an exception occurs while querying the binding
     */
    AddressQuery addressQuery(SimpleString address) throws ActiveMQException;
 
@@ -610,14 +610,14 @@ public interface ClientSession extends XAResource, AutoCloseable
    /**
     * Commits the current transaction.
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while committing the transaction
+    * @throws ActiveMQException if an exception occurs while committing the transaction
     */
    void commit() throws ActiveMQException;
 
    /**
     * Rolls back the current transaction.
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while rolling back the transaction
+    * @throws ActiveMQException if an exception occurs while rolling back the transaction
     */
    void rollback() throws ActiveMQException;
 
@@ -625,7 +625,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * Rolls back the current transaction.
     *
     * @param considerLastMessageAsDelivered the first message on deliveringMessage Buffer is considered as delivered
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while rolling back the transaction
+    * @throws ActiveMQException if an exception occurs while rolling back the transaction
     */
    void rollback(boolean considerLastMessageAsDelivered) throws ActiveMQException;
 
@@ -670,7 +670,7 @@ public interface ClientSession extends XAResource, AutoCloseable
    /**
     * Attach any metadata to the session.
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    void addMetaData(String key, String data) throws ActiveMQException;
 
@@ -679,7 +679,7 @@ public interface ClientSession extends XAResource, AutoCloseable
     * You can use this metadata to ensure that there is no other session with the same meta-data you are passing as an argument.
     * This is useful to simulate unique client-ids, where you may want to avoid multiple instances of your client application connected.
     *
-    * @throws org.apache.activemq.api.core.ActiveMQException
+    * @throws ActiveMQException
     */
    void addUniqueMetaData(String key, String data) throws ActiveMQException;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
index cdf13ec..87ce2e9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 
 /**
@@ -33,7 +33,7 @@ public interface ClientSessionFactory extends AutoCloseable
     * Creates a session with XA transaction semantics.
     *
     * @return a ClientSession with XA transaction semantics
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session
+    * @throws ActiveMQException if an exception occurs while creating the session
     */
    ClientSession createXASession() throws ActiveMQException;
 
@@ -43,7 +43,7 @@ public interface ClientSessionFactory extends AutoCloseable
     * It is up to the client to commit when sending and acknowledging messages.
     *
     * @return a transacted ClientSession
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session
+    * @throws ActiveMQException if an exception occurs while creating the session
     * @see ClientSession#commit()
     */
    ClientSession createTransactedSession() throws ActiveMQException;
@@ -56,7 +56,7 @@ public interface ClientSessionFactory extends AutoCloseable
     * the session will automatically commit the transaction containing the acknowledgements.
     *
     * @return a non-transacted ClientSession
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session
+    * @throws ActiveMQException if an exception occurs while creating the session
     */
    ClientSession createSession() throws ActiveMQException;
 
@@ -66,7 +66,7 @@ public interface ClientSessionFactory extends AutoCloseable
     * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually
     * @param autoCommitAcks  <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
     * @return a ClientSession
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session
+    * @throws ActiveMQException if an exception occurs while creating the session
     */
    ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks) throws ActiveMQException;
 
@@ -77,7 +77,7 @@ public interface ClientSessionFactory extends AutoCloseable
     * @param autoCommitAcks  <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
     * @param ackBatchSize    the batch size of the acknowledgements
     * @return a ClientSession
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session
+    * @throws ActiveMQException if an exception occurs while creating the session
     */
    ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks, int ackBatchSize) throws ActiveMQException;
 
@@ -88,7 +88,7 @@ public interface ClientSessionFactory extends AutoCloseable
     * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually
     * @param autoCommitAcks  <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
     * @return a ClientSession
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session
+    * @throws ActiveMQException if an exception occurs while creating the session
     */
    ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks) throws ActiveMQException;
 
@@ -104,7 +104,7 @@ public interface ClientSessionFactory extends AutoCloseable
     * @param autoCommitAcks  <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
     * @param preAcknowledge  <code>true</code> to pre-acknowledge messages on the server, <code>false</code> to let the client acknowledge the messages
     * @return a ClientSession
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session
+    * @throws ActiveMQException if an exception occurs while creating the session
     */
    ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks, boolean preAcknowledge) throws ActiveMQException;
 
@@ -122,7 +122,7 @@ public interface ClientSessionFactory extends AutoCloseable
     * @param autoCommitAcks  <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
     * @param preAcknowledge  <code>true</code> to pre-acknowledge messages on the server, <code>false</code> to let the client acknowledge the messages
     * @return a ClientSession
-    * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session
+    * @throws ActiveMQException if an exception occurs while creating the session
     */
    ClientSession createSession(String username,
                                String password,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClusterTopologyListener.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClusterTopologyListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClusterTopologyListener.java
index 6c2bc7b..3438938 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClusterTopologyListener.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClusterTopologyListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
 /**
  * A cluster topology listener.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventListener.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventListener.java
index 2f90f7a..7e1823d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventListener.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
 /**
  * A FailoverEvent notifies the client the state if the connection changes occurred on the session.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventType.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventType.java
index 1192771..b7ccbc4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventType.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/FailoverEventType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
 public enum FailoverEventType
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/MessageHandler.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/MessageHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/MessageHandler.java
index 52f9d14..c4efb1b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/MessageHandler.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/MessageHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
 /**
  * A MessageHandler is used to receive message <em>asynchronously</em>.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
index fb87bdd..0be79e1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
-import org.apache.activemq.api.core.Message;
+import org.apache.activemq.artemis.api.core.Message;
 
 /**
  * A SendAcknowledgementHandler notifies a client when an message sent asynchronously has been

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java
index 4e4b7fa..444e914 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ServerLocator.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
-import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.core.client.impl.Topology;
-import org.apache.activemq.spi.core.remoting.ClientProtocolManagerFactory;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
+import org.apache.activemq.artemis.core.client.impl.Topology;
+import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory;
 
 /**
  * The serverLocator locates a server, but beyond that it locates a server based on a list.
@@ -167,7 +167,7 @@ public interface ServerLocator extends AutoCloseable
     * Returns the blocking calls timeout.
     * <p>
     * If client's blocking calls to the server take more than this timeout, the call will throw a
-    * {@link org.apache.activemq.api.core.ActiveMQException} with the code {@link org.apache.activemq.api.core.ActiveMQExceptionType#CONNECTION_TIMEDOUT}. Value
+    * {@link org.apache.activemq.artemis.api.core.ActiveMQException} with the code {@link org.apache.activemq.artemis.api.core.ActiveMQExceptionType#CONNECTION_TIMEDOUT}. Value
     * is in milliseconds, default value is {@link ActiveMQClient#DEFAULT_CALL_TIMEOUT}.
     *
     * @return the blocking calls timeout
@@ -399,7 +399,7 @@ public interface ServerLocator extends AutoCloseable
     * assign a group ID to the messages they sent.
     * <p>
     * if <code>true</code>, a random unique group ID is created and set on each message for the property
-    * {@link org.apache.activemq.api.core.Message#HDR_GROUP_ID}.
+    * {@link org.apache.activemq.artemis.api.core.Message#HDR_GROUP_ID}.
     * Default value is {@link ActiveMQClient#DEFAULT_AUTO_GROUP}.
     *
     * @return whether producers will automatically assign a group ID to their messages
@@ -416,7 +416,7 @@ public interface ServerLocator extends AutoCloseable
    ServerLocator setAutoGroup(boolean autoGroup);
 
    /**
-    * Returns the group ID that will be eventually set on each message for the property {@link org.apache.activemq.api.core.Message#HDR_GROUP_ID}.
+    * Returns the group ID that will be eventually set on each message for the property {@link org.apache.activemq.artemis.api.core.Message#HDR_GROUP_ID}.
     * <p>
     * Default value is is {@code null} and no group ID will be set on the messages.
     *
@@ -652,7 +652,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Returns the class name of the connection load balancing policy.
     * <p>
-    * Default value is "org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy".
+    * Default value is "org.apache.activemq.artemis.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy".
     *
     * @return the class name of the connection load balancing policy
     */
@@ -661,7 +661,7 @@ public interface ServerLocator extends AutoCloseable
    /**
     * Sets the class name of the connection load balancing policy.
     * <p>
-    * Value must be the name of a class implementing {@link org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy}.
+    * Value must be the name of a class implementing {@link org.apache.activemq.artemis.api.core.client.loadbalance.ConnectionLoadBalancingPolicy}.
     *
     * @param loadBalancingPolicyClassName class name of the connection load balancing policy
     * @return this ServerLocator

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SessionFailureListener.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SessionFailureListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SessionFailureListener.java
index 4864ba3..3097983 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SessionFailureListener.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SessionFailureListener.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.remoting.FailureListener;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.core.remoting.FailureListener;
 
 /**
  * A SessionFailureListener notifies the client when a failure occurred on the session.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/TopologyMember.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/TopologyMember.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/TopologyMember.java
index 72b1374..0e20dd8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/TopologyMember.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/TopologyMember.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 /**
  * A member of the topology.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java
index f7cca43..27f23df 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/ConnectionLoadBalancingPolicy.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client.loadbalance;
+package org.apache.activemq.artemis.api.core.client.loadbalance;
 
 /**
  * A ConnectionLoadBalancingPolicy defines a policy to load balance between connections.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java
index 544f9d8..856952d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/FirstElementConnectionLoadBalancingPolicy.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client.loadbalance;
+package org.apache.activemq.artemis.api.core.client.loadbalance;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java
index 9d836e8..beed6bf 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomConnectionLoadBalancingPolicy.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client.loadbalance;
+package org.apache.activemq.artemis.api.core.client.loadbalance;
 
-import org.apache.activemq.utils.Random;
+import org.apache.activemq.artemis.utils.Random;
 
 /**
  * {@link RandomConnectionLoadBalancingPolicy#select(int)} returns a (pseudo) random integer between

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java
index 0205af7..c3930a2 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RandomStickyConnectionLoadBalancingPolicy.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client.loadbalance;
+package org.apache.activemq.artemis.api.core.client.loadbalance;
 
-import org.apache.activemq.utils.Random;
+import org.apache.activemq.artemis.utils.Random;
 
 /**
  * {@link RandomConnectionLoadBalancingPolicy#select(int)} chooses a the initial node randomly then subsequent requests return the same node

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java
index cec1949..d81b5c0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/RoundRobinConnectionLoadBalancingPolicy.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client.loadbalance;
+package org.apache.activemq.artemis.api.core.client.loadbalance;
 
 import java.io.Serializable;
 
-import org.apache.activemq.utils.Random;
+import org.apache.activemq.artemis.utils.Random;
 
 /**
  * RoundRobinConnectionLoadBalancingPolicy corresponds to a round-robin load-balancing policy.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/package-info.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/package-info.java
index 70942e0..57fe0fd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/package-info.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/loadbalance/package-info.java
@@ -14,5 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client.loadbalance;
+package org.apache.activemq.artemis.api.core.client.loadbalance;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/package-info.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/package-info.java
index d2a171c..51f8e6b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/package-info.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/package-info.java
@@ -14,5 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.client;
+package org.apache.activemq.artemis.api.core.client;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java
index d565810..453d6fd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
index f5f9e64..97d6121 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 /**
  * A ActiveMQComponentControl is used to manage the life cycle of a ActiveMQ component.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index bd0d269..dffc871 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import javax.management.MBeanOperationInfo;
 
@@ -41,14 +41,14 @@ public interface ActiveMQServerControl
    /**
     * Returns the list of interceptors used by this server for incoming messages.
     *
-    * @see org.apache.activemq.api.core.Interceptor
+    * @see org.apache.activemq.artemis.api.core.Interceptor
     */
    String[] getIncomingInterceptorClassNames();
 
    /**
     * Returns the list of interceptors used by this server for outgoing messages.
     *
-    * @see org.apache.activemq.api.core.Interceptor
+    * @see org.apache.activemq.artemis.api.core.Interceptor
     */
    String[] getOutgoingInterceptorClassNames();
 
@@ -308,7 +308,7 @@ public interface ActiveMQServerControl
    /**
     * Create a durable queue.
     * <br>
-    * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits.
+    * This method throws a {@link org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException}) exception if the queue already exits.
     *
     * @param address address to bind the queue to
     * @param name    name of the queue
@@ -320,7 +320,7 @@ public interface ActiveMQServerControl
    /**
     * Create a queue.
     * <br>
-    * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits.
+    * This method throws a {@link org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException}) exception if the queue already exits.
     *
     * @param address address to bind the queue to
     * @param name    name of the queue
@@ -336,7 +336,7 @@ public interface ActiveMQServerControl
    /**
     * Create a queue.
     * <br>
-    * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits.
+    * This method throws a {@link org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException}) exception if the queue already exits.
     *
     * @param address address to bind the queue to
     * @param name    name of the queue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
index 3602f5d..d641a81 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 
 import javax.management.MBeanOperationInfo;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
index babcffa..eb10ca9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
-import org.apache.activemq.utils.json.JSONObject;
+import org.apache.activemq.artemis.utils.json.JSONObject;
 
 // XXX no javadocs
 public final class AddressSettingsInfo

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BridgeControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BridgeControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BridgeControl.java
index a73610a..ffec7fc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BridgeControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BridgeControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 
 /**
@@ -43,7 +43,7 @@ public interface BridgeControl extends ActiveMQComponentControl
    String getFilterString();
 
    /**
-    * Return the name of the org.apache.activemq.core.server.cluster.Transformer implementation associated to this bridge.
+    * Return the name of the org.apache.activemq.artemis.core.server.cluster.Transformer implementation associated to this bridge.
     */
    String getTransformerClassName();
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BroadcastGroupControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BroadcastGroupControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BroadcastGroupControl.java
index 414ecd9..7d9a2e7 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BroadcastGroupControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/BroadcastGroupControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 /**
  * A BroadcastGroupControl is used to manage a broadcast group.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ClusterConnectionControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ClusterConnectionControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ClusterConnectionControl.java
index 1cfedb6..07ce53d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ClusterConnectionControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ClusterConnectionControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java
index a483e0a..c9c2a67 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/CoreNotificationType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 /**
  * This enum defines all core notification types

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
index b4a41b0..c8fb45d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import java.util.Arrays;
 
-import org.apache.activemq.utils.json.JSONArray;
-import org.apache.activemq.utils.json.JSONException;
-import org.apache.activemq.utils.json.JSONObject;
+import org.apache.activemq.artemis.utils.json.JSONArray;
+import org.apache.activemq.artemis.utils.json.JSONException;
+import org.apache.activemq.artemis.utils.json.JSONObject;
 
 /**
  * Helper class to create Java Objects from the

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DivertControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DivertControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DivertControl.java
index 58f8c69..266d406 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DivertControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DivertControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 /**
  * A DivertControl is used to manage a divert.
@@ -55,7 +55,7 @@ public interface DivertControl
    String getForwardingAddress();
 
    /**
-    * Return the name of the org.apache.activemq.core.server.cluster.Transformer implementation associated to this bridge.
+    * Return the name of the org.apache.activemq.artemis.core.server.cluster.Transformer implementation associated to this bridge.
     */
    String getTransformerClassName();
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
index c73f619..ae9c091 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.client.ActiveMQClientMessageBundle;
-import org.apache.activemq.utils.json.JSONArray;
-import org.apache.activemq.utils.json.JSONObject;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
+import org.apache.activemq.artemis.utils.json.JSONArray;
+import org.apache.activemq.artemis.utils.json.JSONObject;
 
 /**
  * Helper class to use ActiveMQ Core messages to manage server resources.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
index 22ddfcf..29878ac 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 /**
  * Types of notification emitted by ActiveMQ servers.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
index 8ac35a8..7a48fc0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import javax.management.ObjectName;
 
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 
 /**
  * Helper class to build ObjectNames for ActiveMQ resources.
@@ -160,7 +160,7 @@ public final class ObjectNameBuilder
 
    /**
     * Returns the ObjectName used by JMSServerControl.
-    * @see org.apache.activemq.api.jms.management.JMSServerControl
+    * @see org.apache.activemq.artemis.api.jms.management.JMSServerControl
     */
    public ObjectName getJMSServerObjectName() throws Exception
    {
@@ -169,7 +169,7 @@ public final class ObjectNameBuilder
 
    /**
     * Returns the ObjectName used by JMSQueueControl.
-    * @see org.apache.activemq.api.jms.management.JMSQueueControl
+    * @see org.apache.activemq.artemis.api.jms.management.JMSQueueControl
     */
    public ObjectName getJMSQueueObjectName(final String name) throws Exception
    {
@@ -188,7 +188,7 @@ public final class ObjectNameBuilder
 
    /**
     * Returns the ObjectName used by ConnectionFactoryControl.
-    * @see org.apache.activemq.api.jms.management.ConnectionFactoryControl
+    * @see org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl
     */
    public ObjectName getConnectionFactoryObjectName(final String name) throws Exception
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Operation.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Operation.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Operation.java
index 7bab654..38f6473 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Operation.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Operation.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Parameter.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Parameter.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Parameter.java
index c30b253..9a3103c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Parameter.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/Parameter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
index 5caf8ce..316b59b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 import javax.management.MBeanOperationInfo;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ResourceNames.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ResourceNames.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ResourceNames.java
index 8d68907..d05a04c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ResourceNames.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ResourceNames.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
 /**
  * Helper class used to build resource names used by management messages.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.java
index 20888fd..920a131 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 
-import org.apache.activemq.utils.json.JSONArray;
-import org.apache.activemq.utils.json.JSONObject;
+import org.apache.activemq.artemis.utils.json.JSONArray;
+import org.apache.activemq.artemis.utils.json.JSONObject;
 
 /**
  * Helper class to create Java Objects from the

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/package-info.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/package-info.java
index 81305a1..0dfae5a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/package-info.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/package-info.java
@@ -14,5 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/package-info.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/package-info.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/package-info.java
index 0682d2d..96f4ff7 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/package-info.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/package-info.java
@@ -14,5 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.api.core;
+package org.apache.activemq.artemis.api.core;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java
index 7c0c16a..544a3d7 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/buffers/impl/ResetLimitWrappedActiveMQBuffer.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.buffers.impl;
+package org.apache.activemq.artemis.core.buffers.impl;
 
 import java.nio.ByteBuffer;
 
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.message.impl.MessageInternal;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.message.impl.MessageInternal;
 
 /**
  * A ResetLimitWrappedActiveMQBuffer

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index 6e88446..5a1cbf6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.client;
+package org.apache.activemq.artemis.core.client;
 
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.Interceptor;
-import org.apache.activemq.core.protocol.core.Packet;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.Interceptor;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
@@ -295,7 +295,7 @@ public interface ActiveMQClientLogger extends BasicLogger
    void packetOutOfOrder(Object obj, @Cause Throwable t);
 
    /**
-    * Warns about usage of {@link org.apache.activemq.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with
+    * Warns about usage of {@link org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with
     * confirmations disabled (confirmationWindowSize=-1).
     */
    @LogMessage(level = Logger.Level.WARN)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index d06a114..4cba06a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.client;
-
-
-import org.apache.activemq.api.core.ActiveMQAddressFullException;
-import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException;
-import org.apache.activemq.api.core.ActiveMQDisconnectedException;
-import org.apache.activemq.api.core.ActiveMQIllegalStateException;
-import org.apache.activemq.api.core.ActiveMQInterceptorRejectedPacketException;
-import org.apache.activemq.api.core.ActiveMQInternalErrorException;
-import org.apache.activemq.api.core.ActiveMQLargeMessageException;
-import org.apache.activemq.api.core.ActiveMQLargeMessageInterruptedException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.api.core.ActiveMQTransactionOutcomeUnknownException;
-import org.apache.activemq.api.core.ActiveMQTransactionRolledBackException;
-import org.apache.activemq.api.core.ActiveMQUnBlockedException;
-import org.apache.activemq.core.cluster.DiscoveryGroup;
-import org.apache.activemq.spi.core.remoting.Connection;
+package org.apache.activemq.artemis.core.client;
+
+
+import org.apache.activemq.artemis.api.core.ActiveMQAddressFullException;
+import org.apache.activemq.artemis.api.core.ActiveMQConnectionTimedOutException;
+import org.apache.activemq.artemis.api.core.ActiveMQDisconnectedException;
+import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
+import org.apache.activemq.artemis.api.core.ActiveMQInterceptorRejectedPacketException;
+import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
+import org.apache.activemq.artemis.api.core.ActiveMQLargeMessageException;
+import org.apache.activemq.artemis.api.core.ActiveMQLargeMessageInterruptedException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
+import org.apache.activemq.artemis.api.core.ActiveMQTransactionOutcomeUnknownException;
+import org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackException;
+import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException;
+import org.apache.activemq.artemis.core.cluster.DiscoveryGroup;
+import org.apache.activemq.artemis.spi.core.remoting.Connection;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ActiveMQXAResource.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ActiveMQXAResource.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ActiveMQXAResource.java
index aceca80..f228386 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ActiveMQXAResource.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ActiveMQXAResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.client.impl;
+package org.apache.activemq.artemis.core.client.impl;
 
 import javax.transaction.xa.XAResource;
 


Mime
View raw message