http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml 
b/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
index 7153527..cca3025 100644
--- a/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
+++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
@@ -14,7 +14,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="tcp-no-delay" value="false"/>
          <param key="tcp-send-buffer-size" value="1048576"/>
          <param key="tcp-receive-buffer-size" value="1048576"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 2ad8229..72af26a 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples</groupId>
-      <artifactId>activemq6-examples</artifactId>
+      <groupId>org.apache.activemq.examples</groupId>
+      <artifactId>activemq-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <groupId>org.apache.activemq6.examples.core</groupId>
+   <groupId>org.apache.activemq.examples.core</groupId>
    <artifactId>core-examples</artifactId>
    <packaging>pom</packaging>
    <name>ActiveMQ6 Core Examples</name>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/twitter-connector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/pom.xml 
b/examples/core/twitter-connector/pom.xml
index cb7d45e..8299070 100644
--- a/examples/core/twitter-connector/pom.xml
+++ b/examples/core/twitter-connector/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.core</groupId>
+      <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-twitter-example</artifactId>
+   <artifactId>activemq-twitter-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Twitter Example</name>
 
@@ -20,18 +20,18 @@
    </properties>
    <dependencies>
       <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-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-commons</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -64,8 +64,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>
@@ -106,33 +106,33 @@
                   </configuration>
                   <dependencies>
                      <dependency>
-                        <groupId>org.apache.activemq6.examples.core</groupId>
-                        <artifactId>activemq6-twitter-example</artifactId>
+                        <groupId>org.apache.activemq.examples.core</groupId>
+                        <artifactId>activemq-twitter-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
-                        <groupId>org.apache.activemq6</groupId>
-                        <artifactId>activemq6-twitter-integration</artifactId>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-twitter-integration</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>
@@ -172,7 +172,7 @@
                      </execution>
                   </executions>
                   <configuration>
-                     
<mainClass>org.apache.activemq6.core.example.TwitterConnectorExample</mainClass>
+                     
<mainClass>org.apache.activemq.core.example.TwitterConnectorExample</mainClass>
                   </configuration>
                </plugin>
             </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/twitter-connector/readme.html
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/readme.html 
b/examples/core/twitter-connector/readme.html
index 4211295..936c411 100644
--- a/examples/core/twitter-connector/readme.html
+++ b/examples/core/twitter-connector/readme.html
@@ -48,7 +48,7 @@
 
         <li>We create a core message that we are going to send</li>
         <pre class="prettyprint">
-           <code>ClientMessage cm = 
session.createMessage(org.apache.activemq6.api.core.Message.TEXT_TYPE,true);
+           <code>ClientMessage cm = 
session.createMessage(org.apache.activemq.api.core.Message.TEXT_TYPE,true);
 String testMessage = System.currentTimeMillis() + ": twitter connector test 
example";
 cm.getBodyBuffer().writeString(testMessage);</code>
         </pre>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/twitter-connector/src/main/java/org/apache/activemq/core/example/TwitterConnectorExample.java
----------------------------------------------------------------------
diff --git 
a/examples/core/twitter-connector/src/main/java/org/apache/activemq/core/example/TwitterConnectorExample.java
 
