activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [19/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq
Date Mon, 17 Nov 2014 14:48:54 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/delayed-redelivery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index a3f8e15..81c286b 100644
--- a/examples/jms/delayed-redelivery/pom.xml
+++ b/examples/jms/delayed-redelivery/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-delayed-redelivery-example</artifactId>
+   <artifactId>activemq-jms-delayed-redelivery-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Delayed Redelivery Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -42,7 +42,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.DelayedRedeliveryExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.DelayedRedeliveryExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -57,28 +57,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-delayed-redelivery-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-delayed-redelivery-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
index 4869998..53001ee 100644
--- a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
+++ b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * This example demonstrates how HornetQ can be configured with a redelivery delay in the event a message

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml
index d1140ac..7e2c2a6 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,14 +14,14 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
       </connector>
    </connectors>
    
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
       </acceptor>
    </acceptors>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/divert/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index c53759b..f8f2822 100644
--- a/examples/jms/divert/pom.xml
+++ b/examples/jms/divert/pom.xml
@@ -3,24 +3,24 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-divert-example</artifactId>
+   <artifactId>activemq-jms-divert-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Divert Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -32,8 +32,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -62,7 +62,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.DivertExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.DivertExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -96,28 +96,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-divert-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-divert-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/divert/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/divert/readme.html b/examples/jms/divert/readme.html
index 4010302..538283f 100644
--- a/examples/jms/divert/readme.html
+++ b/examples/jms/divert/readme.html
@@ -69,7 +69,7 @@
 	     &lt;address&gt;jms.topic.priceUpdates&lt;/address&gt;
 	     &lt;forwarding-address&gt;jms.queue.priceForwarding&lt;/forwarding-address&gt;    
 	     &lt;filter string="office='New York'"/&gt;
-	     &lt;transformer-class-name&gt;org.apache.activemq6.jms.example.AddForwardingTimeTransformer&lt;/transformer-class-name&gt;     
+	     &lt;transformer-class-name&gt;org.apache.activemq.jms.example.AddForwardingTimeTransformer&lt;/transformer-class-name&gt;
 	     &lt;exclusive&gt;true&lt;/exclusive&gt;
 	  &lt;/divert&gt;
 	     </code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java b/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java
index c223e0e..d965497 100644
--- a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java
+++ b/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/AddForwardingTimeTransformer.java
@@ -10,11 +10,11 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.server.ServerMessage;
-import org.apache.activemq6.core.server.cluster.Transformer;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.server.ServerMessage;
+import org.apache.activemq.core.server.cluster.Transformer;
 
 /**
  * A AddForwardingTimeTransformer

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java b/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
index 9176ea2..74bf343 100644
--- a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
+++ b/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -23,7 +23,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * This examples demonstrates the use of HornetQ "Diverts" to transparently divert or copy messages

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml
index aacbe7f..9a1cc53 100644
--- a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -17,14 +17,14 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    
       <!-- This connector corresponds to the New York server -->
       
       <connector name="newyork-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -33,7 +33,7 @@
 
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>
@@ -61,7 +61,7 @@
          <address>jms.topic.priceUpdates</address>
          <forwarding-address>jms.queue.priceForwarding</forwarding-address>    
          <filter string="office='New York'"/>
-         <transformer-class-name>org.apache.activemq6.jms.example.AddForwardingTimeTransformer</transformer-class-name>     
+         <transformer-class-name>org.apache.activemq.jms.example.AddForwardingTimeTransformer</transformer-class-name>
          <exclusive>true</exclusive>
       </divert>
    </diverts>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml
index d256319..146d45b 100644
--- a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -14,7 +14,7 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -23,7 +23,7 @@
 
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml
index 9995b84..2bd45be 100644
--- a/examples/jms/durable-subscription/pom.xml
+++ b/examples/jms/durable-subscription/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-durable-subscription-example</artifactId>
+   <artifactId>activemq-jms-durable-subscription-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Durable Subscription Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -50,7 +50,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.DurableSubscriptionExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.DurableSubscriptionExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -65,28 +65,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-durable-subscription-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-durable-subscription-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
index eabb031..a0bc42f 100644
--- a/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
+++ b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Topic;
 import javax.jms.TopicSubscriber;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple JMS example that shows how to use a durable subscription.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
index a12ba41..97ddf38 100644
--- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,7 +14,7 @@
    <!-- Connectors -->
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
       </connector>
    </connectors>
    
@@ -22,7 +22,7 @@
 
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/embedded-simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/pom.xml b/examples/jms/embedded-simple/pom.xml
index 6fe330c..5347ee1 100644
--- a/examples/jms/embedded-simple/pom.xml
+++ b/examples/jms/embedded-simple/pom.xml
@@ -3,29 +3,29 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-embedded-simple-example</artifactId>
+   <artifactId>activemq-jms-embedded-simple-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Simple Embedded Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.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>${project.version}</version>
       </dependency>
       <dependency>
@@ -37,8 +37,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>runClient</id>
@@ -46,7 +46,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.EmbeddedExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.EmbeddedExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -62,28 +62,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-embedded-simple-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-embedded-simple-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
index 015a5a8..7c7ec0b 100644
--- a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import java.util.Date;
 
@@ -22,8 +22,8 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq6.common.example.HornetQExample;
-import org.apache.activemq6.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.common.example.HornetQExample;
+import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
 
 /**
  * This example demonstrates how to run a HornetQ embedded with JMS

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml b/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml
index 0c803f1..a4438a9 100644
--- a/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml
+++ b/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml
@@ -7,13 +7,13 @@
 
     <connectors>
         <connector name="in-vm">
-            <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
         </connector>
     </connectors>
 
     <acceptors>
         <acceptor name="in-vm">
-            <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+            <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
         </acceptor>
     </acceptors>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/embedded/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml
index b8fc8b6..d428079 100644
--- a/examples/jms/embedded/pom.xml
+++ b/examples/jms/embedded/pom.xml
@@ -3,29 +3,29 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-embedded-example</artifactId>
+   <artifactId>activemq-jms-embedded-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Embedded Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.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>${project.version}</version>
       </dependency>
       <dependency>
@@ -37,8 +37,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>runClient</id>
@@ -46,7 +46,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.EmbeddedExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.EmbeddedExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -66,28 +66,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-embedded-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-embedded-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java b/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
index 2dcb3e5..c1578a8 100644
--- a/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -23,19 +23,19 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.common.example.HornetQExample;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.impl.ConfigurationImpl;
-import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq6.jms.server.config.JMSConfiguration;
-import org.apache.activemq6.jms.server.config.JMSQueueConfiguration;
-import org.apache.activemq6.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq6.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq6.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq6.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.common.example.HornetQExample;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.jms.server.config.JMSConfiguration;
+import org.apache.activemq.jms.server.config.JMSQueueConfiguration;
+import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
 
 /**
  * This example demonstrates how to run a HornetQ embedded with JMS

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/expiry/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index 5292136..a89c3b7 100644
--- a/examples/jms/expiry/pom.xml
+++ b/examples/jms/expiry/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-expiry-example</artifactId>
+   <artifactId>activemq-jms-expiry-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Expiry Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -50,7 +50,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.ExpiryExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.ExpiryExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -65,28 +65,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-expiry-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-expiry-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java b/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
index 18ee8ec..3a5d3b4 100644
--- a/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
+++ b/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * An example showing how messages are moved to an expiry queue when they expire.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml
index b1b4361..a8275a7 100644
--- a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -15,14 +15,14 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
       </connector>
    </connectors>
    
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
       </acceptor>
    </acceptors>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/ha-policy-autobackup/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/pom.xml b/examples/jms/ha-policy-autobackup/pom.xml
index bde5411..3d3463b 100644
--- a/examples/jms/ha-policy-autobackup/pom.xml
+++ b/examples/jms/ha-policy-autobackup/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
@@ -14,8 +14,8 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start0</id>
@@ -69,7 +69,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.HAPolicyAutoBackupExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.HAPolicyAutoBackupExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                         <param>jnp://localhost:1199</param>
@@ -103,28 +103,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
                   <artifactId>ha-policy-autobackup</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
index 42ad215..e3aaf3e 100644
--- a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
+++ b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,12 +21,12 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClusterTopologyListener;
-import org.apache.activemq6.api.core.client.TopologyMember;
-import org.apache.activemq6.common.example.HornetQExample;
-import org.apache.activemq6.jms.client.HornetQConnection;
-import org.apache.activemq6.jms.client.HornetQConnectionFactory;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.api.core.client.TopologyMember;
+import org.apache.activemq.common.example.HornetQExample;
+import org.apache.activemq.jms.client.HornetQConnection;
+import org.apache.activemq.jms.client.HornetQConnectionFactory;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml
index a217440..f345521 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -13,15 +13,15 @@
 
    <connectors>
       <connector name="invm-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
       </connector>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
       <!-- connector to the server1 -->
       <connector name="server1-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -29,10 +29,10 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="invm-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
       </acceptor>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5445"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml
index d0ea099..2dd7383 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml
@@ -13,15 +13,15 @@
    <!-- Connectors -->
    <connectors>
       <connector name="invm-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
       </connector>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
       <!-- connector to the server0 -->
       <connector name="server0-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5445"/>
       </connector>
    </connectors>
@@ -29,10 +29,10 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="invm-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
       </acceptor>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/http-transport/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index dcbbdf8..6c8c30e 100644
--- a/examples/jms/http-transport/pom.xml
+++ b/examples/jms/http-transport/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-http-transport-example</artifactId>
+   <artifactId>activemq-jms-http-transport-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Http Transport Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -27,8 +27,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -50,7 +50,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.HttpTransportExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.HttpTransportExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -65,28 +65,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-http-transport-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-http-transport-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/http-transport/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/readme.html b/examples/jms/http-transport/readme.html
index 2c0df9f..401d164 100644
--- a/examples/jms/http-transport/readme.html
+++ b/examples/jms/http-transport/readme.html
@@ -19,7 +19,7 @@
       <pre class="prettyprint">
       <code>
       &lt;connector name=&quot;netty-connector&quot;&gt;
-         &lt;factory-class&gt;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class&gt;
+         &lt;factory-class&gt;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class&gt;
          &lt;param key=&quot;hornetq.remoting.netty.http-enabled&quot; value=&quot;true&quot; type=&quot;Boolean&quot;/&gt;
          &lt;param key=&quot;hornetq.remoting.netty.port&quot; value=&quot;8080&quot; type=&quot;Integer&quot;/&gt;
       &lt;/connector&gt;
@@ -27,7 +27,7 @@
       &lt;!-- Acceptors --&gt;
 
       &lt;acceptor name=&quot;netty-acceptor&quot;&gt;
-         &lt;factory-class&gt;org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
+         &lt;factory-class&gt;org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
          &lt;param key=&quot;hornetq.remoting.netty.port&quot; value=&quot;8080&quot; type=&quot;Integer&quot;/&gt;
       &lt;/acceptor&gt;
       </code>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java b/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
index a38355b..6fa43b3 100644
--- a/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
+++ b/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple JMS Queue example that uses HTTP protocol.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 3990c8f..90a75a6 100644
--- a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -14,7 +14,7 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="http-enabled" value="true"/>
          <param key="port" value="8080"/>
       </connector>
@@ -24,7 +24,7 @@
 
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="8080"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/instantiate-connection-factory/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml
index 29a5b4d..8bf1713 100644
--- a/examples/jms/instantiate-connection-factory/pom.xml
+++ b/examples/jms/instantiate-connection-factory/pom.xml
@@ -3,29 +3,29 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-instantiate-connection-factory-example</artifactId>
+   <artifactId>activemq-jms-instantiate-connection-factory-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Instantiate Connection Factory Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-core-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-jms-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-jms-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -37,8 +37,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -60,7 +60,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.InstantiateConnectionFactoryExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.InstantiateConnectionFactoryExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -75,28 +75,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-instantiate-connection-factory-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-instantiate-connection-factory-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java b/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
index fd5b39c..e03b3e0 100644
--- a/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
+++ b/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,12 +23,12 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.jms.HornetQJMSClient;
-import org.apache.activemq6.api.jms.JMSFactoryType;
-import org.apache.activemq6.common.example.HornetQExample;
-import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq6.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.jms.HornetQJMSClient;
+import org.apache.activemq.api.jms.JMSFactoryType;
+import org.apache.activemq.common.example.HornetQExample;
+import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml
index 6c0f8df..efb74f7 100644
--- a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -15,7 +15,7 @@
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
          <param key="port" value="5446"/>
       </connector>
    </connectors>
@@ -23,7 +23,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="port" value="5446"/>
       </acceptor>
    </acceptors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/interceptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml
index ad7204a..d33e6f2 100644
--- a/examples/jms/interceptor/pom.xml
+++ b/examples/jms/interceptor/pom.xml
@@ -3,24 +3,24 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-interceptor-example</artifactId>
+   <artifactId>activemq-jms-interceptor-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Interceptor Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-jms-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-jms-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -32,8 +32,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -55,7 +55,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.InterceptorExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.InterceptorExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -70,28 +70,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-interceptor-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-interceptor-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/interceptor/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/readme.html b/examples/jms/interceptor/readme.html
index 4303171..c662489 100644
--- a/examples/jms/interceptor/readme.html
+++ b/examples/jms/interceptor/readme.html
@@ -26,7 +26,7 @@
         &lt;configuration&gt;
         ...
            &lt;remoting-incoming-interceptors&gt;
-              &lt;class-name&gt;org.apache.activemq6.jms.example.SimpleInterceptor&lt;/class-name&gt;
+              &lt;class-name&gt;org.apache.activemq.jms.example.SimpleInterceptor&lt;/class-name&gt;
            &lt;/remoting-incoming-interceptors&gt;
         ...
         &lt;/configuration&gt;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
index ae97e9d..4cb91fe 100644
--- a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
+++ b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -21,7 +21,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq6.common.example.HornetQExample;
+import org.apache.activemq.common.example.HornetQExample;
 
 /**
  * A simple JMS example that shows how to implement and use interceptors with HornetQ.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java
index 724895b..51b4e76 100644
--- a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java
+++ b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java
@@ -10,15 +10,15 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.jms.example;
+package org.apache.activemq.jms.example;
 
-import org.apache.activemq6.api.core.HornetQException;
-import org.apache.activemq6.api.core.Interceptor;
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.SimpleString;
-import org.apache.activemq6.core.protocol.core.Packet;
-import org.apache.activemq6.core.protocol.core.impl.wireformat.SessionSendMessage;
-import org.apache.activemq6.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.Interceptor;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.protocol.core.Packet;
+import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage;
+import org.apache.activemq.spi.core.protocol.RemotingConnection;
 
 /**
  * A simple Interceptor implementation

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
index b4d1e88..b074077 100644
--- a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
@@ -12,21 +12,21 @@
 
 
    <remoting-incoming-interceptors>
-      <class-name>org.apache.activemq6.jms.example.SimpleInterceptor</class-name>
+      <class-name>org.apache.activemq.jms.example.SimpleInterceptor</class-name>
    </remoting-incoming-interceptors>
 
    <!-- Connectors -->
 
    <connectors>
       <connector name="netty-connector">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
       </connector>
    </connectors>
    
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>         
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
       </acceptor>
    </acceptors>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/jms/jaas/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/pom.xml b/examples/jms/jaas/pom.xml
index 837e540..9a3a261 100644
--- a/examples/jms/jaas/pom.xml
+++ b/examples/jms/jaas/pom.xml
@@ -3,29 +3,29 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.jms</groupId>
+      <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-jaas-example</artifactId>
+   <artifactId>activemq-jms-jaas-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS "JAAS" Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-core-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -37,8 +37,8 @@
    <build>
       <plugins>
          <plugin>
-            <groupId>org.apache.activemq6</groupId>
-            <artifactId>activemq6-maven-plugin</artifactId>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-maven-plugin</artifactId>
             <version>1.1.0</version>
             <executions>
                <execution>
@@ -47,11 +47,11 @@
                      <goal>start</goal>
                   </goals>
                   <configuration>
-                     <securityManager implementation="org.apache.activemq6.spi.core.security.JAASSecurityManager">
-                        <configurationName>org.apache.activemq6.jms.example.ExampleLoginModule</configurationName>
-                        <callbackHandler implementation="org.apache.activemq6.jms.example.ExampleCallbackHandler"/>
-                        <config implementation="org.apache.activemq6.jms.example.ExampleConfiguration">
-                           <loginModuleName>org.apache.activemq6.jms.example.ExampleLoginModule</loginModuleName>
+                     <securityManager implementation="org.apache.activemq.spi.core.security.JAASSecurityManager">
+                        <configurationName>org.apache.activemq.jms.example.ExampleLoginModule</configurationName>
+                        <callbackHandler implementation="org.apache.activemq.jms.example.ExampleCallbackHandler"/>
+                        <config implementation="org.apache.activemq.jms.example.ExampleConfiguration">
+                           <loginModuleName>org.apache.activemq.jms.example.ExampleLoginModule</loginModuleName>
                            <options>
                               <user>jboss</user>
                               <pass>redhat</pass>
@@ -73,7 +73,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq6.jms.example.JAASExample</clientClass>
+                     <clientClass>org.apache.activemq.jms.example.JAASExample</clientClass>
                      <args>
                         <param>jnp://localhost:1099</param>
                      </args>
@@ -88,28 +88,28 @@
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq6.examples.jms</groupId>
-                  <artifactId>activemq6-jms-jaas-example</artifactId>
+                  <groupId>org.apache.activemq.examples.jms</groupId>
+                  <artifactId>activemq-jms-jaas-example</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-core-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-core-client</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-server</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-server</artifactId>
                   <version>${project.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-jms-client</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-jms-client</artifactId>
                   <version>${project.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>${project.version}</version>
                </dependency>
                <dependency>


Mime
View raw message