activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [38/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq
Date Mon, 17 Nov 2014 14:49:13 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index 4951a2d..9016595 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -3,14 +3,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.apache.activemq6</groupId>
-      <artifactId>activemq6-pom</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-pom</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
    <name>ActiveMQ6 REST Interface Implementation</name>
-   <groupId>org.apache.activemq6.rest</groupId>
-   <artifactId>activemq6-rest</artifactId>
+   <groupId>org.apache.activemq.rest</groupId>
+   <artifactId>activemq-rest</artifactId>
    <packaging>jar</packaging>
 
    <properties>
@@ -65,13 +65,13 @@
          <artifactId>netty-all</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${hornetq.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-jms-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-jms-server</artifactId>
          <version>${hornetq.version}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestBundle.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestBundle.java b/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestBundle.java
index 4be89cd..83bf74a 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestBundle.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestBundle.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
 
 import org.jboss.logging.annotations.MessageBundle;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java b/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java
index 2d5c451..49f8db0 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java
@@ -11,10 +11,10 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.rest.queue.push.xml.XmlLink;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/Hornetq.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/Hornetq.java b/activemq-rest/src/main/java/org/apache/activemq/rest/Hornetq.java
index a7a5fc1..4f9e79d 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/Hornetq.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/Hornetq.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.MessageBodyReader;
@@ -22,8 +22,8 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Type;
 
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.rest.util.HttpMessageHelper;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java b/activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java
index 41dded2..fb22455 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/HttpHeaderProperty.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
 public class HttpHeaderProperty
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java b/activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java
index 8601557..0bcacd9 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/Jms.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
-import org.apache.activemq6.rest.util.HttpMessageHelper;
+import org.apache.activemq.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java b/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java
index 3de3ca7..ec8ba8c 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceConfiguration.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java
index 8969393..80b4c5d 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/MessageServiceManager.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -22,21 +22,21 @@ import java.util.concurrent.Executors;
 
 import javax.xml.bind.JAXBContext;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.client.impl.ServerLocatorImpl;
-import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq6.core.remoting.impl.invm.TransportConstants;
-import org.apache.activemq6.rest.queue.DestinationSettings;
-import org.apache.activemq6.rest.queue.QueueServiceManager;
-import org.apache.activemq6.rest.topic.TopicServiceManager;
-import org.apache.activemq6.rest.util.CustomHeaderLinkStrategy;
-import org.apache.activemq6.rest.util.LinkHeaderLinkStrategy;
-import org.apache.activemq6.rest.util.LinkStrategy;
-import org.apache.activemq6.rest.util.TimeoutTask;
-import org.apache.activemq6.spi.core.naming.BindingRegistry;
-import org.apache.activemq6.utils.XMLUtil;
+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;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java b/activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java
index 7a224a2..5ce55d1 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/UnknownMediaType.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java b/activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java
index be40eba..ed05213 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/UnmarshalException.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest;
+package org.apache.activemq.rest;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQ.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQ.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQ.java
index c97fb43..fffcc8e 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQ.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQ.java
@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.integration;
+package org.apache.activemq.rest.integration;
 
-import org.apache.activemq6.core.server.embedded.EmbeddedHornetQ;
+import org.apache.activemq.core.server.embedded.EmbeddedHornetQ;
 import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer;
-import org.apache.activemq6.rest.MessageServiceManager;
+import org.apache.activemq.rest.MessageServiceManager;
 import org.jboss.resteasy.test.TestPortProvider;
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQJMS.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQJMS.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQJMS.java
index fd21185..3284eb1 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQJMS.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/EmbeddedRestHornetQJMS.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.integration;
+package org.apache.activemq.rest.integration;
 
-import org.apache.activemq6.jms.server.embedded.EmbeddedJMS;
-import org.apache.activemq6.spi.core.naming.BindingRegistry;
+import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.spi.core.naming.BindingRegistry;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/integration/HornetqBootstrapListener.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/HornetqBootstrapListener.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/HornetqBootstrapListener.java
index ca1a524..f24038f 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/HornetqBootstrapListener.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/HornetqBootstrapListener.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.integration;
+package org.apache.activemq.rest.integration;
 
-import org.apache.activemq6.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java
index 20d2b02..0fe2485 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/RestMessagingBootstrapListener.java
@@ -10,13 +10,13 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.integration;
+package org.apache.activemq.rest.integration;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import org.apache.activemq6.rest.MessageServiceManager;
+import org.apache.activemq.rest.MessageServiceManager;
 import org.jboss.resteasy.spi.Registry;
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java
index ab153dc..db2c1c2 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/integration/ServletContextBindingRegistry.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.integration;
+package org.apache.activemq.rest.integration;
 
-import org.apache.activemq6.spi.core.naming.BindingRegistry;
+import org.apache.activemq.spi.core.naming.BindingRegistry;
 
 import javax.servlet.ServletContext;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java
index b0d28c3..d7a0712 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.FormParam;
@@ -25,14 +25,14 @@ import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 import java.net.URI;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.util.Constants;
-import org.apache.activemq6.rest.util.LinkStrategy;
+import org.apache.activemq.api.core.HornetQException;
+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.HornetQRestLogger;
+import org.apache.activemq.rest.util.Constants;
+import org.apache.activemq.rest.util.LinkStrategy;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java
index 827c22e..91218ad 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/Acknowledgement.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
-import org.apache.activemq6.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientMessage;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java
index b3c038d..0b75e00 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedHttpMessage.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
-import org.apache.activemq6.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientMessage;
 
 import javax.ws.rs.core.Response;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java
index 568c652..a9d53d5 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedMessage.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.HttpHeaderProperty;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.rest.HornetQRestLogger;
+import org.apache.activemq.rest.HttpHeaderProperty;
 
 import javax.ws.rs.core.Response;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java
index b8c5be1..37d8402 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumedObjectMessage.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
-import org.apache.activemq6.api.core.client.ClientMessage;
+import org.apache.activemq.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java
index 1795a47..775285d 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
@@ -28,10 +28,10 @@ import javax.ws.rs.core.UriInfo;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.util.TimeoutTask;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.rest.HornetQRestLogger;
+import org.apache.activemq.rest.util.TimeoutTask;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java
index 39b23c2..8730c65 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationResource.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java
index ceb71da..da58b80 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java
@@ -10,16 +10,16 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
-
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq6.rest.util.LinkStrategy;
-import org.apache.activemq6.rest.util.TimeoutTask;
-import org.apache.activemq6.spi.core.naming.BindingRegistry;
+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.HornetQClient;
+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;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java
index 5b79889..0ef6289 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationSettings.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java
index a1db60d..3d6de80 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -28,16 +28,16 @@ import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.util.HttpMessageHelper;
-import org.apache.activemq6.utils.UUID;
-import org.apache.activemq6.utils.UUIDGenerator;
+import org.apache.activemq.api.core.HornetQException;
+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.HornetQRestLogger;
+import org.apache.activemq.rest.util.HttpMessageHelper;
+import org.apache.activemq.utils.UUID;
+import org.apache.activemq.utils.UUIDGenerator;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java
index cf76564..dc61f08 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.rest.HornetQRestLogger;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientProducer;
+import org.apache.activemq.rest.HornetQRestLogger;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.QueryParam;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java
index 0f1d204..609df82 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
-import org.apache.activemq6.rest.HornetQRestLogger;
+import org.apache.activemq.rest.HornetQRestLogger;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.core.Context;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java
index 1a2dcd8..5949289 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.HeaderParam;
@@ -24,15 +24,15 @@ import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 import java.net.URI;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.jms.client.SelectorTranslator;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.util.Constants;
-import org.apache.activemq6.rest.util.LinkStrategy;
+import org.apache.activemq.api.core.HornetQException;
+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.HornetQRestLogger;
+import org.apache.activemq.rest.util.Constants;
+import org.apache.activemq.rest.util.LinkStrategy;
 
 /**
  * Auto-acknowleged consumer

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java
index 4c2f4f8..5f47cd9 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDeployment.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java
index 069bced..1d4c6f9 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -25,17 +25,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.jms.client.HornetQDestination;
-import org.apache.activemq6.jms.client.HornetQQueue;
-import org.apache.activemq6.jms.server.config.JMSQueueConfiguration;
-import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.push.PushConsumerResource;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
-import org.apache.activemq6.rest.util.Constants;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.jms.client.HornetQDestination;
+import org.apache.activemq.jms.client.HornetQQueue;
+import org.apache.activemq.jms.server.config.JMSQueueConfiguration;
+import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl;
+import org.apache.activemq.rest.HornetQRestLogger;
+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.w3c.dom.Document;
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java
index 54210e1..c46ebaa 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DELETE;
@@ -23,10 +23,10 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.push.PushConsumerResource;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.rest.HornetQRestLogger;
+import org.apache.activemq.rest.queue.push.PushConsumerResource;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java
index 0926785..9bb8f50 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueServiceManager.java
@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue;
+package org.apache.activemq.rest.queue;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.rest.queue.push.FilePushStore;
-import org.apache.activemq6.rest.queue.push.PushStore;
+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;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java
index 81df305..707ef19 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
+package org.apache.activemq.rest.queue.push;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -21,9 +21,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
-import org.apache.activemq6.rest.topic.PushTopicRegistration;
+import org.apache.activemq.rest.HornetQRestLogger;
+import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.rest.topic.PushTopicRegistration;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java
index 3979fbf..f93a499 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
+package org.apache.activemq.rest.queue.push;
 
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.rest.queue.push.xml.XmlHttpHeader;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java
index 8e445bb..6adf0c0 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java
@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
-
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.jms.client.SelectorTranslator;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
+package org.apache.activemq.rest.queue.push;
+
+import org.apache.activemq.api.core.HornetQException;
+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.HornetQRestLogger;
+import org.apache.activemq.rest.queue.push.xml.PushRegistration;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java
index 3bd2868..da19085 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java
@@ -10,13 +10,13 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
+package org.apache.activemq.rest.queue.push;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.MessageHandler;
-import org.apache.activemq6.rest.HornetQRestLogger;
+import org.apache.activemq.api.core.HornetQException;
+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.HornetQRestLogger;
 
 public class PushConsumerMessageHandler implements MessageHandler
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java
index b573057..aa13dd1 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
+package org.apache.activemq.rest.queue.push;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -28,9 +28,9 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.rest.HornetQRestLogger;
+import org.apache.activemq.rest.queue.push.xml.PushRegistration;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java
index 7de6c62..e3b6e28 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStore.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
+package org.apache.activemq.rest.queue.push;
 
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.rest.queue.push.xml.PushRegistration;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java
index 1bcb0f1..1437655 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
+package org.apache.activemq.rest.queue.push;
 
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.rest.queue.push.xml.PushRegistration;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java
index 0ea598b..3137c19 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
+package org.apache.activemq.rest.queue.push;
 
 import javax.ws.rs.core.UriBuilder;
 import java.io.IOException;
@@ -33,12 +33,12 @@ 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.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.push.xml.BasicAuth;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
-import org.apache.activemq6.rest.queue.push.xml.XmlHttpHeader;
-import org.apache.activemq6.rest.util.HttpMessageHelper;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.rest.HornetQRestLogger;
+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.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java
index a11b224..cffd0f2 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriTemplateStrategy.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push;
+package org.apache.activemq.rest.queue.push;
 
-import org.apache.activemq6.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientMessage;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java
index e0b66bf..21ba505 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/Authentication.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push.xml;
+package org.apache.activemq.rest.queue.push.xml;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java
index 20233f8..7a8b910 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/AuthenticationType.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push.xml;
+package org.apache.activemq.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java
index 5f39201..4e969ac 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/BasicAuth.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push.xml;
+package org.apache.activemq.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java
index 4d9ba6e..0e7fee2 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/DigestAuth.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push.xml;
+package org.apache.activemq.rest.queue.push.xml;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java
index 5451ebf..d1e63ad 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/PushRegistration.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push.xml;
+package org.apache.activemq.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/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java
index 48b4156..39d937b 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push.xml;
+package org.apache.activemq.rest.queue.push.xml;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java
index 2f98768..993a6a0 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlLink.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.queue.push.xml;
+package org.apache.activemq.rest.queue.push.xml;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java
index 6e3cb6d..3a80a25 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.queue.AcknowledgedQueueConsumer;
-import org.apache.activemq6.rest.queue.DestinationServiceManager;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.rest.queue.AcknowledgedQueueConsumer;
+import org.apache.activemq.rest.queue.DestinationServiceManager;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java
index f4afa52..430881c 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/FileTopicPushStore.java
@@ -10,13 +10,13 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.activemq6.rest.queue.push.FilePushStore;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.rest.queue.push.FilePushStore;
+import org.apache.activemq.rest.queue.push.xml.PushRegistration;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java
index c2264f5..4787c01 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java
@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.push.PushConsumer;
-import org.apache.activemq6.rest.queue.push.PushStore;
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.rest.HornetQRestLogger;
+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;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java
index 0c99efd..7015e65 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java
@@ -10,14 +10,14 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.push.PushConsumer;
+import org.apache.activemq.api.core.HornetQException;
+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.HornetQRestLogger;
+import org.apache.activemq.rest.queue.push.PushConsumer;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java
index 092ef8a..5d850ea 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushTopicRegistration.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -18,7 +18,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.activemq6.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.rest.queue.push.xml.PushRegistration;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java
index 97986b9..08820fa 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/Subscription.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java
index 74b9a85..7051057 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.queue.DestinationServiceManager;
-import org.apache.activemq6.rest.queue.QueueConsumer;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.rest.queue.DestinationServiceManager;
+import org.apache.activemq.rest.queue.QueueConsumer;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java
index 0d11709..7f85fbc 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
@@ -28,16 +28,16 @@ import javax.ws.rs.core.UriInfo;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.AcknowledgedQueueConsumer;
-import org.apache.activemq6.rest.queue.Acknowledgement;
-import org.apache.activemq6.rest.queue.DestinationServiceManager;
-import org.apache.activemq6.rest.queue.QueueConsumer;
-import org.apache.activemq6.rest.util.TimeoutTask;
+import org.apache.activemq.api.core.HornetQException;
+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.HornetQRestLogger;
+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;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java
index e9b0431..146f87a 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDeployment.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
-import org.apache.activemq6.rest.queue.DestinationSettings;
+import org.apache.activemq.rest.queue.DestinationSettings;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java
index e893c18..ed769dc 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -25,18 +25,18 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.jms.client.HornetQDestination;
-import org.apache.activemq6.jms.client.HornetQTopic;
-import org.apache.activemq6.jms.server.config.TopicConfiguration;
-import org.apache.activemq6.jms.server.impl.JMSServerConfigParserImpl;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.DestinationSettings;
-import org.apache.activemq6.rest.queue.PostMessage;
-import org.apache.activemq6.rest.queue.PostMessageDupsOk;
-import org.apache.activemq6.rest.queue.PostMessageNoDups;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.jms.client.HornetQDestination;
+import org.apache.activemq.jms.client.HornetQTopic;
+import org.apache.activemq.jms.server.config.TopicConfiguration;
+import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl;
+import org.apache.activemq.rest.HornetQRestLogger;
+import org.apache.activemq.rest.queue.DestinationSettings;
+import org.apache.activemq.rest.queue.PostMessage;
+import org.apache.activemq.rest.queue.PostMessageDupsOk;
+import org.apache.activemq.rest.queue.PostMessageNoDups;
 import org.w3c.dom.Document;
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java
index 32c6456..285fc2a 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicPushStore.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
-import org.apache.activemq6.rest.queue.push.PushStore;
+import org.apache.activemq.rest.queue.push.PushStore;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java
index 98d5b86..61c2481 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -22,11 +22,11 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.queue.DestinationResource;
-import org.apache.activemq6.rest.queue.PostMessage;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.rest.HornetQRestLogger;
+import org.apache.activemq.rest.queue.DestinationResource;
+import org.apache.activemq.rest.queue.PostMessage;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java
index 5d188ec..d6f908d 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicServiceManager.java
@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.topic;
+package org.apache.activemq.rest.topic;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.rest.queue.DestinationServiceManager;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.rest.queue.DestinationServiceManager;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java
index c22f102..03ffa62 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/util/Constants.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.util;
+package org.apache.activemq.rest.util;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java
index e22eaa2..e775557 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/util/CustomHeaderLinkStrategy.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.util;
+package org.apache.activemq.rest.util;
 
 import javax.ws.rs.core.Response;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java
index 1ba303b..920df23 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.util;
+package org.apache.activemq.rest.util;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.rest.HornetQRestLogger;
-import org.apache.activemq6.rest.HttpHeaderProperty;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.rest.HornetQRestLogger;
+import org.apache.activemq.rest.HttpHeaderProperty;
 import org.jboss.resteasy.client.ClientRequest;
 
 import javax.ws.rs.core.HttpHeaders;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java
index fe4c83e..7d7442e 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkHeaderLinkStrategy.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.util;
+package org.apache.activemq.rest.util;
 
 import org.jboss.resteasy.spi.Link;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java
index 70e1308..b98d832 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/util/LinkStrategy.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.util;
+package org.apache.activemq.rest.util;
 
 import javax.ws.rs.core.Response;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java
index 98fe593..d371aa2 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.util;
+package org.apache.activemq.rest.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,7 +19,7 @@ import java.util.Map;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.activemq6.rest.HornetQRestLogger;
+import org.apache.activemq.rest.HornetQRestLogger;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java
index b99cee1..4f79913 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckQueueTest.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.test;
+package org.apache.activemq.rest.test;
 
-import org.apache.activemq6.rest.queue.QueueDeployment;
-import org.apache.activemq6.rest.util.Constants;
+import org.apache.activemq.rest.queue.QueueDeployment;
+import org.apache.activemq.rest.util.Constants;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.Link;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java
index 6bf6ad3..4f152ca 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/AutoAckTopicTest.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.rest.test;
+package org.apache.activemq.rest.test;
 
-import org.apache.activemq6.rest.topic.TopicDeployment;
+import org.apache.activemq.rest.topic.TopicDeployment;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.Link;


Mime
View raw message