b/examples/core/twitter-connector/src/main/java/org/apache/activemq/core/example/TwitterConnectorExample.java
index d966621..3e576d3 100644
--- 
a/examples/core/twitter-connector/src/main/java/org/apache/activemq/core/example/TwitterConnectorExample.java
+++ 
b/examples/core/twitter-connector/src/main/java/org/apache/activemq/core/example/TwitterConnectorExample.java
@@ -10,17 +10,17 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
-
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-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.api.core.client.HornetQClient;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory;
+package org.apache.activemq.core.example;
+
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientConsumer;
+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.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
 
 /**
  * A simple example of using twitter connector service.
@@ -61,7 +61,7 @@ public class TwitterConnectorExample
          ClientConsumer cc = session.createConsumer(INCOMING_QUEUE);
 
          // Step 5. Create a core message.
-         ClientMessage cm = 
session.createMessage(org.apache.activemq6.api.core.Message.TEXT_TYPE,true);
+         ClientMessage cm = 
session.createMessage(org.apache.activemq.api.core.Message.TEXT_TYPE,true);
          cm.getBodyBuffer().writeString(testMessage);
 
          // Step 6. Send a message to queue.outgoingQueue.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
 
b/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
index fbe1c42..5f53c8f 100644
--- 
a/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
+++ 
b/examples/core/twitter-connector/src/main/resources/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>
 
@@ -50,7 +50,7 @@
 
    <connector-services>
       <connector-service name="my-incoming-tweets">
-         
<factory-class>org.apache.activemq6.integration.twitter.TwitterIncomingConnectorServiceFactory</factory-class>
+         
<factory-class>org.apache.activemq.integration.twitter.TwitterIncomingConnectorServiceFactory</factory-class>
          <param key="queue" value="queue.incomingQueue"/>
          <param key="consumerKey" value="${twitter.consumerKey}"/>
          <param key="consumerSecret" value="${twitter.consumerSecret}"/>
@@ -59,7 +59,7 @@
          <param key="interval" value="60"/>
       </connector-service>
        <connector-service name="my-outgoing-tweets">
-         
<factory-class>org.apache.activemq6.integration.twitter.TwitterOutgoingConnectorServiceFactory</factory-class>
+         
<factory-class>org.apache.activemq.integration.twitter.TwitterOutgoingConnectorServiceFactory</factory-class>
          <param key="queue" value="queue.outgoingQueue"/>
          <param key="consumerKey" value="${twitter.consumerKey}"/>
          <param key="consumerSecret" value="${twitter.consumerSecret}"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/vertx-connector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/pom.xml 
b/examples/core/vertx-connector/pom.xml
index 7b14210..79e83f9 100644
--- a/examples/core/vertx-connector/pom.xml
+++ b/examples/core/vertx-connector/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.core</groupId>
+      <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-vertx-example</artifactId>
+   <artifactId>activemq-vertx-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Vert.x Example</name>
 
@@ -17,18 +17,18 @@
    </properties>
    <dependencies>
       <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-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-commons</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -74,8 +74,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>
@@ -97,7 +97,7 @@
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     
<clientClass>org.apache.activemq6.core.example.VertxConnectorExample</clientClass>
+                     
<clientClass>org.apache.activemq.core.example.VertxConnectorExample</clientClass>
                   </configuration>
                </execution>
                <execution>
@@ -109,33 +109,33 @@
             </executions>
                   <dependencies>
                      <dependency>
-                        <groupId>org.apache.activemq6.examples.core</groupId>
-                        <artifactId>activemq6-vertx-example</artifactId>
+                        <groupId>org.apache.activemq.examples.core</groupId>
+                        <artifactId>activemq-vertx-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
-                        <groupId>org.apache.activemq6</groupId>
-                        <artifactId>activemq6-vertx-integration</artifactId>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-vertx-integration</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/core/vertx-connector/readme.html
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/readme.html 
b/examples/core/vertx-connector/readme.html
index 5b6e820..ed37cfc 100644
--- a/examples/core/vertx-connector/readme.html
+++ b/examples/core/vertx-connector/readme.html
@@ -36,7 +36,7 @@
 
         <li>We deploy a Verticle using the platformManager</li>
         <pre class="prettyprint">
-           <code>String verticle = 
"org.apache.activemq6.core.example.ExampleVerticle";
+           <code>String verticle = 
"org.apache.activemq.core.example.ExampleVerticle";
            platformManager.deployVerticle(verticle, null, new URL[0], 1, null, 
                   new Handler<AsyncResult<String>>(){
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java
----------------------------------------------------------------------
diff --git 
a/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java
 
b/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java
index 4693889..671a575 100644
--- 
a/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java
+++ 
b/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/ExampleVerticle.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java
----------------------------------------------------------------------
diff --git 
a/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java
 
b/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java
index 50239b8..e6b9583 100644
--- 
a/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java
+++ 
b/examples/core/vertx-connector/src/main/java/org/apache/activemq/core/example/VertxConnectorExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.net.URL;
 import java.util.concurrent.CountDownLatch;
@@ -55,7 +55,7 @@ public class VertxConnectorExample
          final CountDownLatch latch0 = new CountDownLatch(1);
 
          // Step 2 Deploy a Verticle to receive message
-         String verticle = "org.apache.activemq6.core.example.ExampleVerticle";
+         String verticle = "org.apache.activemq.core.example.ExampleVerticle";
          platformManager.deployVerticle(verticle, null, new URL[0], 1, null, 
                   new Handler<AsyncResult<String>>(){
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
 
b/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
index 857663f..406e78e 100644
--- 
a/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
+++ 
b/examples/core/vertx-connector/src/main/resources/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>
 
@@ -43,14 +43,14 @@
 
    <connector-services>
       <connector-service name="my-incoming-vertx">
-         
<factory-class>org.apache.activemq6.integration.vertx.VertxIncomingConnectorServiceFactory</factory-class>
+         
<factory-class>org.apache.activemq.integration.vertx.VertxIncomingConnectorServiceFactory</factory-class>
          <param key="queue" value="queue.vertxQueue"/>
          <param key="host" value="localhost"/>
          <param key="port" value="0"/>
          <param key="vertx-address" value="incoming.vertx.address"/>
       </connector-service>
       <connector-service name="my-outgoing-vertx">
-         
<factory-class>org.apache.activemq6.integration.vertx.VertxOutgoingConnectorServiceFactory</factory-class>
+         
<factory-class>org.apache.activemq.integration.vertx.VertxOutgoingConnectorServiceFactory</factory-class>
          <param key="queue" value="queue.vertxQueue"/>
          <param key="host" value="localhost"/>
          <param key="port" value="0"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/ejb-jms-transaction/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/pom.xml 
b/examples/javaee/ejb-jms-transaction/pom.xml
index bf0aeac..f63207a 100644
--- a/examples/javaee/ejb-jms-transaction/pom.xml
+++ b/examples/javaee/ejb-jms-transaction/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-ejb-jms-example</artifactId>
+   <artifactId>activemq-javaee-ejb-jms-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB EJB Transaction Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/ejb-jms-transaction/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/readme.html 
b/examples/javaee/ejb-jms-transaction/readme.html
index 0a18fb1..57ce0e8 100644
--- a/examples/javaee/ejb-jms-transaction/readme.html
+++ b/examples/javaee/ejb-jms-transaction/readme.html
@@ -47,7 +47,7 @@
 
          <li>We look up the EJB</li>
          <pre class="prettyprint">
-            SendMessageService service = (SendMessageService) 
initialContext.lookup("ejb:/test//SendMessageBean!org.apache.activemq6.javaee.example.server.SendMessageService");
+            SendMessageService service = (SendMessageService) 
initialContext.lookup("ejb:/test//SendMessageBean!org.apache.activemq.javaee.example.server.SendMessageService");
          </pre>
 
          <li>We create the DB table which will be updated if it does not 
already exist</li>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java
 
b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java
index 4a810bb..531406d 100644
--- 
a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java
+++ 
b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -22,7 +22,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import java.util.Properties;
 
-import org.apache.activemq6.javaee.example.server.SendMessageService;
+import org.apache.activemq.javaee.example.server.SendMessageService;
 
 /**
  * An example showing how to invoke a EJB which sends a JMS message and update 
a JDBC table in the same transaction.
@@ -45,7 +45,7 @@ public class EJBClientExample
          initialContext = new InitialContext(env);
 
          // Step 2. Lookup the EJB
-         SendMessageService service = (SendMessageService) 
initialContext.lookup("ejb:/test//SendMessageBean!org.apache.activemq6.javaee.example.server.SendMessageService");
+         SendMessageService service = (SendMessageService) 
initialContext.lookup("ejb:/test//SendMessageBean!org.apache.activemq.javaee.example.server.SendMessageService");
 
          // Step 3. Create the DB table which will be updated
          service.createTable();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java
 
b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java
index 3a62f66..e5c6995 100644
--- 
a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java
+++ 
b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import java.sql.PreparedStatement;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java
 
b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java
index 60ffca5..f7de483 100644
--- 
a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java
+++ 
b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 /**
  *  The interface of an EJB which sends a JMS message and updates a JDBC table 
in the same transaction.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java
 
b/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java
index 65971a9..8f56de1 100644
--- 
a/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java
+++ 
b/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java
@@ -11,11 +11,11 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.javaee.examples;
+package org.apache.activemq.javaee.examples;
 
-import org.apache.activemq6.javaee.example.EJBClientExample;
-import org.apache.activemq6.javaee.example.server.SendMessageBean;
-import org.apache.activemq6.javaee.example.server.SendMessageService;
+import org.apache.activemq.javaee.example.EJBClientExample;
+import org.apache.activemq.javaee.example.server.SendMessageBean;
+import org.apache.activemq.javaee.example.server.SendMessageService;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/pom.xml 
b/examples/javaee/jca-config/pom.xml
index 490f147..71982c4 100644
--- a/examples/javaee/jca-config/pom.xml
+++ b/examples/javaee/jca-config/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-jca-config-example</artifactId>
+   <artifactId>activemq-javaee-jca-config-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE JCA Config Example</name>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/readme.html 
b/examples/javaee/jca-config/readme.html
index a16c07b..ac73706 100644
--- a/examples/javaee/jca-config/readme.html
+++ b/examples/javaee/jca-config/readme.html
@@ -38,7 +38,7 @@
 
          <li>Getting a reference to the Stateless Bean</li>
          <pre class="prettyprint">
-            StatelessSenderService sender = 
(StatelessSenderService)initialContext.lookup("ejb:/test//StatelessSender!org.apache.activemq6.javaee.example.server2.StatelessSenderService");
+            StatelessSenderService sender = 
(StatelessSenderService)initialContext.lookup("ejb:/test//StatelessSender!org.apache.activemq.javaee.example.server2.StatelessSenderService");
          </pre>
          
          <li>Calling the Stateless Bean</li>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java
 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java
index 9e8cbdf..c8df355 100644
--- 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java
+++ 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
-import org.apache.activemq6.javaee.example.server2.StatelessSenderService;
+import org.apache.activemq.javaee.example.server2.StatelessSenderService;
 
 import javax.jms.Connection;
 import javax.naming.Context;
@@ -39,7 +39,7 @@ public class MDBRemoteClientExample
          initialContext = new InitialContext(env);
 
          // Step 2. Lookup the EJB
-         StatelessSenderService sender = 
(StatelessSenderService)initialContext.lookup("ejb:/test//StatelessSender!org.apache.activemq6.javaee.example.server2.StatelessSenderService");
+         StatelessSenderService sender = 
(StatelessSenderService)initialContext.lookup("ejb:/test//StatelessSender!org.apache.activemq.javaee.example.server2.StatelessSenderService");
 
          //Step 3. Calling a Stateless Session Bean. You will have more steps 
on the SessionBean
          sender.sendHello("Hello there MDB!");

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java
 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java
index 9318acb..8f6c6b4 100644
--- 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java
+++ 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import javax.ejb.ActivationConfigProperty;
 import javax.ejb.MessageDriven;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java
 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java
index fe88859..54f201e 100644
--- 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java
+++ 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server2;
+package org.apache.activemq.javaee.example.server2;
 
 import org.jboss.ejb3.annotation.ResourceAdapter;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java
 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java
index 6161bfc..6741a71 100644
--- 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java
+++ 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server2;
+package org.apache.activemq.javaee.example.server2;
 
-import org.apache.activemq6.api.jms.HornetQJMSClient;
-import org.apache.activemq6.ra.HornetQRAConnectionFactoryImpl;
+import org.apache.activemq.api.jms.HornetQJMSClient;
+import org.apache.activemq.ra.HornetQRAConnectionFactoryImpl;
 
 import javax.annotation.Resource;
 import javax.ejb.Remote;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java
 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java
index e6bf2a5..aaaea75 100644
--- 
a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java
+++ 
b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java
@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.javaee.example.server2;
+package org.apache.activemq.javaee.example.server2;
 
 /**
  * A StatelessSenderService

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java
 
b/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java
index e3f4755..b476765 100644
--- 
a/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java
+++ 
b/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java
@@ -10,12 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
-import org.apache.activemq6.javaee.example.MDBRemoteClientExample;
-import org.apache.activemq6.javaee.example.server2.MDBQueueB;
-import org.apache.activemq6.javaee.example.server2.StatelessSender;
-import org.apache.activemq6.javaee.example.server2.StatelessSenderService;
+import org.apache.activemq.javaee.example.MDBRemoteClientExample;
+import org.apache.activemq.javaee.example.server2.MDBQueueB;
+import org.apache.activemq.javaee.example.server2.StatelessSender;
+import org.apache.activemq.javaee.example.server2.StatelessSenderService;
 import org.jboss.arquillian.container.test.api.ContainerController;
 import org.jboss.arquillian.container.test.api.Deployer;
 import org.jboss.arquillian.container.test.api.Deployment;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml 
b/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml
index 2d7fb16..c49e8cf 100644
--- 
a/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml
+++ 
b/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml
@@ -1,7 +1,7 @@
 <jboss-deployment-structure>
    <deployment>
       <dependencies>
-         <module name="org.apache.activemq6"/>
+         <module name="org.apache.activemq"/>
       </dependencies>
    </deployment>
 </jboss-deployment-structure>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-remote/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/pom.xml 
b/examples/javaee/jca-remote/pom.xml
index bf2ec91..9a59608 100644
--- a/examples/javaee/jca-remote/pom.xml
+++ b/examples/javaee/jca-remote/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-jca-remote-example</artifactId>
+   <artifactId>activemq-javaee-jca-remote-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE JCA Remote Example</name>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java
 
b/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java
index 41a9fde..29625e6 100644
--- 
a/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java
+++ 
b/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java
 
b/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java
index c065213..d208fc6 100644
--- 
a/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java
+++ 
b/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
-import org.apache.activemq6.api.jms.HornetQJMSClient;
+import org.apache.activemq.api.jms.HornetQJMSClient;
 import org.jboss.ejb3.annotation.ResourceAdapter;
 
 import javax.annotation.Resource;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java
 
b/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java
index 8692945..b4f6a04 100644
--- 
a/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java
+++ 
b/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java
@@ -11,10 +11,10 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.javaee.examples;
+package org.apache.activemq.javaee.examples;
 
-import org.apache.activemq6.javaee.example.MDBRemoteServerClientExample;
-import org.apache.activemq6.javaee.example.server.MDBQueue;
+import org.apache.activemq.javaee.example.MDBRemoteServerClientExample;
+import org.apache.activemq.javaee.example.server.MDBQueue;
 import org.jboss.arquillian.container.test.api.ContainerController;
 import org.jboss.arquillian.container.test.api.Deployer;
 import org.jboss.arquillian.container.test.api.Deployment;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml 
b/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml
index 2d7fb16..c49e8cf 100644
--- 
a/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml
+++ 
b/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml
@@ -1,7 +1,7 @@
 <jboss-deployment-structure>
    <deployment>
       <dependencies>
-         <module name="org.apache.activemq6"/>
+         <module name="org.apache.activemq"/>
       </dependencies>
    </deployment>
 </jboss-deployment-structure>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jms-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/pom.xml 
b/examples/javaee/jms-bridge/pom.xml
index 37c594e..4660eca 100644
--- a/examples/javaee/jms-bridge/pom.xml
+++ b/examples/javaee/jms-bridge/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-jms-bridge-example</artifactId>
+   <artifactId>activemq-jms-bridge-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 JMS Bridge Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java
 
b/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java
index ed2528b..11f7b58 100644
--- 
a/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java
+++ 
b/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java
 
b/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java
index 8cab2aa..be2f688 100644
--- 
a/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java
+++ 
b/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java
@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.javaee.examples;
+package org.apache.activemq.javaee.examples;
 
-import org.apache.activemq6.javaee.example.JMSBridgeExample;
+import org.apache.activemq.javaee.example.JMSBridgeExample;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jms-context-injection/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/pom.xml 
b/examples/javaee/jms-context-injection/pom.xml
index 7218b1c..29a2813 100644
--- a/examples/javaee/jms-context-injection/pom.xml
+++ b/examples/javaee/jms-context-injection/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-mdb-jms-context-example</artifactId>
+   <artifactId>activemq-javaee-mdb-jms-context-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB JMS Context Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java
 
b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java
index 89f0559..85efbea 100644
--- 
a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java
+++ 
b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java
 
b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java
index 06c24e9..ae2eaa1 100644
--- 
a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java
+++ 
b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import javax.annotation.Resource;
 import javax.ejb.ActivationConfigProperty;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java
 
b/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java
index 63b3920..0e9e029 100644
--- 
a/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java
+++ 
b/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java
@@ -11,10 +11,10 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.javaee.examples;
+package org.apache.activemq.javaee.examples;
 
-import org.apache.activemq6.javaee.example.JmsContextInjectionClientExample;
-import org.apache.activemq6.javaee.example.server.JmsContextInjectionExample;
+import org.apache.activemq.javaee.example.JmsContextInjectionClientExample;
+import org.apache.activemq.javaee.example.server.JmsContextInjectionExample;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-bmt/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/pom.xml b/examples/javaee/mdb-bmt/pom.xml
index c57f7e8..50af030 100644
--- a/examples/javaee/mdb-bmt/pom.xml
+++ b/examples/javaee/mdb-bmt/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-mdb-bmt-example</artifactId>
+   <artifactId>activemq-javaee-mdb-bmt-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java
 
b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java
index cd6c031..c90bb5e 100644
--- 
a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java
+++ 
b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java
 
b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java
index 188da63..fde91c5 100644
--- 
a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java
+++ 
b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import javax.annotation.Resource;
 import javax.ejb.ActivationConfigProperty;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java
 
b/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java
index 8948666..f51f484 100644
--- 
a/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java
+++ 
b/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
-import org.apache.activemq6.javaee.example.MDB_BMTClientExample;
+import org.apache.activemq.javaee.example.MDB_BMTClientExample;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml 
b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml
index 682227f..a884e5e 100644
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml
+++ b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   
<artifactId>activemq6-javaee-mdb-cmt-setrollbackonly-with-dlq-example</artifactId>
+   
<artifactId>activemq-javaee-mdb-cmt-setrollbackonly-with-dlq-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB CMT set rollback only with DLQ Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java
 
b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java
index f34cfdb..32641cb 100644
--- 
a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java
+++ 
b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java
 
b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java
index dfacdb9..d9588a7 100644
--- 
a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java
+++ 
b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import javax.annotation.Resource;
 import javax.ejb.ActivationConfigProperty;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java
 
b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java
index dbc10fe..67b2c13 100644
--- 
a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java
+++ 
b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
-import 
org.apache.activemq6.javaee.example.server.MDB_CMT_SetRollbackOnlyWithDLQExample;
+import 
org.apache.activemq.javaee.example.server.MDB_CMT_SetRollbackOnlyWithDLQExample;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-setrollbackonly/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/pom.xml 
b/examples/javaee/mdb-cmt-setrollbackonly/pom.xml
index 9afb60c..77bed01 100644
--- a/examples/javaee/mdb-cmt-setrollbackonly/pom.xml
+++ b/examples/javaee/mdb-cmt-setrollbackonly/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-mdb-cmt-setrollbackonly-example</artifactId>
+   <artifactId>activemq-javaee-mdb-cmt-setrollbackonly-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB CMT set rollback only Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java
 
b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java
index d53e2a1..1d3ca62 100644
--- 
a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java
+++ 
b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java
 
b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java
index bf2ea5c..9c114dd 100644
--- 
a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java
+++ 
b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import javax.annotation.Resource;
 import javax.ejb.ActivationConfigProperty;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java
 
b/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java
index 4ca348c..dfb9a50 100644
--- 
a/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java
+++ 
b/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
-import 
org.apache.activemq6.javaee.example.server.MDB_CMT_SetRollbackOnlyExample;
+import 
org.apache.activemq.javaee.example.server.MDB_CMT_SetRollbackOnlyExample;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-local/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/pom.xml 
b/examples/javaee/mdb-cmt-tx-local/pom.xml
index 13dfc43..00ed392 100644
--- a/examples/javaee/mdb-cmt-tx-local/pom.xml
+++ b/examples/javaee/mdb-cmt-tx-local/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-mdb-cmt-tx-local-example</artifactId>
+   <artifactId>activemq-javaee-mdb-cmt-tx-local-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB CMT Local Transaction Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java
 
b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java
index 8859f5d..4d841a5 100644
--- 
a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java
+++ 
b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java
 
b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java
index 8170c66..7c66c23 100644
--- 
a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java
+++ 
b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import javax.annotation.Resource;
 import javax.ejb.ActivationConfigProperty;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java
 
b/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java
index 5d918a0..10c4431 100644
--- 
a/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java
+++ 
b/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java
@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
-import org.apache.activemq6.javaee.example.server.MDB_CMT_TxLocalExample;
+import org.apache.activemq.javaee.example.server.MDB_CMT_TxLocalExample;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-not-supported/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/pom.xml 
b/examples/javaee/mdb-cmt-tx-not-supported/pom.xml
index 758977e..cc557fb 100644
--- a/examples/javaee/mdb-cmt-tx-not-supported/pom.xml
+++ b/examples/javaee/mdb-cmt-tx-not-supported/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-mdb-cmt-no-tx-example</artifactId>
+   <artifactId>activemq-javaee-mdb-cmt-no-tx-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB CMT Transaction Not Supported Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java
 
b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java
index 229dd69..96c0a80 100644
--- 
a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java
+++ 
b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java
 
b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java
index 91a1786..9d2d699 100644
--- 
a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java
+++ 
b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import javax.annotation.Resource;
 import javax.ejb.ActivationConfigProperty;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java
 
b/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java
index 0a96465..cd2c113 100644
--- 
a/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java
+++ 
b/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java
@@ -11,9 +11,9 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
-import org.apache.activemq6.javaee.example.server.MDB_CMT_TxNotSupported;
+import org.apache.activemq.javaee.example.server.MDB_CMT_TxNotSupported;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-required/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/pom.xml 
b/examples/javaee/mdb-cmt-tx-required/pom.xml
index e1f5739..0783bbb 100644
--- a/examples/javaee/mdb-cmt-tx-required/pom.xml
+++ b/examples/javaee/mdb-cmt-tx-required/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-mdb-cmt-tx-example</artifactId>
+   <artifactId>activemq-javaee-mdb-cmt-tx-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB CMT Transaction Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java
 
b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java
index fe2c8a3..1111e18 100644
--- 
a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java
+++ 
b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java
 
b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java
index 14f20eb..de944b9 100644
--- 
a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java
+++ 
b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import javax.ejb.ActivationConfigProperty;
 import javax.ejb.MessageDriven;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java
 
b/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java
index 7791e94..ae3ae65 100644
--- 
a/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java
+++ 
b/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java
@@ -11,10 +11,10 @@
  * permissions and limitations under the License.
  */
 
