activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [36/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis rename
Date Tue, 28 Apr 2015 16:02:41 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
index 80811c0..4711b0f 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.ra.inflow;
+package org.apache.activemq.artemis.ra.inflow;
 
 import javax.jms.Destination;
 import javax.jms.Message;
@@ -33,25 +33,25 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.ActiveMQNonExistentQueueException;
-import org.apache.activemq.api.core.ActiveMQNotConnectedException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.ra.ActiveMQRABundle;
-import org.apache.activemq.ra.ActiveMQRAConnectionFactory;
-import org.apache.activemq.ra.ActiveMQRALogger;
-import org.apache.activemq.ra.ActiveMQRaUtils;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.service.extensions.xa.recovery.XARecoveryConfig;
-import org.apache.activemq.utils.FutureLatch;
-import org.apache.activemq.utils.SensitiveDataCodec;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
+import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
+import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.ra.ActiveMQRABundle;
+import org.apache.activemq.artemis.ra.ActiveMQRALogger;
+import org.apache.activemq.artemis.ra.ActiveMQRaUtils;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig;
+import org.apache.activemq.artemis.utils.FutureLatch;
+import org.apache.activemq.artemis.utils.SensitiveDataCodec;
 
 /**
  * The activation.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index 3261499..91254ac 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.ra.inflow;
+package org.apache.activemq.artemis.ra.inflow;
 
 import javax.jms.Queue;
 import javax.jms.Session;
@@ -31,10 +31,10 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.activemq.ra.ConnectionFactoryProperties;
-import org.apache.activemq.ra.ActiveMQRALogger;
-import org.apache.activemq.ra.ActiveMQRaUtils;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.ra.ConnectionFactoryProperties;
+import org.apache.activemq.artemis.ra.ActiveMQRALogger;
+import org.apache.activemq.artemis.ra.ActiveMQRaUtils;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
 
 /**
  * The activation spec

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java
index 0a21718..693df60 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.ra.inflow;
+package org.apache.activemq.artemis.ra.inflow;
 
 import javax.jms.MessageListener;
 import javax.resource.ResourceException;
@@ -27,23 +27,23 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession.QueueQuery;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.core.client.impl.ClientConsumerInternal;
-import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
-import org.apache.activemq.core.client.impl.ClientSessionInternal;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQMessage;
-import org.apache.activemq.ra.ActiveMQRALogger;
-import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import org.apache.activemq.service.extensions.ServiceUtils;
-import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper;
-import org.apache.activemq.utils.FutureLatch;
-import org.apache.activemq.utils.VersionLoader;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession.QueueQuery;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.core.client.impl.ClientConsumerInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
+import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.ra.ActiveMQRALogger;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
+import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.artemis.service.extensions.ServiceUtils;
+import org.apache.activemq.artemis.service.extensions.xa.ActiveMQXAResourceWrapper;
+import org.apache.activemq.artemis.utils.FutureLatch;
+import org.apache.activemq.artemis.utils.VersionLoader;
 
 /**
  * The message handler

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/recovery/RecoveryManager.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/recovery/RecoveryManager.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/recovery/RecoveryManager.java
index e423c1f..f429d6d 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/recovery/RecoveryManager.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/recovery/RecoveryManager.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.ra.recovery;
+package org.apache.activemq.artemis.ra.recovery;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ServiceLoader;
 import java.util.Set;
 
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.ra.ActiveMQRALogger;
-import org.apache.activemq.service.extensions.xa.recovery.ActiveMQRegistry;
-import org.apache.activemq.service.extensions.xa.recovery.ActiveMQRegistryImpl;
-import org.apache.activemq.service.extensions.xa.recovery.XARecoveryConfig;
-import org.apache.activemq.utils.ClassloadingUtil;
-import org.apache.activemq.utils.ConcurrentHashSet;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.ra.ActiveMQRALogger;
+import org.apache.activemq.artemis.service.extensions.xa.recovery.ActiveMQRegistry;
+import org.apache.activemq.artemis.service.extensions.xa.recovery.ActiveMQRegistryImpl;
+import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig;
+import org.apache.activemq.artemis.utils.ClassloadingUtil;
+import org.apache.activemq.artemis.utils.ConcurrentHashSet;
 
 public final class RecoveryManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml
index a97c298..b294eb4 100644
--- a/artemis-rest/pom.xml
+++ b/artemis-rest/pom.xml
@@ -18,13 +18,13 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-pom</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <artifactId>artemis-pom</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
    <name>ActiveMQ Artemis REST Interface Implementation</name>
    <groupId>org.apache.activemq.rest</groupId>
-   <artifactId>activemq-rest</artifactId>
+   <artifactId>artemis-rest</artifactId>
    <packaging>jar</packaging>
 
    <properties>
@@ -82,12 +82,12 @@
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-server</artifactId>
+         <artifactId>artemis-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-jms-server</artifactId>
+         <artifactId>artemis-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
index 024ca59..514079f 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.MessageBodyReader;
@@ -26,8 +26,8 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Type;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.rest.util.HttpMessageHelper;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.rest.util.HttpMessageHelper;
 import org.jboss.resteasy.core.Headers;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 import org.jboss.resteasy.util.GenericType;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestBundle.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestBundle.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestBundle.java
index 85becc7..711df15 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestBundle.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestBundle.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
 
 import org.jboss.logging.annotations.MessageBundle;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
index d079086..09bd521 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQRestLogger.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.rest.queue.push.xml.XmlLink;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/HttpHeaderProperty.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/HttpHeaderProperty.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/HttpHeaderProperty.java
index 2ea4cb8..0f6093d 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/HttpHeaderProperty.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/HttpHeaderProperty.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
 public class HttpHeaderProperty
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/Jms.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/Jms.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/Jms.java
index 356052c..4ee119f 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/Jms.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/Jms.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
-import org.apache.activemq.rest.util.HttpMessageHelper;
+import org.apache.activemq.artemis.rest.util.HttpMessageHelper;
 import org.jboss.resteasy.core.Headers;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 import org.jboss.resteasy.util.GenericType;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceConfiguration.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceConfiguration.java
index eeb6e44..8b84cbd 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceConfiguration.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceConfiguration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceManager.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceManager.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceManager.java
index a60d663..39f43c9 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceManager.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/MessageServiceManager.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -26,21 +26,21 @@ import java.util.concurrent.Executors;
 
 import javax.xml.bind.JAXBContext;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq.rest.queue.DestinationSettings;
-import org.apache.activemq.rest.queue.QueueServiceManager;
-import org.apache.activemq.rest.topic.TopicServiceManager;
-import org.apache.activemq.rest.util.CustomHeaderLinkStrategy;
-import org.apache.activemq.rest.util.LinkHeaderLinkStrategy;
-import org.apache.activemq.rest.util.LinkStrategy;
-import org.apache.activemq.rest.util.TimeoutTask;
-import org.apache.activemq.spi.core.naming.BindingRegistry;
-import org.apache.activemq.utils.XMLUtil;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
+import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
+import org.apache.activemq.artemis.rest.queue.DestinationSettings;
+import org.apache.activemq.artemis.rest.queue.QueueServiceManager;
+import org.apache.activemq.artemis.rest.topic.TopicServiceManager;
+import org.apache.activemq.artemis.rest.util.CustomHeaderLinkStrategy;
+import org.apache.activemq.artemis.rest.util.LinkHeaderLinkStrategy;
+import org.apache.activemq.artemis.rest.util.LinkStrategy;
+import org.apache.activemq.artemis.rest.util.TimeoutTask;
+import org.apache.activemq.artemis.spi.core.naming.BindingRegistry;
+import org.apache.activemq.artemis.utils.XMLUtil;
 
 public class MessageServiceManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnknownMediaType.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnknownMediaType.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnknownMediaType.java
index 9e74c6c..01447d9 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnknownMediaType.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnknownMediaType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
 public class UnknownMediaType extends RuntimeException
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnmarshalException.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnmarshalException.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnmarshalException.java
index 95f2ab6..769c939 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnmarshalException.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/UnmarshalException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest;
+package org.apache.activemq.artemis.rest;
 
 public class UnmarshalException extends RuntimeException
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ActiveMQBootstrapListener.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ActiveMQBootstrapListener.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ActiveMQBootstrapListener.java
index a9bbedb..bddb989 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ActiveMQBootstrapListener.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ActiveMQBootstrapListener.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.integration;
+package org.apache.activemq.artemis.rest.integration;
 
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQ.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQ.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQ.java
index b59a6a4..e57470d 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQ.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQ.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.integration;
+package org.apache.activemq.artemis.rest.integration;
 
-import org.apache.activemq.core.server.embedded.EmbeddedActiveMQ;
+import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
 import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer;
-import org.apache.activemq.rest.MessageServiceManager;
+import org.apache.activemq.artemis.rest.MessageServiceManager;
 import org.jboss.resteasy.test.TestPortProvider;
 
 public class EmbeddedRestActiveMQ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMS.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMS.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMS.java
index b73b943..cecb053 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMS.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/EmbeddedRestActiveMQJMS.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.integration;
+package org.apache.activemq.artemis.rest.integration;
 
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
-import org.apache.activemq.spi.core.naming.BindingRegistry;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.spi.core.naming.BindingRegistry;
 
 public class EmbeddedRestActiveMQJMS extends EmbeddedRestActiveMQ
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/RestMessagingBootstrapListener.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/RestMessagingBootstrapListener.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/RestMessagingBootstrapListener.java
index 22a311d..63c22e8 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/RestMessagingBootstrapListener.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/RestMessagingBootstrapListener.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.integration;
+package org.apache.activemq.artemis.rest.integration;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import org.apache.activemq.rest.MessageServiceManager;
+import org.apache.activemq.artemis.rest.MessageServiceManager;
 import org.jboss.resteasy.spi.Registry;
 
 public class RestMessagingBootstrapListener implements ServletContextListener

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ServletContextBindingRegistry.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ServletContextBindingRegistry.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ServletContextBindingRegistry.java
index 2c9a135..988f206 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ServletContextBindingRegistry.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/integration/ServletContextBindingRegistry.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.integration;
+package org.apache.activemq.artemis.rest.integration;
 
-import org.apache.activemq.spi.core.naming.BindingRegistry;
+import org.apache.activemq.artemis.spi.core.naming.BindingRegistry;
 
 import javax.servlet.ServletContext;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/AcknowledgedQueueConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/AcknowledgedQueueConsumer.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/AcknowledgedQueueConsumer.java
index b9af249..4ad260f 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/AcknowledgedQueueConsumer.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/AcknowledgedQueueConsumer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.FormParam;
@@ -29,14 +29,14 @@ import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 import java.net.URI;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.util.Constants;
-import org.apache.activemq.rest.util.LinkStrategy;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.util.Constants;
+import org.apache.activemq.artemis.rest.util.LinkStrategy;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
 
 public class AcknowledgedQueueConsumer extends QueueConsumer
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/Acknowledgement.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/Acknowledgement.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/Acknowledgement.java
index 991bc36..ae36beb 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/Acknowledgement.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/Acknowledgement.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
-import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
 
 public class Acknowledgement
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedHttpMessage.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedHttpMessage.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedHttpMessage.java
index 84c0540..db6042d 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedHttpMessage.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedHttpMessage.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
-import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
 
 import javax.ws.rs.core.Response;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedMessage.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedMessage.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedMessage.java
index cd0d341..185fde4 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedMessage.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedMessage.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.HttpHeaderProperty;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.rest.HttpHeaderProperty;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
 
 import javax.ws.rs.core.Response;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java
index f41b557..6e4c4a2 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
-import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
 
 import javax.ws.rs.core.Response;
 import java.io.ByteArrayInputStream;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumersResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumersResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumersResource.java
index ec11ef7..0e9c703 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumersResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumersResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
@@ -32,10 +32,10 @@ import javax.ws.rs.core.UriInfo;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.util.TimeoutTask;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.util.TimeoutTask;
 
 public class ConsumersResource implements TimeoutTask.Callback
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationResource.java
index 51d2af5..f9e1f11 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 public class DestinationResource
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationServiceManager.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationServiceManager.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationServiceManager.java
index e6e8702..99cda66 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationServiceManager.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationServiceManager.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
-
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.api.core.client.ActiveMQClient;
-import org.apache.activemq.api.core.client.ServerLocator;
-import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.rest.util.LinkStrategy;
-import org.apache.activemq.rest.util.TimeoutTask;
-import org.apache.activemq.spi.core.naming.BindingRegistry;
+package org.apache.activemq.artemis.rest.queue;
+
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+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.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.rest.util.LinkStrategy;
+import org.apache.activemq.artemis.rest.util.TimeoutTask;
+import org.apache.activemq.artemis.spi.core.naming.BindingRegistry;
 
 public abstract class DestinationServiceManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationSettings.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationSettings.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationSettings.java
index c492669..ad28341 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationSettings.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/DestinationSettings.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 public class DestinationSettings
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessage.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessage.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessage.java
index ba0fbe0..278f07b 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessage.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -32,16 +32,16 @@ import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.util.HttpMessageHelper;
-import org.apache.activemq.utils.UUID;
-import org.apache.activemq.utils.UUIDGenerator;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.util.HttpMessageHelper;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.utils.UUID;
+import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 public class PostMessage
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageDupsOk.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageDupsOk.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageDupsOk.java
index 7dc7570..ee3e3f3 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageDupsOk.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageDupsOk.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.QueryParam;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java
index e6b96fa..afbe4f3 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/PostMessageNoDups.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
-import org.apache.activemq.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.core.Context;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueConsumer.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueConsumer.java
index bdf9848..9527d89 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueConsumer.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueConsumer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.HeaderParam;
@@ -28,15 +28,15 @@ import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 import java.net.URI;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.jms.client.SelectorTranslator;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.util.Constants;
-import org.apache.activemq.rest.util.LinkStrategy;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.util.Constants;
+import org.apache.activemq.artemis.rest.util.LinkStrategy;
+import org.apache.activemq.artemis.jms.client.SelectorTranslator;
 
 /**
  * Auto-acknowleged consumer

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDeployment.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDeployment.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDeployment.java
index ef3f4e0..e5af6f7 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDeployment.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDeployment.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 public class QueueDeployment extends DestinationSettings
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDestinationsResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDestinationsResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDestinationsResource.java
index 6fb1fa5..8d037a9 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDestinationsResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueDestinationsResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -29,17 +29,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQQueue;
-import org.apache.activemq.jms.server.config.JMSQueueConfiguration;
-import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.push.PushConsumerResource;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
-import org.apache.activemq.rest.util.Constants;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.queue.push.PushConsumerResource;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.util.Constants;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
+import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
 import org.w3c.dom.Document;
 
 @Path(Constants.PATH_FOR_QUEUES)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueResource.java
index 4cc5025..9abcc92 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DELETE;
@@ -27,10 +27,10 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.push.PushConsumerResource;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.rest.queue.push.PushConsumerResource;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
 
 public class QueueResource extends DestinationResource
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueServiceManager.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueServiceManager.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueServiceManager.java
index 25a28a9..acdd4cc 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueServiceManager.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/QueueServiceManager.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue;
+package org.apache.activemq.artemis.rest.queue;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.rest.queue.push.FilePushStore;
-import org.apache.activemq.rest.queue.push.PushStore;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.rest.queue.push.PushStore;
+import org.apache.activemq.artemis.rest.queue.push.FilePushStore;
 
 public class QueueServiceManager extends DestinationServiceManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java
index c8d79e1..9506e9e 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
+package org.apache.activemq.artemis.rest.queue.push;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.rest.queue.push.xml.XmlHttpHeader;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.rest.queue.push.xml.XmlHttpHeader;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.specimpl.ResteasyUriBuilder;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java
index f5aeb00..5c08799 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/FilePushStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
+package org.apache.activemq.artemis.rest.queue.push;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -25,9 +25,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
-import org.apache.activemq.rest.topic.PushTopicRegistration;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.topic.PushTopicRegistration;
 
 public class FilePushStore implements PushStore
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumer.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumer.java
index c863928..72e349f 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumer.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumer.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
-
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.jms.client.SelectorTranslator;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+package org.apache.activemq.artemis.rest.queue.push;
+
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.jms.client.SelectorTranslator;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerMessageHandler.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerMessageHandler.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerMessageHandler.java
index 366804c..a6960dc 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerMessageHandler.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerMessageHandler.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
+package org.apache.activemq.artemis.rest.queue.push;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
 
 public class PushConsumerMessageHandler implements MessageHandler
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerResource.java
index 8973185..88e7ffc 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushConsumerResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
+package org.apache.activemq.artemis.rest.queue.push;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -32,9 +32,9 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
 
 public class PushConsumerResource
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStore.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStore.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStore.java
index ecf7c5e..6f3e989 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStore.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStore.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
+package org.apache.activemq.artemis.rest.queue.push;
 
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStrategy.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStrategy.java
index 1bbaec9..8843483 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStrategy.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/PushStrategy.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
+package org.apache.activemq.artemis.rest.queue.push;
 
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
 
 public interface PushStrategy
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriStrategy.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriStrategy.java
index 7dd1db3..cd362a2 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriStrategy.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriStrategy.java
@@ -14,11 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
+package org.apache.activemq.artemis.rest.queue.push;
 
 import javax.ws.rs.core.UriBuilder;
 import java.io.IOException;
 
+import org.apache.activemq.artemis.rest.queue.push.xml.BasicAuth;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.util.HttpMessageHelper;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
@@ -37,12 +40,9 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpContext;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.push.xml.BasicAuth;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
-import org.apache.activemq.rest.queue.push.xml.XmlHttpHeader;
-import org.apache.activemq.rest.util.HttpMessageHelper;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.queue.push.xml.XmlHttpHeader;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriTemplateStrategy.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriTemplateStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriTemplateStrategy.java
index c2224e1..7de2e22 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriTemplateStrategy.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/UriTemplateStrategy.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push;
+package org.apache.activemq.artemis.rest.queue.push;
 
-import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
 
 public class UriTemplateStrategy extends UriStrategy
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/Authentication.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/Authentication.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/Authentication.java
index c298b3c..8c6abd0 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/Authentication.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/Authentication.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push.xml;
+package org.apache.activemq.artemis.rest.queue.push.xml;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/AuthenticationType.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/AuthenticationType.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/AuthenticationType.java
index 6eb3077..6e59798 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/AuthenticationType.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/AuthenticationType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push.xml;
+package org.apache.activemq.artemis.rest.queue.push.xml;
 
 import javax.xml.bind.annotation.XmlSeeAlso;
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/BasicAuth.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/BasicAuth.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/BasicAuth.java
index 336a334..d764352 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/BasicAuth.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/BasicAuth.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push.xml;
+package org.apache.activemq.artemis.rest.queue.push.xml;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/DigestAuth.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/DigestAuth.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/DigestAuth.java
index f2c8a42..89640a6 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/DigestAuth.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/DigestAuth.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push.xml;
+package org.apache.activemq.artemis.rest.queue.push.xml;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/PushRegistration.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/PushRegistration.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/PushRegistration.java
index 43fa929..860ca4a 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/PushRegistration.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/PushRegistration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push.xml;
+package org.apache.activemq.artemis.rest.queue.push.xml;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlHttpHeader.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlHttpHeader.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlHttpHeader.java
index a1a6445..c58ec1a 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlHttpHeader.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlHttpHeader.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push.xml;
+package org.apache.activemq.artemis.rest.queue.push.xml;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlLink.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlLink.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlLink.java
index f97f249..c0cf1ff 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlLink.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/xml/XmlLink.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.queue.push.xml;
+package org.apache.activemq.artemis.rest.queue.push.xml;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/AcknowledgedSubscriptionResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/AcknowledgedSubscriptionResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/AcknowledgedSubscriptionResource.java
index 3d409bb..4ee3846 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/AcknowledgedSubscriptionResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/AcknowledgedSubscriptionResource.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.queue.AcknowledgedQueueConsumer;
-import org.apache.activemq.rest.queue.DestinationServiceManager;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.queue.AcknowledgedQueueConsumer;
+import org.apache.activemq.artemis.rest.queue.DestinationServiceManager;
 
 public class AcknowledgedSubscriptionResource extends AcknowledgedQueueConsumer implements Subscription
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/FileTopicPushStore.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/FileTopicPushStore.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/FileTopicPushStore.java
index 0aab431..ef7b884 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/FileTopicPushStore.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/FileTopicPushStore.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq.rest.queue.push.FilePushStore;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.queue.push.FilePushStore;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
 
 public class FileTopicPushStore extends FilePushStore implements TopicPushStore
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscription.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscription.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscription.java
index c469d23..c878d74 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscription.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscription.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.push.PushConsumer;
-import org.apache.activemq.rest.queue.push.PushStore;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.queue.push.PushStore;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.queue.push.PushConsumer;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
 
 public class PushSubscription extends PushConsumer
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscriptionsResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscriptionsResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscriptionsResource.java
index f43577b..ed95dea 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscriptionsResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushSubscriptionsResource.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.push.PushConsumer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.queue.push.PushConsumer;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushTopicRegistration.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushTopicRegistration.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushTopicRegistration.java
index d2d7ff0..ed01fcb 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushTopicRegistration.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/PushTopicRegistration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
 
 @XmlRootElement(name = "push-topic-registration")
 @XmlAccessorType(XmlAccessType.PROPERTY)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/Subscription.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/Subscription.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/Subscription.java
index 8688bc3..c2a37f8 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/Subscription.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/Subscription.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
 public interface Subscription
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionResource.java
index db4ec70..ef77b4f 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionResource.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.queue.DestinationServiceManager;
-import org.apache.activemq.rest.queue.QueueConsumer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.queue.DestinationServiceManager;
+import org.apache.activemq.artemis.rest.queue.QueueConsumer;
 
 public class SubscriptionResource extends QueueConsumer implements Subscription
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionsResource.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionsResource.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionsResource.java
index 7f03a2c..7b3738c 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionsResource.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/SubscriptionsResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
@@ -32,16 +32,16 @@ import javax.ws.rs.core.UriInfo;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.rest.ActiveMQRestLogger;
-import org.apache.activemq.rest.queue.AcknowledgedQueueConsumer;
-import org.apache.activemq.rest.queue.Acknowledgement;
-import org.apache.activemq.rest.queue.DestinationServiceManager;
-import org.apache.activemq.rest.queue.QueueConsumer;
-import org.apache.activemq.rest.util.TimeoutTask;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.rest.queue.Acknowledgement;
+import org.apache.activemq.artemis.rest.ActiveMQRestLogger;
+import org.apache.activemq.artemis.rest.queue.AcknowledgedQueueConsumer;
+import org.apache.activemq.artemis.rest.queue.DestinationServiceManager;
+import org.apache.activemq.artemis.rest.queue.QueueConsumer;
+import org.apache.activemq.artemis.rest.util.TimeoutTask;
 
 public class SubscriptionsResource implements TimeoutTask.Callback
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDeployment.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDeployment.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDeployment.java
index 0224a3c..c95bac5 100644
--- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDeployment.java
+++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDeployment.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.rest.topic;
+package org.apache.activemq.artemis.rest.topic;
 
-import org.apache.activemq.rest.queue.DestinationSettings;
+import org.apache.activemq.artemis.rest.queue.DestinationSettings;
 
 public class TopicDeployment extends DestinationSettings
 {


Mime
View raw message