activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [18/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis rename
Date Tue, 28 Apr 2015 16:02:23 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/vertx-connector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/pom.xml b/examples/core/vertx-connector/pom.xml
index ece8b28..c764101 100644
--- a/examples/core/vertx-connector/pom.xml
+++ b/examples/core/vertx-connector/pom.xml
@@ -24,10 +24,10 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-vertx-example</artifactId>
+   <artifactId>artemis-vertx-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis Vert.x Example</name>
 
@@ -37,17 +37,17 @@ under the License.
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-server</artifactId>
+         <artifactId>artemis-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-core-client</artifactId>
+         <artifactId>artemis-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-commons</artifactId>
+         <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -86,7 +86,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
             <executions>
                <execution>
                   <id>start</id>
@@ -108,7 +108,7 @@ under the License.
                      <goal>runClient</goal>
                   </goals>
                   <configuration>
-                     <clientClass>org.apache.activemq.core.example.VertxConnectorExample</clientClass>
+                     <clientClass>org.apache.activemq.artemis.core.example.VertxConnectorExample</clientClass>
                   </configuration>
                </execution>
                <execution>
@@ -121,32 +121,32 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.core</groupId>
-                        <artifactId>activemq-vertx-example</artifactId>
+                        <artifactId>artemis-vertx-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-vertx-integration</artifactId>
+                        <artifactId>artemis-vertx-integration</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/vertx-connector/readme.html
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/readme.html b/examples/core/vertx-connector/readme.html
index 140d017..4f02416 100644
--- a/examples/core/vertx-connector/readme.html
+++ b/examples/core/vertx-connector/readme.html
@@ -28,21 +28,21 @@ under the License.
      <h1>Vert.x Connector Service Example</h1>
 
      <p>This example shows you how to configure ActiveMQ to use the Vert.x Connector Service.</p>
-     
+
      <p>ActiveMQ supports 2 types of Vert.x connector, incoming and outgoing.
      Incoming connector consumes from Vert.x event bus and forwards to a configurable address.
      Outgoing connector consumes from a configurable address and forwards to a configurable Vert.x event bus.
      </p>
-     
+
      <p>In this example, an incoming connector and an outgoing connector are configured. A simple java Verticle
      is deployed. The verticle registers a message handler on the outgoing connector's address ("outgoing.vertx.address").
-     A String message is sent to Vert.x event bus on the incoming connector's address("incoming.vertx.address"). 
-     The message then will be forwarded to a ActiveMQ queue by the incoming connector. The outgoing connector listens to 
+     A String message is sent to Vert.x event bus on the incoming connector's address("incoming.vertx.address").
+     The message then will be forwarded to a ActiveMQ queue by the incoming connector. The outgoing connector listens to
      the ActiveMQ queue and forwards the message from ActiveMQ to Vert.x event bus on the outgoing connector's address.
      The verticle finally receives the message from it's event bus.</p>
-     
+
      <p>For more information on Vert.x concept please visit the <a href="http://vertx.io/">Vertx site</a></p>
-     
+
      <h2>Example step-by-step</h2>
      <p><i>To run the server, simply type <code>mvn verify</code>
          from this directory.</p>
@@ -55,8 +55,8 @@ under the License.
 
         <li>We deploy a Verticle using the platformManager</li>
         <pre class="prettyprint">
-           <code>String verticle = "org.apache.activemq.core.example.ExampleVerticle";
-           platformManager.deployVerticle(verticle, null, new URL[0], 1, null, 
+           <code>String verticle = "org.apache.activemq.artemis.core.example.ExampleVerticle";
+           platformManager.deployVerticle(verticle, null, new URL[0], 1, null,
                   new Handler<AsyncResult<String>>(){
 
                      @Override
@@ -68,14 +68,14 @@ under the License.
                         }
                         latch0.countDown();
                      }
-            
+
            });</code>
         </pre>
 
         <li>We register a message handler with the event bus in the Verticle to listen on the outgoing connector's address.</li>
         <pre class="prettyprint">
            <code>EventBus eventBus = vertx.eventBus();