-package org.apache.activemq6.javaee.examples;
+package org.apache.activemq.javaee.examples;
 
-import org.apache.activemq6.javaee.example.MDB_CMT_TxRequiredClientExample;
-import org.apache.activemq6.javaee.example.server.MDB_CMT_TxRequiredExample;
+import org.apache.activemq.javaee.example.MDB_CMT_TxRequiredClientExample;
+import org.apache.activemq.javaee.example.server.MDB_CMT_TxRequiredExample;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-message-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/pom.xml 
b/examples/javaee/mdb-message-selector/pom.xml
index b731e8a..61268d2 100644
--- a/examples/javaee/mdb-message-selector/pom.xml
+++ b/examples/javaee/mdb-message-selector/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-mdb-message-selector-example</artifactId>
+   <artifactId>activemq-javaee-mdb-message-selector-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB Message Selector Example</name>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java
 
b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java
index afe480b..4cb3872 100644
--- 
a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java
+++ 
b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java
 
b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java
index fe6bf14..a2bc5c1 100644
--- 
a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java
+++ 
b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example.server;
+package org.apache.activemq.javaee.example.server;
 
 import org.jboss.ejb3.annotation.ResourceAdapter;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java
 
b/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java
index d64706e..7e54451 100644
--- 
a/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java
+++ 
b/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java
@@ -10,10 +10,10 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.examples;
+package org.apache.activemq.javaee.examples;
 
