You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/04/30 15:26:59 UTC

[2/4] activemq-artemis git commit: fixed examples and some docs after Artemis renaming

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 560b0cb..54bed6d 100644
--- a/examples/jms/durable-subscription/src/main/resources/jndi.properties
+++ b/examples/jms/durable-subscription/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/exampleTopic=exampleTopic

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/embedded-simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/pom.xml b/examples/jms/embedded-simple/pom.xml
index 415b4cc..93b3660 100644
--- a/examples/jms/embedded-simple/pom.xml
+++ b/examples/jms/embedded-simple/pom.xml
@@ -68,7 +68,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.EmbeddedExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.EmbeddedExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                               <param>tcp://localhost:61616</param>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/embedded/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml
index 28dd040..94b50b4 100644
--- a/examples/jms/embedded/pom.xml
+++ b/examples/jms/embedded/pom.xml
@@ -68,7 +68,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.EmbeddedExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.EmbeddedExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                               <param>tcp://localhost:61617</param>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/expiry/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index f5713c0..3298454 100644
--- a/examples/jms/expiry/pom.xml
+++ b/examples/jms/expiry/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ExpiryExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ExpiryExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 00a4ce5..231fa30 100644
--- a/examples/jms/expiry/src/main/resources/jndi.properties
+++ b/examples/jms/expiry/src/main/resources/jndi.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 queue.queue/expiryQueue=expiryQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 b750ad2..78e5555 100644
--- a/examples/jms/ha-policy-autobackup/pom.xml
+++ b/examples/jms/ha-policy-autobackup/pom.xml
@@ -89,7 +89,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.HAPolicyAutoBackupExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.HAPolicyAutoBackupExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                               <param>tcp://localhost:61617</param>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 a2b43a2..37bc28a 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
@@ -66,13 +66,13 @@ public class HAPolicyAutoBackupExample extends ActiveMQExample
       {
          // Step 1. Get an initial context for looking up JNDI from server 0 and 1
          Hashtable<String, Object> properties = new Hashtable<String, Object>();
-         properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+         properties.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
          properties.put("connectionFactory.ConnectionFactory", args[0] + "?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1");
          properties.put("queue.queue/exampleQueue", "exampleQueue");
          ic0 = new InitialContext(properties);
 
          properties = new Hashtable<String, Object>();
-         properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+         properties.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
          properties.put("connectionFactory.ConnectionFactory", args[1] + "?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1");
          ic1 = new InitialContext(properties);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/http-transport/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index 71e62e7..0320466 100644
--- a/examples/jms/http-transport/pom.xml
+++ b/examples/jms/http-transport/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.HttpTransportExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.HttpTransportExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/http-transport/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/jndi.properties b/examples/jms/http-transport/src/main/resources/jndi.properties
index 939589a..15dae0b 100644
--- a/examples/jms/http-transport/src/main/resources/jndi.properties
+++ b/examples/jms/http-transport/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:8080?http-enabled=true
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/instantiate-connection-factory/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml
index 1493eb1..74e7dd5 100644
--- a/examples/jms/instantiate-connection-factory/pom.xml
+++ b/examples/jms/instantiate-connection-factory/pom.xml
@@ -82,7 +82,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.InstantiateConnectionFactoryExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.InstantiateConnectionFactoryExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/interceptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml
index 4aa6c42..3881594 100644
--- a/examples/jms/interceptor/pom.xml
+++ b/examples/jms/interceptor/pom.xml
@@ -77,7 +77,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.InterceptorExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.InterceptorExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/interceptor/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/readme.html b/examples/jms/interceptor/readme.html
index 8f4e188..b262596 100644
--- a/examples/jms/interceptor/readme.html
+++ b/examples/jms/interceptor/readme.html
@@ -45,7 +45,7 @@ under the License.
         &lt;configuration&gt;
         ...
            &lt;remoting-incoming-interceptors&gt;
-              &lt;class-name&gt;org.apache.activemq.jms.example.SimpleInterceptor&lt;/class-name&gt;
+              &lt;class-name&gt;org.apache.activemq.artemis.jms.example.SimpleInterceptor&lt;/class-name&gt;
            &lt;/remoting-incoming-interceptors&gt;
         ...
         &lt;/configuration&gt;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
index b9d2c3c..1ff8a1f 100644
--- a/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
@@ -39,7 +39,7 @@ under the License.
 
 
       <remoting-incoming-interceptors>
-         <class-name>org.apache.activemq.jms.example.SimpleInterceptor</class-name>
+         <class-name>org.apache.activemq.artemis.jms.example.SimpleInterceptor</class-name>
       </remoting-incoming-interceptors>
 
       <!-- Acceptors -->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/interceptor/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/jndi.properties b/examples/jms/interceptor/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/interceptor/src/main/resources/jndi.properties
+++ b/examples/jms/interceptor/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-auto-closeable/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/pom.xml b/examples/jms/jms-auto-closeable/pom.xml
index 2348f36..a669bb0 100644
--- a/examples/jms/jms-auto-closeable/pom.xml
+++ b/examples/jms/jms-auto-closeable/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.JMSAutoCloseableExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.JMSAutoCloseableExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties b/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
+++ b/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml
index 63588f4..25f6e05 100644
--- a/examples/jms/jms-bridge/pom.xml
+++ b/examples/jms/jms-bridge/pom.xml
@@ -82,7 +82,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.JMSBridgeExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.JMSBridgeExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                               <param>tcp://localhost:5455</param>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/readme.html b/examples/jms/jms-bridge/readme.html
index e76f3ee..0f167d7 100644
--- a/examples/jms/jms-bridge/readme.html
+++ b/examples/jms/jms-bridge/readme.html
@@ -58,7 +58,7 @@ under the License.
      Bridge itself:</p>
       <pre class="prettyprint">
          &lt;!-- The JMS Bridge -->
-         &lt;bean name="JMSBridge" class="org.apache.activemq.jms.bridge.impl.JMSBridgeImpl">
+         &lt;bean name="JMSBridge" class="org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl">
          ...
          &lt;/bean>
       </pre>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
index b2a92e3..3947aa0 100644
--- a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
+++ b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java
@@ -164,7 +164,7 @@ public class JMSBridgeExample
    {
       Hashtable<String, String> jndiProps = new Hashtable<String, String>();
       jndiProps.put("connectionFactory.ConnectionFactory", server);
-      jndiProps.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      jndiProps.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       jndiProps.put("queue.target/queue", "target");
       jndiProps.put("topic.source/topic", "topic");
       return jndiProps;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-completion-listener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/pom.xml b/examples/jms/jms-completion-listener/pom.xml
index 787dd77..2f51b53 100644
--- a/examples/jms/jms-completion-listener/pom.xml
+++ b/examples/jms/jms-completion-listener/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.JMSCompletionListenerExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.JMSCompletionListenerExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/jndi.properties b/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
+++ b/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-context/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/pom.xml b/examples/jms/jms-context/pom.xml
index 3fa2f40..4accf30 100644
--- a/examples/jms/jms-context/pom.xml
+++ b/examples/jms/jms-context/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.JMSContextExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.JMSContextExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-context/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/jndi.properties b/examples/jms/jms-context/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/jms-context/src/main/resources/jndi.properties
+++ b/examples/jms/jms-context/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-shared-consumer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml
index 36b7503..3bded31 100644
--- a/examples/jms/jms-shared-consumer/pom.xml
+++ b/examples/jms/jms-shared-consumer/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.JMSSharedConsumerExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.JMSSharedConsumerExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties b/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
index 560b0cb..54bed6d 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
+++ b/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/exampleTopic=exampleTopic

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jmx/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/pom.xml b/examples/jms/jmx/pom.xml
index 626209b..3fa5239 100644
--- a/examples/jms/jmx/pom.xml
+++ b/examples/jms/jmx/pom.xml
@@ -100,7 +100,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.JMXExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.JMXExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/jmx/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/jndi.properties b/examples/jms/jmx/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/jmx/src/main/resources/jndi.properties
+++ b/examples/jms/jmx/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/large-message/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/pom.xml b/examples/jms/large-message/pom.xml
index b4be070..8beadff 100644
--- a/examples/jms/large-message/pom.xml
+++ b/examples/jms/large-message/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.LargeMessageExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.LargeMessageExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/large-message/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/jndi.properties b/examples/jms/large-message/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/large-message/src/main/resources/jndi.properties
+++ b/examples/jms/large-message/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/last-value-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/pom.xml b/examples/jms/last-value-queue/pom.xml
index d8085de..453a837 100644
--- a/examples/jms/last-value-queue/pom.xml
+++ b/examples/jms/last-value-queue/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.LastValueQueueExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.LastValueQueueExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/last-value-queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/jndi.properties b/examples/jms/last-value-queue/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/last-value-queue/src/main/resources/jndi.properties
+++ b/examples/jms/last-value-queue/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/management-notifications/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/pom.xml b/examples/jms/management-notifications/pom.xml
index 3dda298..d1c8b01 100644
--- a/examples/jms/management-notifications/pom.xml
+++ b/examples/jms/management-notifications/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ManagementNotificationExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ManagementNotificationExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/management-notifications/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/jndi.properties b/examples/jms/management-notifications/src/main/resources/jndi.properties
index 230b95f..2582245 100644
--- a/examples/jms/management-notifications/src/main/resources/jndi.properties
+++ b/examples/jms/management-notifications/src/main/resources/jndi.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 topic.topic/notificationsTopic=notificationsTopic

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/management/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/pom.xml b/examples/jms/management/pom.xml
index 3672284..95ba0ff 100644
--- a/examples/jms/management/pom.xml
+++ b/examples/jms/management/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ManagementExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ManagementExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/management/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/jndi.properties b/examples/jms/management/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/management/src/main/resources/jndi.properties
+++ b/examples/jms/management/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/message-counters/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index 3f78368..dcf47af 100644
--- a/examples/jms/message-counters/pom.xml
+++ b/examples/jms/message-counters/pom.xml
@@ -95,7 +95,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.MessageCounterExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.MessageCounterExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/message-counters/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/jndi.properties b/examples/jms/message-counters/src/main/resources/jndi.properties
index 00a4ce5..231fa30 100644
--- a/examples/jms/message-counters/src/main/resources/jndi.properties
+++ b/examples/jms/message-counters/src/main/resources/jndi.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 queue.queue/expiryQueue=expiryQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/message-group/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 6c8f168..f7f8c7c 100644
--- a/examples/jms/message-group/pom.xml
+++ b/examples/jms/message-group/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.MessageGroupExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.MessageGroupExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/message-group/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/jndi.properties b/examples/jms/message-group/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/message-group/src/main/resources/jndi.properties
+++ b/examples/jms/message-group/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/message-group2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 922e0f2..bfb0797 100644
--- a/examples/jms/message-group2/pom.xml
+++ b/examples/jms/message-group2/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.MessageGroup2Example</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.MessageGroup2Example</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/message-group2/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/jndi.properties b/examples/jms/message-group2/src/main/resources/jndi.properties
index 9108d84..5adc898 100644
--- a/examples/jms/message-group2/src/main/resources/jndi.properties
+++ b/examples/jms/message-group2/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?groupID=Group-0
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/message-priority/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index 6cb4f64..445660f 100644
--- a/examples/jms/message-priority/pom.xml
+++ b/examples/jms/message-priority/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.MessagePriorityExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.MessagePriorityExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/message-priority/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/jndi.properties b/examples/jms/message-priority/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/message-priority/src/main/resources/jndi.properties
+++ b/examples/jms/message-priority/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/multiple-failover-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index 591c561..3159618 100644
--- a/examples/jms/multiple-failover-failback/pom.xml
+++ b/examples/jms/multiple-failover-failback/pom.xml
@@ -117,7 +117,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.MultipleFailoverFailbackExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.MultipleFailoverFailbackExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties b/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
+++ b/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.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-artemis/blob/efbe4e62/examples/jms/multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index 92e521d..50ca4f9 100644
--- a/examples/jms/multiple-failover/pom.xml
+++ b/examples/jms/multiple-failover/pom.xml
@@ -117,7 +117,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.MultipleFailoverExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.MultipleFailoverExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/multiple-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/jndi.properties b/examples/jms/multiple-failover/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/multiple-failover/src/main/resources/jndi.properties
+++ b/examples/jms/multiple-failover/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.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-artemis/blob/efbe4e62/examples/jms/no-consumer-buffering/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index 16f5d78..a3af26e 100644
--- a/examples/jms/no-consumer-buffering/pom.xml
+++ b/examples/jms/no-consumer-buffering/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.NoConsumerBufferingExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.NoConsumerBufferingExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties b/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
index fdc5940..d9b77a6 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
+++ b/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?consumerWindowSize=0
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/non-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index 41e79b9..62a2ff7 100644
--- a/examples/jms/non-transaction-failover/pom.xml
+++ b/examples/jms/non-transaction-failover/pom.xml
@@ -97,7 +97,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.NonTransactionFailoverExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.NonTransactionFailoverExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/jndi.properties b/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
+++ b/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.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-artemis/blob/efbe4e62/examples/jms/openwire/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index 92738bb..6594f43 100644
--- a/examples/jms/openwire/pom.xml
+++ b/examples/jms/openwire/pom.xml
@@ -60,7 +60,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.OpenWireExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.OpenWireExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/paging/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml
index 49c5e32..ccb601a 100644
--- a/examples/jms/paging/pom.xml
+++ b/examples/jms/paging/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.PagingExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.PagingExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/paging/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/resources/jndi.properties b/examples/jms/paging/src/main/resources/jndi.properties
index 5ce6ed4..6f70010 100644
--- a/examples/jms/paging/src/main/resources/jndi.properties
+++ b/examples/jms/paging/src/main/resources/jndi.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue
 queue.queue/pagingQueue=pagingQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml
index f3afbff..1dbb3e4 100644
--- a/examples/jms/perf/pom.xml
+++ b/examples/jms/perf/pom.xml
@@ -146,7 +146,7 @@ under the License.
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq.jms.example.PerfListener</mainClass>
+                     <mainClass>org.apache.activemq.artemis.jms.example.PerfListener</mainClass>
                   </configuration>
                </plugin>
             </plugins>
@@ -169,7 +169,7 @@ under the License.
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq.jms.example.PerfSender</mainClass>
+                     <mainClass>org.apache.activemq.artemis.jms.example.PerfSender</mainClass>
                   </configuration>
                </plugin>
             </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/perf/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/jndi.properties b/examples/jms/perf/src/main/resources/jndi.properties
index 3d1a38f..bcf6926 100644
--- a/examples/jms/perf/src/main/resources/jndi.properties
+++ b/examples/jms/perf/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?tcp-no-delay=false&tcp-send-buffer-size=1048576&tcp-receive-buffer-size=1048576
 queue.perfQueue=perfQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/pre-acknowledge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index e96d658..85f9075 100644
--- a/examples/jms/pre-acknowledge/pom.xml
+++ b/examples/jms/pre-acknowledge/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.PreacknowledgeExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.PreacknowledgeExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/jndi.properties b/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
+++ b/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/producer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml
index bdc85f7..4876db7 100644
--- a/examples/jms/producer-rate-limit/pom.xml
+++ b/examples/jms/producer-rate-limit/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ProducerRateLimitExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ProducerRateLimitExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/resources/jndi.properties b/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
index 396f3fa..0e42b2a 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
+++ b/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?producerMaxRate=50
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/proton-cpp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml
index abc8623..bca89a2 100644
--- a/examples/jms/proton-cpp/pom.xml
+++ b/examples/jms/proton-cpp/pom.xml
@@ -73,7 +73,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ProtonCPPExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ProtonCPPExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/proton-cpp/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/src/main/resources/jndi.properties b/examples/jms/proton-cpp/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/proton-cpp/src/main/resources/jndi.properties
+++ b/examples/jms/proton-cpp/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/proton-j/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index b84f82f..05d3c34 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/pom.xml
@@ -73,7 +73,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ProtonJExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ProtonJExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/queue-message-redistribution/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index b75e6ce..e937175 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/pom.xml
@@ -97,7 +97,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.QueueMessageRedistributionExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.QueueMessageRedistributionExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                               <param>tcp://localhost:61617</param>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
index ed3f6e1..b9eb17c 100644
--- a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
+++ b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/artemis/jms/example/QueueMessageRedistributionExample.java
@@ -57,7 +57,7 @@ public class QueueMessageRedistributionExample extends ActiveMQExample
       {
          // Step 1. Get an initial context for looking up JNDI from server 0
          Hashtable<String, Object> properties = new Hashtable<String, Object>();
-         properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+         properties.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
          properties.put("connectionFactory.ConnectionFactory", args[0]);
          properties.put("queue.queue/exampleQueue", "exampleQueue");
          ic0 = new InitialContext(properties);
@@ -70,7 +70,7 @@ public class QueueMessageRedistributionExample extends ActiveMQExample
 
          // Step 4. Get an initial context for looking up JNDI from server 1
          properties = new Hashtable<String, Object>();
-         properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+         properties.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
          properties.put("connectionFactory.ConnectionFactory", args[1]);
          ic1 = new InitialContext(properties);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/queue-requestor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index ef1688d..0442335 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.QueueRequestorExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.QueueRequestorExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/queue-requestor/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/jndi.properties b/examples/jms/queue-requestor/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/queue-requestor/src/main/resources/jndi.properties
+++ b/examples/jms/queue-requestor/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/queue-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index d813212..73f245f 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.QueueSelectorExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.QueueSelectorExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/queue-selector/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/jndi.properties b/examples/jms/queue-selector/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/queue-selector/src/main/resources/jndi.properties
+++ b/examples/jms/queue-selector/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 5848d7e..f6f0aad 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -73,7 +73,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.QueueExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.QueueExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/jndi.properties b/examples/jms/queue/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/queue/src/main/resources/jndi.properties
+++ b/examples/jms/queue/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/reattach-node/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index 2154f72..068dbc7 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/pom.xml
@@ -67,7 +67,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ReattachExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ReattachExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/reattach-node/src/main/java/org/apache/activemq/artemis/jms/example/ReattachExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/java/org/apache/activemq/artemis/jms/example/ReattachExample.java b/examples/jms/reattach-node/src/main/java/org/apache/activemq/artemis/jms/example/ReattachExample.java
index b5c7705..d60ba94 100644
--- a/examples/jms/reattach-node/src/main/java/org/apache/activemq/artemis/jms/example/ReattachExample.java
+++ b/examples/jms/reattach-node/src/main/java/org/apache/activemq/artemis/jms/example/ReattachExample.java
@@ -137,7 +137,7 @@ public class ReattachExample extends ActiveMQExample
    private void stopStartAcceptor(final boolean stop) throws Exception
    {
       Hashtable<String, Object> properties = new Hashtable<String, Object>();
-      properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+      properties.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
       properties.put("connectionFactory.ConnectionFactory", "tcp://localhost:61617");
       InitialContext initialContext = new InitialContext(properties);
       ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/reattach-node/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/jndi.properties b/examples/jms/reattach-node/src/main/resources/jndi.properties
index d3fc2ee..b6f8ff8 100644
--- a/examples/jms/reattach-node/src/main/resources/jndi.properties
+++ b/examples/jms/reattach-node/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1&failoverOnServerShutdown=true&confirmationWindowSize=1048576
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/replicated-failback-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index 51b0a24..519fe40 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/pom.xml
@@ -97,7 +97,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ReplicatedFailbackStaticExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ReplicatedFailbackStaticExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/jndi.properties b/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.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-artemis/blob/efbe4e62/examples/jms/replicated-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml
index b77a348..45bbd23 100644
--- a/examples/jms/replicated-failback/pom.xml
+++ b/examples/jms/replicated-failback/pom.xml
@@ -97,7 +97,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ReplicatedFailbackExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ReplicatedFailbackExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/replicated-failback/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/jndi.properties b/examples/jms/replicated-failback/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/replicated-failback/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-failback/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.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-artemis/blob/efbe4e62/examples/jms/replicated-multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml
index 497c0e3..9c95b19 100644
--- a/examples/jms/replicated-multiple-failover/pom.xml
+++ b/examples/jms/replicated-multiple-failover/pom.xml
@@ -117,7 +117,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ReplicatedMultipleFailoverExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ReplicatedMultipleFailoverExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties b/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.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-artemis/blob/efbe4e62/examples/jms/replicated-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index 0dc9d07..ac4dcd8 100644
--- a/examples/jms/replicated-transaction-failover/pom.xml
+++ b/examples/jms/replicated-transaction-failover/pom.xml
@@ -97,7 +97,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ReplicatedTransactionFailoverExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ReplicatedTransactionFailoverExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties b/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.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-artemis/blob/efbe4e62/examples/jms/request-reply/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index a16d881..c640217 100644
--- a/examples/jms/request-reply/pom.xml
+++ b/examples/jms/request-reply/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.RequestReplyExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.RequestReplyExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/request-reply/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/jndi.properties b/examples/jms/request-reply/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/request-reply/src/main/resources/jndi.properties
+++ b/examples/jms/request-reply/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.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-artemis/blob/efbe4e62/examples/jms/scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml
index a6869cd..9801db3 100644
--- a/examples/jms/scale-down/pom.xml
+++ b/examples/jms/scale-down/pom.xml
@@ -89,7 +89,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ScaleDownExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ScaleDownExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                               <param>tcp://localhost:61617</param>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ScaleDownExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ScaleDownExample.java b/examples/jms/scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ScaleDownExample.java
index 06251c2..05ba849 100644
--- a/examples/jms/scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ScaleDownExample.java
+++ b/examples/jms/scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ScaleDownExample.java
@@ -55,13 +55,13 @@ public class ScaleDownExample extends ActiveMQExample
       {
          // Step 1. Get an initial context for looking up JNDI for both servers
          Hashtable<String, Object> properties = new Hashtable<String, Object>();
-         properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+         properties.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
          properties.put("connectionFactory.ConnectionFactory", args[0] + "?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1");
          properties.put("queue.queue/exampleQueue", "exampleQueue");
          initialContext = new InitialContext(properties);
 
          properties = new Hashtable<String, Object>();
-         properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+         properties.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory");
          properties.put("connectionFactory.ConnectionFactory", args[1] + "?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1");
          initialContext1 = new InitialContext(properties);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/scheduled-message/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index 88d3340..f3fec4a 100644
--- a/examples/jms/scheduled-message/pom.xml
+++ b/examples/jms/scheduled-message/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ScheduledMessageExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ScheduledMessageExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/scheduled-message/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/jndi.properties b/examples/jms/scheduled-message/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/scheduled-message/src/main/resources/jndi.properties
+++ b/examples/jms/scheduled-message/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 49d09c4..81a3268 100644
--- a/examples/jms/security/pom.xml
+++ b/examples/jms/security/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.SecurityExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.SecurityExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/security/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/jndi.properties b/examples/jms/security/src/main/resources/jndi.properties
index c99ee9f..0a3b640 100644
--- a/examples/jms/security/src/main/resources/jndi.properties
+++ b/examples/jms/security/src/main/resources/jndi.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616
 topic.topic/genericTopic=genericTopic
 topic.topic/europeTopic=news.europe.europeTopic

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/send-acknowledgements/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml
index 8401190..86cc852 100644
--- a/examples/jms/send-acknowledgements/pom.xml
+++ b/examples/jms/send-acknowledgements/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.SendAcknowledgementsExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.SendAcknowledgementsExample</clientClass>
                         </configuration>
                      </execution>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/jndi.properties b/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
index 612dd06..8421f25 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
+++ b/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 connectionFactory.ConnectionFactory=tcp://localhost:61616?confirmationWindowSize=1048576
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml
index c25b932..6e2bc9f 100644
--- a/examples/jms/spring-integration/pom.xml
+++ b/examples/jms/spring-integration/pom.xml
@@ -67,7 +67,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.SpringExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.SpringExample</clientClass>
                         </configuration>
                      </execution>
                   </executions>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml b/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
index 68d1f94..a67de73 100644
--- a/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
+++ b/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
@@ -54,7 +54,7 @@ under the License.
    <bean id="connectionFactory" class="org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory">
       <constructor-arg value="false"/>
       <constructor-arg>
-         <bean class="org.apache.activemq.api.core.TransportConfiguration">
+         <bean class="org.apache.activemq.artemis.api.core.TransportConfiguration">
             <constructor-arg value="org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"/>
          </bean>
       </constructor-arg>