activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [17/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis rename
Date Tue, 28 Apr 2015 16:02:22 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml
index c019020..e009c1c 100644
--- a/examples/jms/clustered-queue/pom.xml
+++ b/examples/jms/clustered-queue/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-queue</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>
@@ -123,22 +123,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-queue/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueExample.java b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueExample.java
index 9e4c021..9781771 100644
--- a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueExample.java
+++ b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueExample.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-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml
index 27e1f6b..cf7b1bc 100644
--- a/examples/jms/clustered-standalone/pom.xml
+++ b/examples/jms/clustered-standalone/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-standalone-example</artifactId>
+   <artifactId>artemis-jms-clustered-standalone-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Clustered Standalone 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>
@@ -150,27 +150,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-clustered-standalone-example</artifactId>
+                        <artifactId>artemis-jms-clustered-standalone-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-standalone/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredStandaloneExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredStandaloneExample.java b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredStandaloneExample.java
index 6ca3f8b..fac5ba6 100644
--- a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredStandaloneExample.java
+++ b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredStandaloneExample.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;
 
 public class ClusteredStandaloneExample extends ActiveMQExample
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/clustered-static-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml
index 201026f..2b51c7e 100644
--- a/examples/jms/clustered-static-discovery/pom.xml
+++ b/examples/jms/clustered-static-discovery/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-static-discovery-example</artifactId>
+   <artifactId>artemis-jms-clustered-static-discovery-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Clustered Static Discovery 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>
@@ -152,27 +152,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-clustered-static-discovery-example</artifactId>
+                        <artifactId>artemis-jms-clustered-static-discovery-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-static-discovery/src/main/java/org/apache/activemq/artemis/jms/example/StaticClusteredQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/artemis/jms/example/StaticClusteredQueueExample.java b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/artemis/jms/example/StaticClusteredQueueExample.java
index 9e2d5f3..abc26c2 100644
--- a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/artemis/jms/example/StaticClusteredQueueExample.java
+++ b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/artemis/jms/example/StaticClusteredQueueExample.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-static-oneway/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml
index 8fe3705..7f5e67c 100644
--- a/examples/jms/clustered-static-oneway/pom.xml
+++ b/examples/jms/clustered-static-oneway/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-static-oneway-example</artifactId>
+   <artifactId>artemis-jms-clustered-static-oneway-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Clustered Static One Way 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>
@@ -132,27 +132,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-clustered-static-oneway-example</artifactId>
+                        <artifactId>artemis-jms-clustered-static-oneway-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-static-oneway/src/main/java/org/apache/activemq/artemis/jms/example/ClusterStaticOnewayExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/artemis/jms/example/ClusterStaticOnewayExample.java b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/artemis/jms/example/ClusterStaticOnewayExample.java
index 8d2af35..1bfe858 100644
--- a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/artemis/jms/example/ClusterStaticOnewayExample.java
+++ b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/artemis/jms/example/ClusterStaticOnewayExample.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-topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index 04da050..dc03320 100644
--- a/examples/jms/clustered-topic/pom.xml
+++ b/examples/jms/clustered-topic/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-topic-example</artifactId>
+   <artifactId>artemis-jms-clustered-topic-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Clustered Topic 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>
@@ -132,27 +132,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-clustered-topic-example</artifactId>
+                        <artifactId>artemis-jms-clustered-topic-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-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
index 6ad2e86..4378954 100644
--- a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
+++ b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.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 Topic clustered across two nodes of a cluster.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/colocated-failover-scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/pom.xml b/examples/jms/colocated-failover-scale-down/pom.xml
index c953a93..e6f0d71 100644
--- a/examples/jms/colocated-failover-scale-down/pom.xml
+++ b/examples/jms/colocated-failover-scale-down/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>colocated-failover-scale-down</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>
@@ -129,22 +129,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/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
index af381fb..b4b8ce6 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
+++ b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.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/colocated-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml
index 33a2b80..a50b09a 100644
--- a/examples/jms/colocated-failover/pom.xml
+++ b/examples/jms/colocated-failover/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>colocated-failover</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>
@@ -129,22 +129,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/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
index 4c6a9a9..163faec 100644
--- a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
+++ b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.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 a colocated server

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/consumer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml
index c23c0ce..1e4236f 100644
--- a/examples/jms/consumer-rate-limit/pom.xml
+++ b/examples/jms/consumer-rate-limit/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-consumer-rate-limit-example</artifactId>
+   <artifactId>artemis-jms-consumer-rate-limit-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Consumer Rate Limit 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>
@@ -88,27 +88,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-consumer-rate-limit-example</artifactId>
+                        <artifactId>artemis-jms-consumer-rate-limit-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/consumer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ConsumerRateLimitExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ConsumerRateLimitExample.java b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ConsumerRateLimitExample.java
index a4abd9f..8c5f937 100644
--- a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ConsumerRateLimitExample.java
+++ b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/artemis/jms/example/ConsumerRateLimitExample.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,7 +25,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 a message consumer can be limited to consumer messages at a maximum rate

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties b/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
index e3393f8..c7c59be 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
+++ b/examples/jms/consumer-rate-limit/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?consumerMaxRate=10
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/dead-letter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml
index eec006d..0f50f2d 100644
--- a/examples/jms/dead-letter/pom.xml
+++ b/examples/jms/dead-letter/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-dead-letter-example</artifactId>
+   <artifactId>artemis-jms-dead-letter-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Dead Letter 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>
@@ -88,27 +88,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-dead-letter-example</artifactId>
+                        <artifactId>artemis-jms-dead-letter-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/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java b/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
index d4f6f71..30d8f60 100644
--- a/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.java
+++ b/examples/jms/dead-letter/src/main/java/org/apache/activemq/artemis/jms/example/DeadLetterExample.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,7 +25,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;
 
 /**
  * An example showing how messages are moved to dead letter destination when they are unsuccessfully delivered multiple times

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/dead-letter/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/jndi.properties b/examples/jms/dead-letter/src/main/resources/jndi.properties
index 9049249..ea5cd82 100644
--- a/examples/jms/dead-letter/src/main/resources/jndi.properties
+++ b/examples/jms/dead-letter/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,7 +15,7 @@
 # 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
 queue.queue/deadLetterQueue=deadLetterQueue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/delayed-redelivery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index f148374..5e8732e 100644
--- a/examples/jms/delayed-redelivery/pom.xml
+++ b/examples/jms/delayed-redelivery/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-delayed-redelivery-example</artifactId>
+   <artifactId>artemis-jms-delayed-redelivery-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Delayed Redelivery 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-delayed-redelivery-example</artifactId>
+                        <artifactId>artemis-jms-delayed-redelivery-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/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
index 3651232..2aa4a62 100644
--- a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.java
+++ b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/artemis/jms/example/DelayedRedeliveryExample.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,7 +25,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 ActiveMQ can be configured with a redelivery delay in the event a message

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties b/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
index 1cb3686..4836ac8 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
+++ b/examples/jms/delayed-redelivery/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/divert/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index 726ab81..9037f0c 100644
--- a/examples/jms/divert/pom.xml
+++ b/examples/jms/divert/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-divert-example</artifactId>
+   <artifactId>artemis-jms-divert-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Divert 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-divert-example</artifactId>
+                        <artifactId>artemis-jms-divert-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/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
index 1e334f1..e0c15a9 100644
--- a/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
+++ b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.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 AddForwardingTimeTransformer implements Transformer
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
index 8347bb4..bfc3e2b 100644
--- a/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.java
+++ b/examples/jms/divert/src/main/java/org/apache/activemq/artemis/jms/example/DivertExample.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;
 
@@ -29,7 +29,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;
 
 /**
  * This examples demonstrates the use of ActiveMQ "Diverts" to transparently divert or copy messages

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml
index cfeb5f9..d4b4d40 100644
--- a/examples/jms/durable-subscription/pom.xml
+++ b/examples/jms/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-durable-subscription-example</artifactId>
+   <artifactId>artemis-jms-durable-subscription-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS 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>start</id>
@@ -88,27 +88,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-durable-subscription-example</artifactId>
+                        <artifactId>artemis-jms-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/durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/DurableSubscriptionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/DurableSubscriptionExample.java b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/DurableSubscriptionExample.java
index 9274258..7f5cc1b 100644
--- a/examples/jms/durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/DurableSubscriptionExample.java
+++ b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/DurableSubscriptionExample.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,7 +25,7 @@ import javax.jms.Topic;
 import javax.jms.TopicSubscriber;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
 
 /**
  * A simple JMS example that shows how to use a durable subscription.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/durable-subscription/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/jndi.properties b/examples/jms/durable-subscription/src/main/resources/jndi.properties
index 09611dc..560b0cb 100644
--- a/examples/jms/durable-subscription/src/main/resources/jndi.properties
+++ b/examples/jms/durable-subscription/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
 topic.topic/exampleTopic=exampleTopic

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/embedded-simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/pom.xml b/examples/jms/embedded-simple/pom.xml
index 4a02908..415b4cc 100644
--- a/examples/jms/embedded-simple/pom.xml
+++ b/examples/jms/embedded-simple/pom.xml
@@ -24,27 +24,27 @@ 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-embedded-simple-example</artifactId>
+   <artifactId>artemis-jms-embedded-simple-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Simple Embedded 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>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-jms-server</artifactId>
+         <artifactId>artemis-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -60,7 +60,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>runClient</id>
@@ -85,27 +85,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-embedded-simple-example</artifactId>
+                        <artifactId>artemis-jms-embedded-simple-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/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
index 838c3fd..98fc8b2 100644
--- a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.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.ArrayList;
 import java.util.Date;
@@ -28,12 +28,12 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.core.config.impl.SecurityConfiguration;
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
-import org.apache.activemq.jms.server.JMSServerManager;
-import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
-import org.apache.activemq.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.jms.server.JMSServerManager;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
+import org.apache.activemq.artemis.api.jms.JMSFactoryType;
 
 /**
  * This example demonstrates how to run a ActiveMQ embedded with JMS

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/embedded/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml
index 78ac744..28dd040 100644
--- a/examples/jms/embedded/pom.xml
+++ b/examples/jms/embedded/pom.xml
@@ -24,27 +24,27 @@ 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-embedded-example</artifactId>
+   <artifactId>artemis-jms-embedded-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Embedded 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>
          <groupId>org.apache.activemq</groupId>
-         <artifactId>activemq-jms-server</artifactId>
+         <artifactId>artemis-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -60,7 +60,7 @@ under the License.
             <plugins>
                <plugin>
                   <groupId>org.apache.activemq</groupId>
-                  <artifactId>activemq-maven-plugin</artifactId>
+                  <artifactId>artemis-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>runClient</id>
@@ -89,27 +89,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-embedded-example</artifactId>
+                        <artifactId>artemis-jms-embedded-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/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
index a2776d9..35cfe5c 100644
--- a/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded/src/main/java/org/apache/activemq/artemis/jms/example/EmbeddedExample.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.ArrayList;
 import java.util.Date;
@@ -27,19 +27,19 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.common.example.ActiveMQExample;
-import org.apache.activemq.core.config.Configuration;
-import org.apache.activemq.core.config.impl.ConfigurationImpl;
-import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.jms.server.config.JMSConfiguration;
-import org.apache.activemq.jms.server.config.JMSQueueConfiguration;
-import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
+import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
+import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
+import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
+import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 
 /**
  * This example demonstrates how to run a ActiveMQ embedded with JMS

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/expiry/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index e83fec6..f5713c0 100644
--- a/examples/jms/expiry/pom.xml
+++ b/examples/jms/expiry/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-expiry-example</artifactId>
+   <artifactId>artemis-jms-expiry-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Expiry 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>
@@ -88,27 +88,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-expiry-example</artifactId>
+                        <artifactId>artemis-jms-expiry-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/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java b/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
index 56f8def..743efec 100644
--- a/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.java
+++ b/examples/jms/expiry/src/main/java/org/apache/activemq/artemis/jms/example/ExpiryExample.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,7 +25,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;
 
 /**
  * An example showing how messages are moved to an expiry queue when they expire.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/expiry/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/jndi.properties b/examples/jms/expiry/src/main/resources/jndi.properties
index 91e4c81..00a4ce5 100644
--- a/examples/jms/expiry/src/main/resources/jndi.properties
+++ b/examples/jms/expiry/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,7 +15,7 @@
 # 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
 queue.queue/expiryQueue=expiryQueue

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/ha-policy-autobackup/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/pom.xml b/examples/jms/ha-policy-autobackup/pom.xml
index 967207c..b750ad2 100644
--- a/examples/jms/ha-policy-autobackup/pom.xml
+++ b/examples/jms/ha-policy-autobackup/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>ha-policy-autobackup</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>
@@ -129,22 +129,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/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
index 86b6f98..a2b43a2 100644
--- a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.java
+++ b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/artemis/jms/example/HAPolicyAutoBackupExample.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,12 +27,12 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.apache.activemq.api.core.TransportConfiguration;
-import org.apache.activemq.api.core.client.ClusterTopologyListener;
-import org.apache.activemq.api.core.client.TopologyMember;
-import org.apache.activemq.common.example.ActiveMQExample;
-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.ClusterTopologyListener;
+import org.apache.activemq.artemis.api.core.client.TopologyMember;
+import org.apache.activemq.artemis.common.example.ActiveMQExample;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/examples/jms/http-transport/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index 1ac41d9..71e62e7 100644
--- a/examples/jms/http-transport/pom.xml
+++ b/examples/jms/http-transport/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-http-transport-example</artifactId>
+   <artifactId>artemis-jms-http-transport-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ Artemis JMS Http Transport 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>
@@ -88,27 +88,27 @@ under the License.
                   <dependencies>
                      <dependency>
                         <groupId>org.apache.activemq.examples.jms</groupId>
-                        <artifactId>activemq-jms-http-transport-example</artifactId>
+                        <artifactId>artemis-jms-http-transport-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>


Mime
View raw message