-import org.apache.activemq6.javaee.example.MDBMessageSelectorClientExample;
-import org.apache.activemq6.javaee.example.server.MDBMessageSelectorExample;
+import org.apache.activemq.javaee.example.MDBMessageSelectorClientExample;
+import org.apache.activemq.javaee.example.server.MDBMessageSelectorExample;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-remote-failover-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/pom.xml 
b/examples/javaee/mdb-remote-failover-static/pom.xml
index 2ee3fa1..c370437 100644
--- a/examples/javaee/mdb-remote-failover-static/pom.xml
+++ b/examples/javaee/mdb-remote-failover-static/pom.xml
@@ -3,12 +3,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.example.javaee</groupId>
+      <groupId>org.apache.activemq.example.javaee</groupId>
       <artifactId>javaee-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-javaee-mdb-remote-failover-static-example</artifactId>
+   <artifactId>activemq-javaee-mdb-remote-failover-static-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Java EE MDB Remote Failover Static Example</name>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java
----------------------------------------------------------------------
diff --git 
a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java
 
b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java
index 02614d6..0e8bb77 100644
--- 
a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java
+++ 
b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java
@@ -10,9 +10,9 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.javaee.example;
+package org.apache.activemq.javaee.example;
 
-import org.apache.activemq6.javaee.example.server.ServerKiller;
+import org.apache.activemq.javaee.example.server.ServerKiller;
 
 import javax.jms.*;
 import javax.naming.Context;

Reply via email to