-           eventBus.registerHandler(VertxConnectorExample.OUTGOING, 
+           eventBus.registerHandler(VertxConnectorExample.OUTGOING,
                       new Handler<Message<?>>() {
                          @Override
                          public void handle(Message<?> startMsg)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java b/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
index f9723c6..80f4890 100644
--- a/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
+++ b/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/ExampleVerticle.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -34,7 +34,7 @@ public class ExampleVerticle extends Verticle
       final CountDownLatch latch0 = new CountDownLatch(1);
 
       // Register a handler on the outgoing connector's address
-      eventBus.registerHandler(VertxConnectorExample.OUTGOING, 
+      eventBus.registerHandler(VertxConnectorExample.OUTGOING,
                new Handler<Message<?>>() {
                   @Override
                   public void handle(Message<?> startMsg)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java b/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
index dceca41..fabcbce 100644
--- a/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
+++ b/examples/core/vertx-connector/src/main/java/org/apache/activemq/artemis/core/example/VertxConnectorExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.core.example;
+package org.apache.activemq.artemis.core.example;
 
 import java.net.URL;
 import java.util.concurrent.CountDownLatch;
@@ -57,7 +57,7 @@ public class VertxConnectorExample
          final CountDownLatch latch0 = new CountDownLatch(1);
 
          // Step 2 Deploy a Verticle to receive message
-         String verticle = "org.apache.activemq.core.example.ExampleVerticle";
+         String verticle = "org.apache.activemq.artemis.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/8f52a622/examples/jms/aerogear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml
index 93e6374..c27902e 100644
--- a/examples/jms/aerogear/pom.xml
+++ b/examples/jms/aerogear/pom.xml
@@ -24,7 +24,7 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
    <properties>
@@ -33,14 +33,14 @@ under the License.
       <mastersecret />
    </properties>
 
-   <artifactId>activemq-jms-aerogear-example</artifactId>
+   <artifactId>artemis-jms-aerogear-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS AeroGear Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -56,7 +56,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start</id>
@@ -106,32 +106,32 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-aerogear-example</artifactId>
+                        <artifactId>artemis-jms-aerogear-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-aerogear-integration</artifactId>
+                        <artifactId>artemis-aerogear-integration</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java b/examples/jms/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
index d7cd36a..271cd73 100644
--- a/examples/jms/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
+++ b/examples/jms/aerogear/src/main/java/org/apache/activemq/artemis/jms/example/AerogearExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/aerogear/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/jndi.properties b/examples/jms/aerogear/src/main/resources/jndi.properties
index 1cb3686..4836ac8 100644
--- a/examples/jms/aerogear/src/main/resources/jndi.properties
+++ b/examples/jms/aerogear/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/application-layer-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml
index 205fe6d..e91a9e0 100644
--- a/examples/jms/application-layer-failover/pom.xml
+++ b/examples/jms/application-layer-failover/pom.xml
@@ -24,17 +24,17 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-application-layer-failover-example</artifactId>
+   <artifactId>artemis-jms-application-layer-failover-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Application Layer Failover Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -50,7 +50,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start0</id>
@@ -113,27 +113,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-application-layer-failover-example</artifactId>
+                        <artifactId>artemis-jms-application-layer-failover-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
index 345764f..78120ad 100644
--- a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
+++ b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.lang.Object;
 import java.lang.String;
@@ -33,7 +33,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates application-layer failover of the JMS connection from one node to another

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/artemis-jms-examples-common/config/logging.properties
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-jms-examples-common/config/logging.properties b/examples/jms/artemis-jms-examples-common/config/logging.properties
index 5f95c08..3c6f629 100644
--- a/examples/jms/artemis-jms-examples-common/config/logging.properties
+++ b/examples/jms/artemis-jms-examples-common/config/logging.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,9 +34,9 @@
 # show messages at the INFO and above levels.
 handlers=java.util.logging.ConsoleHandler
 #handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
-java.util.logging.ConsoleHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter
+java.util.logging.ConsoleHandler.formatter=org.apache.activemq.artemis.integration.logging.ActiveMQLoggerFormatter
 java.util.logging.FileHandler.level=INFO
-java.util.logging.FileHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter
+java.util.logging.FileHandler.formatter=org.apache.activemq.artemis.integration.logging.ActiveMQLoggerFormatter
 java.util.logging.FileHandler.pattern=logs/activemq.log
 # Default global logging level.
 # This specifies which kinds of events are logged across

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/artemis-jms-examples-common/config/server.properties
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-jms-examples-common/config/server.properties b/examples/jms/artemis-jms-examples-common/config/server.properties
index 7fe0d76..8d6cc7a 100644
--- a/examples/jms/artemis-jms-examples-common/config/server.properties
+++ b/examples/jms/artemis-jms-examples-common/config/server.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=ActiveMQInitialContextFactory

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/artemis-jms-examples-common/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-jms-examples-common/pom.xml b/examples/jms/artemis-jms-examples-common/pom.xml
index f5fb293..6849536 100644
--- a/examples/jms/artemis-jms-examples-common/pom.xml
+++ b/examples/jms/artemis-jms-examples-common/pom.xml
@@ -24,10 +24,10 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-examples-common</artifactId>
+   <artifactId>artemis-jms-examples-common</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis Examples common</name>
 
@@ -38,17 +38,17 @@ under the License.
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-commons</artifactId>
+         <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-core-client</artifactId>
+         <artifactId>artemis-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-jms-client</artifactId>
+         <artifactId>artemis-jms-client</artifactId>
          <version>${project.version}</version>
       </dependency>
    </dependencies>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java b/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
index c94be4e..d47e996 100644
--- a/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
+++ b/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/ActiveMQExample.java
@@ -14,24 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.common.example;
+package org.apache.activemq.artemis.common.example;
+
 import java.io.File;
 import java.util.HashMap;
-import java.util.Properties;
 import java.util.logging.Logger;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
-import javax.naming.InitialContext;
-
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.api.jms.JMSFactoryType;
-import org.apache.activemq.core.client.impl.DelegatingSession;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.jms.client.ActiveMQConnection;
-import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
+
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.DelegatingSession;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 
 /**
  * Base class for ActiveMQ examples.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/DummyXid.java
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/DummyXid.java b/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/DummyXid.java
index 6625227..ede6dc5 100644
--- a/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/DummyXid.java
+++ b/examples/jms/artemis-jms-examples-common/src/main/java/org/apache/activemq/artemis/common/example/DummyXid.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.common.example;
+package org.apache.activemq.artemis.common.example;
 
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.utils.Base64;
+import org.apache.activemq.artemis.utils.Base64;
 
 public class DummyXid implements Xid
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/artemis-ra-rar/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-ra-rar/pom.xml b/examples/jms/artemis-ra-rar/pom.xml
index bdc4117..e77739c 100644
--- a/examples/jms/artemis-ra-rar/pom.xml
+++ b/examples/jms/artemis-ra-rar/pom.xml
@@ -24,26 +24,26 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-rar</artifactId>
+   <artifactId>artemis-rar</artifactId>
    <packaging>rar</packaging>
    <name>ActiveMQ Artemis JMS RA</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-jms-client</artifactId>
+         <artifactId>artemis-jms-client</artifactId>
          <version>${project.version}</version>
          <exclusions>
             <exclusion>
                <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-core-client</artifactId>
+               <artifactId>artemis-core-client</artifactId>
             </exclusion>
             <exclusion>
                <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-jms-client</artifactId>
+               <artifactId>artemis-jms-client</artifactId>
             </exclusion>
             <exclusion>
               <groupId>org.apache.geronimo.specs</groupId>
@@ -57,22 +57,22 @@ under the License.
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-ra</artifactId>
+         <artifactId>artemis-ra</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-jms-server</artifactId>
+         <artifactId>artemis-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-core-client</artifactId>
+         <artifactId>artemis-core-client</artifactId>
          <version>${project.version}</version>
          <exclusions>
             <exclusion>
                <groupId>org.apache.activemq</groupId>
-               <artifactId>activemq-core-client</artifactId>
+               <artifactId>artemis-core-client</artifactId>
             </exclusion>
          </exclusions>
       </dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-ra-rar/src/main/resources/ra.xml b/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
index c21311c..75b14b1 100644
--- a/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
+++ b/examples/jms/artemis-ra-rar/src/main/resources/ra.xml
@@ -36,15 +36,15 @@
    </license>
 
    <resourceadapter>
-      <resourceadapter-class>org.apache.activemq6.ra.ActiveMQResourceAdapter</resourceadapter-class>
+      <resourceadapter-class>org.apache.activemq.artemis.ra.ActiveMQResourceAdapter</resourceadapter-class>
       <config-property>
          <description>
             The transport type. Multiple connectors can be configured by using a comma separated list,
-            i.e. org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory.
+            i.e. org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory.
          </description>
          <config-property-name>ConnectorClassName</config-property-name>
          <config-property-type>java.lang.String</config-property-type>
-         <config-property-value>org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory</config-property-value>
+         <config-property-value>org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory</config-property-value>
       </config-property>
       <config-property>
          <description>The transport configuration. These values must be in the form of key=val;key=val;,
@@ -219,7 +219,7 @@
         <config-property-value></config-property-value>
       </config-property>
       <config-property>
-        <description>The max connections</description>        
+        <description>The max connections</description>
         <config-property-type>java.lang.Integer</config-property-type>
         <config-property-value></config-property-value>
       </config-property>
@@ -257,12 +257,12 @@
         <description>The class definition (full qualified name and its properties) used to encrypt the password</description>
         <config-property-name>PasswordCodec</config-property-name>
         <config-property-type>java.lang.String</config-property-type>
-        <config-property-value>org.apache.activemq6.utils.DefaultSensitiveStringCodec;key=clusterpassword;algorithm=something</config-property-value>
+        <config-property-value>org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec;key=clusterpassword;algorithm=something</config-property-value>
       </config-property>-->
 
       <outbound-resourceadapter>
          <connection-definition>
-            <managedconnectionfactory-class>org.apache.activemq6.ra.ActiveMQRAManagedConnectionFactory</managedconnectionfactory-class>
+            <managedconnectionfactory-class>org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory</managedconnectionfactory-class>
 
             <config-property>
                <description>The default session type</description>
@@ -277,10 +277,10 @@
                <config-property-value>0</config-property-value>
             </config-property>
 
-            <connectionfactory-interface>org.apache.activemq6.ra.ActiveMQRAConnectionFactory</connectionfactory-interface>
-            <connectionfactory-impl-class>org.apache.activemq6.ra.ActiveMQRAConnectionFactoryImpl</connectionfactory-impl-class>
+            <connectionfactory-interface>org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactory</connectionfactory-interface>
+            <connectionfactory-impl-class>org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactoryImpl</connectionfactory-impl-class>
             <connection-interface>javax.jms.Session</connection-interface>
-            <connection-impl-class>org.apache.activemq6.ra.ActiveMQRASession</connection-impl-class>
+            <connection-impl-class>org.apache.activemq.artemis.ra.ActiveMQRASession</connection-impl-class>
          </connection-definition>
          <transaction-support>XATransaction</transaction-support>
          <authentication-mechanism>
@@ -295,7 +295,7 @@
             <messagelistener>
                <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
                <activationspec>
-                  <activationspec-class>org.apache.activemq6.ra.inflow.ActiveMQActivationSpec</activationspec-class>
+                  <activationspec-class>org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec</activationspec-class>
                   <required-config-property>
                       <config-property-name>destination</config-property-name>
                   </required-config-property>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index bb64704..9e5bf12 100644
--- a/examples/jms/bridge/pom.xml
+++ b/examples/jms/bridge/pom.xml
@@ -24,22 +24,22 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-bridge-example</artifactId>
+   <artifactId>artemis-jms-bridge-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Bridge Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-server</artifactId>
+         <artifactId>artemis-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -55,7 +55,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start0</id>
@@ -117,27 +117,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-bridge-example</artifactId>
+                        <artifactId>artemis-jms-bridge-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
index ce51d55..2eccf54 100644
--- a/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
+++ b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates a core bridge set-up between two nodes, consuming messages from a queue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/HatColourChangeTransformer.java
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/HatColourChangeTransformer.java b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/HatColourChangeTransformer.java
index e9dac55..a77d2e3 100644
--- a/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/HatColourChangeTransformer.java
+++ b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/HatColourChangeTransformer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.ServerMessage;
-import org.apache.activemq.core.server.cluster.Transformer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.cluster.Transformer;
 
 public class HatColourChangeTransformer implements Transformer
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/browser/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index d6cbb7f..8a5b8af 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -24,17 +24,17 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-browser-example</artifactId>
+   <artifactId>artemis-jms-browser-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Browser Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -50,7 +50,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start</id>
@@ -80,27 +80,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-browser-example</artifactId>
+                        <artifactId>artemis-jms-browser-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/browser/src/main/java/org/apache/activemq/artemis/jms/example/QueueBrowserExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/java/org/apache/activemq/artemis/jms/example/QueueBrowserExample.java b/examples/jms/browser/src/main/java/org/apache/activemq/artemis/jms/example/QueueBrowserExample.java
index 98405c9..8c24e49 100644
--- a/examples/jms/browser/src/main/java/org/apache/activemq/artemis/jms/example/QueueBrowserExample.java
+++ b/examples/jms/browser/src/main/java/org/apache/activemq/artemis/jms/example/QueueBrowserExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Enumeration;
 
@@ -28,7 +28,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example which shows how to use a QueueBrowser to look at messages of a queue without removing them from the queue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/browser/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/jndi.properties b/examples/jms/browser/src/main/resources/jndi.properties
index 1cb3686..4836ac8 100644
--- a/examples/jms/browser/src/main/resources/jndi.properties
+++ b/examples/jms/browser/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-kickoff/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index ac5f24c..1aca709 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -24,22 +24,22 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-client-kickoff-example</artifactId>
+   <artifactId>artemis-jms-client-kickoff-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Kick Off Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-core-client</artifactId>
+         <artifactId>artemis-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -55,7 +55,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start</id>
@@ -111,27 +111,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-client-kickoff-example</artifactId>
+                        <artifactId>artemis-jms-client-kickoff-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
index 014a7d4..ddeed59 100644
--- a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
+++ b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/artemis/jms/example/ClientKickoffExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicReference;
@@ -31,9 +31,9 @@ import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * An example that shows how to kick off a client connected to ActiveMQ by using JMX.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-kickoff/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/jndi.properties b/examples/jms/client-kickoff/src/main/resources/jndi.properties
index 40ed640..ed96c02 100644
--- a/examples/jms/client-kickoff/src/main/resources/jndi.properties
+++ b/examples/jms/client-kickoff/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-side-failoverlistener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index 14ae7ed..f7a86f8 100644
--- a/examples/jms/client-side-failoverlistener/pom.xml
+++ b/examples/jms/client-side-failoverlistener/pom.xml
@@ -24,17 +24,17 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-client-side-fileoverlistener-example</artifactId>
+   <artifactId>artemis-jms-client-side-fileoverlistener-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Client Side Failover listener Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -50,7 +50,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start0</id>
@@ -129,27 +129,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-client-side-fileoverlistener-example</artifactId>
+                        <artifactId>artemis-jms-client-side-fileoverlistener-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
index 2e7eb3b..a6cfc71 100644
--- a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
+++ b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideFailoverListerExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -25,10 +25,10 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.client.FailoverEventListener;
-import org.apache.activemq.api.core.client.FailoverEventType;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
+import org.apache.activemq.artemis.api.core.client.FailoverEventType;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
 
 /**
  * This example demonstrates how you can listen on failover event on the client side

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
index 0dac60e..07c84f2 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-side-load-balancing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index f2cdb3d..4e4206e 100644
--- a/examples/jms/client-side-load-balancing/pom.xml
+++ b/examples/jms/client-side-load-balancing/pom.xml
@@ -24,17 +24,17 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-client-side-load-balancing-example</artifactId>
+   <artifactId>artemis-jms-client-side-load-balancing-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Client Side Load Balancing Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -50,7 +50,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start0</id>
@@ -149,27 +149,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-client-side-load-balancing-example</artifactId>
+                        <artifactId>artemis-jms-client-side-load-balancing-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideLoadBalancingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideLoadBalancingExample.java b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideLoadBalancingExample.java
index 98eea5e..4ee5b95 100644
--- a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideLoadBalancingExample.java
+++ b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/artemis/jms/example/ClientSideLoadBalancingExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -26,7 +26,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * This example demonstrates how sessions created from a single connection can be load
@@ -77,9 +77,9 @@ public class ClientSideLoadBalancingExample extends ActiveMQExample
          Session sessionB = connectionB.createSession(false, Session.AUTO_ACKNOWLEDGE);
          Session sessionC = connectionC.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-         System.out.println("Session A - " + ((org.apache.activemq.core.client.impl.DelegatingSession) ((org.apache.activemq.jms.client.ActiveMQSession) sessionA).getCoreSession()).getConnection().getRemoteAddress() );
-         System.out.println("Session B - " + ((org.apache.activemq.core.client.impl.DelegatingSession) ((org.apache.activemq.jms.client.ActiveMQSession) sessionB).getCoreSession()).getConnection().getRemoteAddress() );
-         System.out.println("Session C - " + ((org.apache.activemq.core.client.impl.DelegatingSession) ((org.apache.activemq.jms.client.ActiveMQSession) sessionC).getCoreSession()).getConnection().getRemoteAddress() );
+         System.out.println("Session A - " + ((org.apache.activemq.artemis.core.client.impl.DelegatingSession) ((org.apache.activemq.artemis.jms.client.ActiveMQSession) sessionA).getCoreSession()).getConnection().getRemoteAddress() );
+         System.out.println("Session B - " + ((org.apache.activemq.artemis.core.client.impl.DelegatingSession) ((org.apache.activemq.artemis.jms.client.ActiveMQSession) sessionB).getCoreSession()).getConnection().getRemoteAddress() );
+         System.out.println("Session C - " + ((org.apache.activemq.artemis.core.client.impl.DelegatingSession) ((org.apache.activemq.artemis.jms.client.ActiveMQSession) sessionC).getCoreSession()).getConnection().getRemoteAddress() );
 
          // Step 6. We create JMS MessageProducer objects on the sessions
          MessageProducer producerA = sessionA.createProducer(queue);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties b/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
index 81cf898..0aa403a 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
+++ b/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=udp://231.7.7.7:9876
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index 1519599..b169bf5 100644
--- a/examples/jms/clustered-durable-subscription/pom.xml
+++ b/examples/jms/clustered-durable-subscription/pom.xml
@@ -24,17 +24,17 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-clustered-durable-subscription-example</artifactId>
+   <artifactId>artemis-jms-clustered-durable-subscription-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Clustered Durable Subscription Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -50,7 +50,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start0</id>
@@ -124,27 +124,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-clustered-durable-subscription-example</artifactId>
+                        <artifactId>artemis-jms-clustered-durable-subscription-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
index 5f2b9ed..cecf3ac 100644
--- a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
+++ b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that shows a JMS Durable Subscription across two nodes of a cluster.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-grouping/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index 03bb0c7..c772822 100644
--- a/examples/jms/clustered-grouping/pom.xml
+++ b/examples/jms/clustered-grouping/pom.xml
@@ -24,17 +24,17 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq-jms-clustered-grouping-example</artifactId>
+   <artifactId>artemis-jms-clustered-grouping-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS CLustered Grouping Example</name>
 
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -50,7 +50,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start0</id>
@@ -162,27 +162,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-clustered-grouping-example</artifactId>
+                        <artifactId>artemis-jms-clustered-grouping-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
index 5e7bccd..c5cd790 100644
--- a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
+++ b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates server side load-balancing of messages between the queue instances on different

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml
index 37c2085..494211f 100644
--- a/examples/jms/clustered-jgroups/pom.xml
+++ b/examples/jms/clustered-jgroups/pom.xml
@@ -24,7 +24,7 @@ under the License.
    <parent>
       <groupId>org.apache.activemq.examples.jms</groupId>
       <artifactId>jms-examples</artifactId>
-      <version>10.0.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
    </parent>
 
    <artifactId>clustered-jgroups</artifactId>
@@ -34,7 +34,7 @@ under the License.
    <dependencies>
       <dependency>
          <groupId>org.apache.activemq.examples.jms</groupId>
-         <artifactId>activemq-jms-examples-common</artifactId>
+         <artifactId>artemis-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -50,7 +50,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start0</id>
@@ -127,22 +127,22 @@ under the License.
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core-client</artifactId>
+                        <artifactId>artemis-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-server</artifactId>
+                        <artifactId>artemis-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-client</artifactId>
+                        <artifactId>artemis-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
                         <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-jms-server</artifactId>
+                        <artifactId>artemis-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
index 226c7f2..29892b9 100644
--- a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
+++ b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.jms.example;
+package org.apache.activemq.artemis.jms.example;
 
 import java.util.Hashtable;
 
@@ -27,7 +27,7 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple example that demonstrates clustering using jgroups.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
index 40ed640..ed96c02 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
index e305f48..b95f5a1 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial=ActiveMQInitialContextFactory
 java.naming.provider.url=tcp://localhost:61617


Mime
View raw message