activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [3/4] activemq-artemis git commit: fixed examples and some docs after Artemis renaming
Date Thu, 30 Apr 2015 13:27:00 GMT
fixed examples and some docs after Artemis renaming


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/efbe4e62
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/efbe4e62
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/efbe4e62

Branch: refs/heads/master
Commit: efbe4e621f307f36f80484a218e2b69b28ea98a4
Parents: c65bec5
Author: Andy Taylor <andy.tayls67@gmail.com>
Authored: Thu Apr 30 10:44:16 2015 +0100
Committer: Andy Taylor <andy.tayls67@gmail.com>
Committed: Thu Apr 30 10:44:16 2015 +0100

----------------------------------------------------------------------
 docs/user-manual/en/clusters.md                           |  4 ++--
 docs/user-manual/en/configuring-transports.md             |  2 +-
 docs/user-manual/en/flow-control.md                       |  8 ++++----
 docs/user-manual/en/interoperability.md                   |  2 +-
 docs/user-manual/en/large-messages.md                     |  4 ++--
 docs/user-manual/en/message-grouping.md                   |  4 ++--
 docs/user-manual/en/pre-acknowledge.md                    |  2 +-
 docs/user-manual/en/thread-pooling.md                     |  2 +-
 docs/user-manual/en/using-jms.md                          | 10 +++++-----
 examples/jms/aerogear/pom.xml                             |  2 +-
 examples/jms/aerogear/src/main/resources/jndi.properties  |  2 +-
 examples/jms/application-layer-failover/pom.xml           |  2 +-
 .../jms/example/ApplicationLayerFailoverExample.java      |  2 +-
 .../artemis-jms-examples-common/config/server.properties  |  2 +-
 examples/jms/bridge/pom.xml                               |  2 +-
 examples/jms/bridge/readme.html                           |  2 +-
 .../activemq/artemis/jms/example/BridgeExample.java       |  4 ++--
 .../bridge/src/main/resources/activemq/server0/broker.xml |  2 +-
 examples/jms/browser/pom.xml                              |  2 +-
 examples/jms/browser/src/main/resources/jndi.properties   |  2 +-
 examples/jms/client-kickoff/pom.xml                       |  2 +-
 examples/jms/client-kickoff/readme.html                   |  6 +++---
 .../jms/client-kickoff/src/main/resources/jndi.properties |  2 +-
 examples/jms/client-side-failoverlistener/pom.xml         |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/client-side-load-balancing/pom.xml           |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/clustered-durable-subscription/pom.xml       |  2 +-
 .../jms/example/ClusteredDurableSubscriptionExample.java  |  4 ++--
 examples/jms/clustered-grouping/pom.xml                   |  2 +-
 .../artemis/jms/example/ClusteredGroupingExample.java     |  6 +++---
 examples/jms/clustered-jgroups/pom.xml                    |  2 +-
 .../artemis/jms/example/ClusteredJgroupsExample.java      |  4 ++--
 .../resources/activemq/server0/client-jndi.properties     |  2 +-
 .../resources/activemq/server1/client-jndi.properties     |  2 +-
 examples/jms/clustered-queue/pom.xml                      |  2 +-
 .../artemis/jms/example/ClusteredQueueExample.java        |  4 ++--
 examples/jms/clustered-standalone/pom.xml                 |  2 +-
 .../artemis/jms/example/ClusteredStandaloneExample.java   |  6 +++---
 examples/jms/clustered-static-discovery/pom.xml           |  2 +-
 .../artemis/jms/example/StaticClusteredQueueExample.java  |  2 +-
 examples/jms/clustered-static-oneway/pom.xml              |  2 +-
 .../artemis/jms/example/ClusterStaticOnewayExample.java   |  2 +-
 examples/jms/clustered-topic/pom.xml                      |  2 +-
 .../artemis/jms/example/ClusteredTopicExample.java        |  4 ++--
 examples/jms/colocated-failover-scale-down/pom.xml        |  2 +-
 .../jms/example/ColocatedFailoverScaleDownExample.java    |  4 ++--
 examples/jms/colocated-failover/pom.xml                   |  2 +-
 .../artemis/jms/example/ColocatedFailoverExample.java     |  4 ++--
 examples/jms/consumer-rate-limit/pom.xml                  |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/dead-letter/pom.xml                          |  2 +-
 .../jms/dead-letter/src/main/resources/jndi.properties    |  2 +-
 examples/jms/delayed-redelivery/pom.xml                   |  2 +-
 .../delayed-redelivery/src/main/resources/jndi.properties |  2 +-
 examples/jms/divert/pom.xml                               |  2 +-
 examples/jms/divert/readme.html                           |  2 +-
 .../activemq/artemis/jms/example/DivertExample.java       |  4 ++--
 .../divert/src/main/resources/activemq/server0/broker.xml |  2 +-
 examples/jms/durable-subscription/pom.xml                 |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/embedded-simple/pom.xml                      |  2 +-
 examples/jms/embedded/pom.xml                             |  2 +-
 examples/jms/expiry/pom.xml                               |  2 +-
 examples/jms/expiry/src/main/resources/jndi.properties    |  2 +-
 examples/jms/ha-policy-autobackup/pom.xml                 |  2 +-
 .../artemis/jms/example/HAPolicyAutoBackupExample.java    |  4 ++--
 examples/jms/http-transport/pom.xml                       |  2 +-
 .../jms/http-transport/src/main/resources/jndi.properties |  2 +-
 examples/jms/instantiate-connection-factory/pom.xml       |  2 +-
 examples/jms/interceptor/pom.xml                          |  2 +-
 examples/jms/interceptor/readme.html                      |  2 +-
 .../src/main/resources/activemq/server0/broker.xml        |  2 +-
 .../jms/interceptor/src/main/resources/jndi.properties    |  2 +-
 examples/jms/jms-auto-closeable/pom.xml                   |  2 +-
 .../jms-auto-closeable/src/main/resources/jndi.properties |  2 +-
 examples/jms/jms-bridge/pom.xml                           |  2 +-
 examples/jms/jms-bridge/readme.html                       |  2 +-
 .../activemq/artemis/jms/example/JMSBridgeExample.java    |  2 +-
 examples/jms/jms-completion-listener/pom.xml              |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/jms-context/pom.xml                          |  2 +-
 .../jms/jms-context/src/main/resources/jndi.properties    |  2 +-
 examples/jms/jms-shared-consumer/pom.xml                  |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/jmx/pom.xml                                  |  2 +-
 examples/jms/jmx/src/main/resources/jndi.properties       |  2 +-
 examples/jms/large-message/pom.xml                        |  2 +-
 .../jms/large-message/src/main/resources/jndi.properties  |  2 +-
 examples/jms/last-value-queue/pom.xml                     |  2 +-
 .../last-value-queue/src/main/resources/jndi.properties   |  2 +-
 examples/jms/management-notifications/pom.xml             |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/management/pom.xml                           |  2 +-
 .../jms/management/src/main/resources/jndi.properties     |  2 +-
 examples/jms/message-counters/pom.xml                     |  2 +-
 .../message-counters/src/main/resources/jndi.properties   |  2 +-
 examples/jms/message-group/pom.xml                        |  2 +-
 .../jms/message-group/src/main/resources/jndi.properties  |  2 +-
 examples/jms/message-group2/pom.xml                       |  2 +-
 .../jms/message-group2/src/main/resources/jndi.properties |  2 +-
 examples/jms/message-priority/pom.xml                     |  2 +-
 .../message-priority/src/main/resources/jndi.properties   |  2 +-
 examples/jms/multiple-failover-failback/pom.xml           |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/multiple-failover/pom.xml                    |  2 +-
 .../multiple-failover/src/main/resources/jndi.properties  |  2 +-
 examples/jms/no-consumer-buffering/pom.xml                |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/non-transaction-failover/pom.xml             |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/openwire/pom.xml                             |  2 +-
 examples/jms/paging/pom.xml                               |  2 +-
 examples/jms/paging/src/main/resources/jndi.properties    |  2 +-
 examples/jms/perf/pom.xml                                 |  4 ++--
 examples/jms/perf/src/main/resources/jndi.properties      |  2 +-
 examples/jms/pre-acknowledge/pom.xml                      |  2 +-
 .../pre-acknowledge/src/main/resources/jndi.properties    |  2 +-
 examples/jms/producer-rate-limit/pom.xml                  |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/proton-cpp/pom.xml                           |  2 +-
 .../jms/proton-cpp/src/main/resources/jndi.properties     |  2 +-
 examples/jms/proton-j/pom.xml                             |  2 +-
 examples/jms/queue-message-redistribution/pom.xml         |  2 +-
 .../jms/example/QueueMessageRedistributionExample.java    |  4 ++--
 examples/jms/queue-requestor/pom.xml                      |  2 +-
 .../queue-requestor/src/main/resources/jndi.properties    |  2 +-
 examples/jms/queue-selector/pom.xml                       |  2 +-
 .../jms/queue-selector/src/main/resources/jndi.properties |  2 +-
 examples/jms/queue/pom.xml                                |  2 +-
 examples/jms/queue/src/main/resources/jndi.properties     |  2 +-
 examples/jms/reattach-node/pom.xml                        |  2 +-
 .../activemq/artemis/jms/example/ReattachExample.java     |  2 +-
 .../jms/reattach-node/src/main/resources/jndi.properties  |  2 +-
 examples/jms/replicated-failback-static/pom.xml           |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/replicated-failback/pom.xml                  |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/replicated-multiple-failover/pom.xml         |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/replicated-transaction-failover/pom.xml      |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/request-reply/pom.xml                        |  2 +-
 .../jms/request-reply/src/main/resources/jndi.properties  |  2 +-
 examples/jms/scale-down/pom.xml                           |  2 +-
 .../activemq/artemis/jms/example/ScaleDownExample.java    |  4 ++--
 examples/jms/scheduled-message/pom.xml                    |  2 +-
 .../scheduled-message/src/main/resources/jndi.properties  |  2 +-
 examples/jms/security/pom.xml                             |  2 +-
 examples/jms/security/src/main/resources/jndi.properties  |  2 +-
 examples/jms/send-acknowledgements/pom.xml                |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/spring-integration/pom.xml                   |  2 +-
 .../src/main/resources/spring-jms-beans.xml               |  2 +-
 examples/jms/ssl-enabled/pom.xml                          |  2 +-
 .../jms/ssl-enabled/src/main/resources/jndi.properties    |  2 +-
 examples/jms/static-selector-jms/pom.xml                  |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/static-selector/pom.xml                      |  2 +-
 .../static-selector/src/main/resources/jndi.properties    |  2 +-
 examples/jms/stomp-websockets/pom.xml                     |  2 +-
 .../stomp-websockets/src/main/resources/jndi.properties   |  2 +-
 examples/jms/stomp/pom.xml                                |  2 +-
 examples/jms/stomp/src/main/resources/jndi.properties     |  2 +-
 examples/jms/stomp1.1/pom.xml                             |  2 +-
 examples/jms/stomp1.1/src/main/resources/jndi.properties  |  2 +-
 examples/jms/stomp1.2/pom.xml                             |  2 +-
 examples/jms/stomp1.2/src/main/resources/jndi.properties  |  2 +-
 examples/jms/stop-server-failover/pom.xml                 |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/symmetric-cluster/pom.xml                    |  2 +-
 examples/jms/temp-queue/pom.xml                           |  2 +-
 .../jms/temp-queue/src/main/resources/jndi.properties     |  2 +-
 examples/jms/topic-hierarchies/pom.xml                    |  2 +-
 .../topic-hierarchies/src/main/resources/jndi.properties  |  2 +-
 examples/jms/topic-selector-example1/pom.xml              |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/topic-selector-example2/pom.xml              |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/topic/pom.xml                                |  2 +-
 examples/jms/topic/src/main/resources/jndi.properties     |  2 +-
 examples/jms/transaction-failover/pom.xml                 |  2 +-
 .../src/main/resources/jndi.properties                    |  2 +-
 examples/jms/transactional/pom.xml                        |  2 +-
 .../jms/transactional/src/main/resources/jndi.properties  |  2 +-
 examples/jms/xa-heuristic/pom.xml                         |  2 +-
 .../jms/xa-heuristic/src/main/resources/jndi.properties   |  2 +-
 examples/jms/xa-receive/pom.xml                           |  2 +-
 .../jms/xa-receive/src/main/resources/jndi.properties     |  2 +-
 examples/jms/xa-send/pom.xml                              |  2 +-
 examples/jms/xa-send/src/main/resources/jndi.properties   |  2 +-
 examples/soak/normal/pom.xml                              |  8 ++++----
 .../activemq/artemis/jms/soak/example/SoakReceiver.java   |  2 +-
 .../activemq/artemis/jms/soak/example/SoakSender.java     |  2 +-
 194 files changed, 225 insertions(+), 225 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/clusters.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md
index 747632a..c00fe10 100644
--- a/docs/user-manual/en/clusters.md
+++ b/docs/user-manual/en/clusters.md
@@ -462,7 +462,7 @@ If you're using JMS and you're using JNDI on the client to look up your
 JMS connection factory instances then you can specify these parameters
 in the JNDI context environment in, e.g. `jndi.properties`:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.myConnectionFactory=(tcp://myhost:61616,tcp://myhost2:61616)
 
 The `connectionFactory.myConnectionFactory` contains a list of servers to use for the
@@ -843,7 +843,7 @@ JMS connection factory instances then you can specify these parameters
 in the JNDI context environment in, e.g. `jndi.properties`, to specify
 the load balancing policy directly:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connection.myConnectionFactory=tcp://localhost:61616?loadBalancingPolicyClassName=org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
 
 The above example would instantiate a JMS connection factory that uses

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/configuring-transports.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/configuring-transports.md b/docs/user-manual/en/configuring-transports.md
index 7dd7c23..cf04627 100644
--- a/docs/user-manual/en/configuring-transports.md
+++ b/docs/user-manual/en/configuring-transports.md
@@ -77,7 +77,7 @@ couple of reasons for this:
     `java.naming.provider.url` to construct the transport. Here's a
     simple example:
 
-        java.naming.factory.initial=ActiveMQInitialContextFactory
+        java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
         connectionFactory.MyConnectionFactory=tcp://myhost:61616
 
 ## Configuring the transport directly from the client side.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/flow-control.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md
index 92eabb0..e8fbf05 100644
--- a/docs/user-manual/en/flow-control.md
+++ b/docs/user-manual/en/flow-control.md
@@ -101,7 +101,7 @@ environment, e.g. `jndi.properties`. Here's a simple example using the
 "ConnectionFactory" connection factory which is available in the context
 by default:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.myConnectionFactory=tcp://localhost:61616?consumerWindowSize=0
 
 If the connection factory is directly instantiated, the consumer window
@@ -138,7 +138,7 @@ max rate can be configured in the JNDI context environment, e.g.
 `jndi.properties`. Here's a simple example using the "ConnectionFactory"
 connection factory which is available in the context by default:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     java.naming.provider.url=tcp://localhost:61616?consumerMaxRate=10
 
 If the connection factory is directly instantiated, the max rate size
@@ -191,7 +191,7 @@ e.g. `jndi.properties`. Here's a simple example using the
 "ConnectionFactory" connection factory which is available in the context
 by default:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.myConnectionFactory=tcp://localhost:61616?producerWindowSize=10
 
 If the connection factory is directly instantiated, the producer window
@@ -285,7 +285,7 @@ max rate size can be configured in the JNDI context environment, e.g.
 `jndi.properties`. Here's a simple example using the "ConnectionFactory"
 connection factory which is available in the context by default:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.myConnectionFactory=tcp://localhost:61616?producerMaxRate=10
 
 If the connection factory is directly instantiated, the max rate size

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/interoperability.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/interoperability.md b/docs/user-manual/en/interoperability.md
index 914128d..d6b9535 100644
--- a/docs/user-manual/en/interoperability.md
+++ b/docs/user-manual/en/interoperability.md
@@ -227,7 +227,7 @@ it is using JNDI.
 Stomp requires the file `jndi.properties` to be available on the
 classpath. This should look something like:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 
 Configure any required JNDI resources in this file according to the
 documentation.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/large-messages.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/large-messages.md b/docs/user-manual/en/large-messages.md
index b9870a0..281066c 100644
--- a/docs/user-manual/en/large-messages.md
+++ b/docs/user-manual/en/large-messages.md
@@ -85,7 +85,7 @@ environment, e.g. `jndi.properties`. Here's a simple example using the
 "ConnectionFactory" connection factory which is available in the context
 by default:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.myConnectionFactory=tcp://localhost:61616?minLargeMessageSize=250000
 
 
@@ -120,7 +120,7 @@ e.g. `jndi.properties`. Here's a simple example using the
 "ConnectionFactory" connection factory which is available in the context
 by default:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.myConnectionFactory=tcp://localhost:61616?compressLargeMessages=true
 
 ## Streaming large messages

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/message-grouping.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/message-grouping.md b/docs/user-manual/en/message-grouping.md
index 09d76d3..049efc7 100644
--- a/docs/user-manual/en/message-grouping.md
+++ b/docs/user-manual/en/message-grouping.md
@@ -67,7 +67,7 @@ also be set in the JNDI context environment, e.g. `jndi.properties`.
 Here's a simple example using the "ConnectionFactory" connection factory
 which is available in the context by default
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.myConnectionFactory=tcp://localhost:61616?autoGroup=true
 
 Alternatively you can set the group id via the connection factory. All
@@ -77,7 +77,7 @@ can also be set in the JNDI context environment, e.g. `jndi.properties`.
 Here's a simple example using the "ConnectionFactory" connection factory
 which is available in the context by default:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.myConnectionFactory=tcp://localhost:61616?roupID=Group-0
 
 ## Example

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/pre-acknowledge.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/pre-acknowledge.md b/docs/user-manual/en/pre-acknowledge.md
index a0daada..b16a2d9 100644
--- a/docs/user-manual/en/pre-acknowledge.md
+++ b/docs/user-manual/en/pre-acknowledge.md
@@ -45,7 +45,7 @@ arrive soon, overriding the previous price.
 This can be configured in a client's JNDI context environment, e.g.
 `jndi.properties`, like this:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connection.ConnectionFactory=tcp://localhost:61616?preAcknowledge=true
 
 Alternatively, to use pre-acknowledgement mode using the JMS API, create

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/thread-pooling.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/thread-pooling.md b/docs/user-manual/en/thread-pooling.md
index 9c24bb7..2d3b8d1 100644
--- a/docs/user-manual/en/thread-pooling.md
+++ b/docs/user-manual/en/thread-pooling.md
@@ -149,7 +149,7 @@ environment, e.g. `jndi.properties`. Here's a simple example using the
 "ConnectionFactory" connection factory which is available in the context
 by default:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 
     java.naming.provider.url=tcp://localhost:61616
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/docs/user-manual/en/using-jms.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-jms.md b/docs/user-manual/en/using-jms.md
index 2ae15d4..2ae78b6 100644
--- a/docs/user-manual/en/using-jms.md
+++ b/docs/user-manual/en/using-jms.md
@@ -68,7 +68,7 @@ Here's a simple example of the JNDI context environment for a client
 looking up a connection factory to access an *embedded* instance of
 Apache ActiveMQ Artemis:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.invmConnectionFactory=vm://0
 
 In this instance we have created a connection factory that is bound to
@@ -81,7 +81,7 @@ have an InVM acceptor with a unique server-ID. A client using JMS and
 JNDI can account for this by specifying a connction factory for each
 server, like so:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.invmConnectionFactory0=vm://0
     connectionFactory.invmConnectionFactory1=vm://1
     connectionFactory.invmConnectionFactory2=vm://2
@@ -101,7 +101,7 @@ most commonly connect across a network a remote broker. Here's a simple
 example of a client configuring a connection factory to connect to a
 remote broker running on myhost:5445:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     connectionFactory.ConnectionFactory=tcp://myhost:5445
 
 In the example above the client is using the `tcp` scheme for the
@@ -180,7 +180,7 @@ are supported just like with `udp`.
 The default type for the default connection factory is of type `javax.jms.ConnectionFactory`.
 This can be changed by setting the type like so
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     java.naming.provider.url=tcp://localhost:5445?type=CF
 
 In this example it is still set to the default, below shows a list of types that can be set.
@@ -211,7 +211,7 @@ like so:
 And if the client wanted to bind this queue to "queues/OrderQueue" then
 the JNDI properties would be configured like so:
 
-    java.naming.factory.initial=ActiveMQInitialContextFactory
+    java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
     java.naming.provider.url=tcp://myhost:5445
     queue.queues/OrderQueue=OrderQueue
 

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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/aerogear/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/jndi.properties b/examples/jms/aerogear/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/aerogear/src/main/resources/jndi.properties
+++ b/examples/jms/aerogear/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/application-layer-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml
index e91a9e0..c3925bf 100644
--- a/examples/jms/application-layer-failover/pom.xml
+++ b/examples/jms/application-layer-failover/pom.xml
@@ -78,7 +78,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ApplicationLayerFailoverExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ApplicationLayerFailoverExample</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/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
index 78120ad..787524d 100644
--- a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
+++ b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/artemis/jms/example/ApplicationLayerFailoverExample.java
@@ -151,7 +151,7 @@ public class ApplicationLayerFailoverExample extends ActiveMQExample
    {
       // Step 1. Get an initial context for looking up JNDI from the server
       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://127.0.0.1:" + (61616 + server));
       properties.put("queue.queue/exampleQueue", "exampleQueue");
       initialContext = new InitialContext(properties);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/artemis-jms-examples-common/config/server.properties
----------------------------------------------------------------------
diff --git a/examples/jms/artemis-jms-examples-common/config/server.properties b/examples/jms/artemis-jms-examples-common/config/server.properties
index 8d6cc7a..cff66e2 100644
--- a/examples/jms/artemis-jms-examples-common/config/server.properties
+++ b/examples/jms/artemis-jms-examples-common/config/server.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=ActiveMQInitialContextFactory
+server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index 9e5bf12..c502c0e 100644
--- a/examples/jms/bridge/pom.xml
+++ b/examples/jms/bridge/pom.xml
@@ -82,7 +82,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.BridgeExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.BridgeExample</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/bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/readme.html b/examples/jms/bridge/readme.html
index 96b6c7f..c511da4 100644
--- a/examples/jms/bridge/readme.html
+++ b/examples/jms/bridge/readme.html
@@ -61,7 +61,7 @@ under the License.
           &lt;queue-name&gt;jms.queue.sausage-factory&lt;/queue-name&gt;
           &lt;forwarding-address&gt;jms.queue.mincing-machine&lt;/forwarding-address&gt;
           &lt;filter string="name='aardvark'"/&gt;
-          &lt;transformer-class-name&gt;org.apache.activemq.jms.example.HatColourChangeTransformer&lt;/transformer-class-name&gt;
+          &lt;transformer-class-name&gt;org.apache.activemq.artemis.jms.example.HatColourChangeTransformer&lt;/transformer-class-name&gt;
           &lt;reconnect-attempts&gt;-1&lt;/reconnect-attempts&gt;
           &lt;static-connectors>
              &lt;connector-ref>remote-connector&lt;/connector-ref>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
index 2eccf54..31120c4 100644
--- a/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
+++ b/examples/jms/bridge/src/main/java/org/apache/activemq/artemis/jms/example/BridgeExample.java
@@ -56,7 +56,7 @@ public class BridgeExample extends ActiveMQExample
          // Step 1 - we create an initial context for looking up JNDI on node 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", "tcp://127.0.0.1:61616");
          properties.put("queue.queue/sausage-factory", "sausage-factory");
          ic0 = new InitialContext(properties);
@@ -72,7 +72,7 @@ public class BridgeExample extends ActiveMQExample
          // Step 4 - we create an initial context for looking up JNDI on node 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", "tcp://127.0.0.1:61617");
          properties.put("queue.queue/mincing-machine", "mincing-machine");
          ic1 = new InitialContext(properties);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml b/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
index cc79ef0..250a851 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
@@ -62,7 +62,7 @@ under the License.
             <queue-name>jms.queue.sausage-factory</queue-name>
             <forwarding-address>jms.queue.mincing-machine</forwarding-address>
             <filter string="name='aardvark'"/>
-            <transformer-class-name>org.apache.activemq.jms.example.HatColourChangeTransformer</transformer-class-name>
+            <transformer-class-name>org.apache.activemq.artemis.jms.example.HatColourChangeTransformer</transformer-class-name>
             <reconnect-attempts>-1</reconnect-attempts>
             <static-connectors>
                <connector-ref>remote-connector</connector-ref>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/browser/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index 8a5b8af..6069e99 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -64,7 +64,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.QueueBrowserExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.QueueBrowserExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/browser/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/jndi.properties b/examples/jms/browser/src/main/resources/jndi.properties
index 4836ac8..93537c4 100644
--- a/examples/jms/browser/src/main/resources/jndi.properties
+++ b/examples/jms/browser/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/client-kickoff/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index 1aca709..7ca5550 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -95,7 +95,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClientKickoffExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClientKickoffExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/client-kickoff/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/readme.html b/examples/jms/client-kickoff/readme.html
index 6b2732e..0f6872d 100644
--- a/examples/jms/client-kickoff/readme.html
+++ b/examples/jms/client-kickoff/readme.html
@@ -116,9 +116,9 @@ under the License.
 
         <p>Warnings be displayed on the server output:</p>
         <pre class="prettyprint">
-            <code>org.apache.activemq.jms.example.SpawnedJMSServer out:11:22:33,034 WARN  @RMI TCP Connection(3)-192.168.0.10 [RemotingConnectionImpl] Connection failure has been detected connections for /192.168.0.10:52707 closed by management:0
-            org.apache.activemq.jms.example.SpawnedJMSServer out:11:22:33,035 WARN  @RMI TCP Connection(3)-192.168.0.10 [ServerSessionImpl] Client connection failed, clearing up resources for session 4646da35-2fe8-11de-9ce9-752ccc2b26e4
-            org.apache.activemq.jms.example.SpawnedJMSServer out:11:22:33,035 WARN  @RMI TCP Connection(3)-192.168.0.10 [ServerSessionImpl] Cleared up resources for session 4646da35-2fe8-11de-9ce9-752ccc2b26e4
+            <code>org.apache.activemq.artemis.jms.example.SpawnedJMSServer out:11:22:33,034 WARN  @RMI TCP Connection(3)-192.168.0.10 [RemotingConnectionImpl] Connection failure has been detected connections for /192.168.0.10:52707 closed by management:0
+            org.apache.activemq.artemis.jms.example.SpawnedJMSServer out:11:22:33,035 WARN  @RMI TCP Connection(3)-192.168.0.10 [ServerSessionImpl] Client connection failed, clearing up resources for session 4646da35-2fe8-11de-9ce9-752ccc2b26e4
+            org.apache.activemq.artemis.jms.example.SpawnedJMSServer out:11:22:33,035 WARN  @RMI TCP Connection(3)-192.168.0.10 [ServerSessionImpl] Cleared up resources for session 4646da35-2fe8-11de-9ce9-752ccc2b26e4
             </code>
         </pre>
         

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/client-kickoff/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/jndi.properties b/examples/jms/client-kickoff/src/main/resources/jndi.properties
index ed96c02..5cbe72c 100644
--- a/examples/jms/client-kickoff/src/main/resources/jndi.properties
+++ b/examples/jms/client-kickoff/src/main/resources/jndi.properties
@@ -15,5 +15,5 @@
 # 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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/client-side-failoverlistener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index f7a86f8..98e01bd 100644
--- a/examples/jms/client-side-failoverlistener/pom.xml
+++ b/examples/jms/client-side-failoverlistener/pom.xml
@@ -98,7 +98,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClientSideFailoverListerExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClientSideFailoverListerExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
index 07c84f2..7f7a19f 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
+++ b/examples/jms/client-side-failoverlistener/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/client-side-load-balancing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index 4e4206e..29ffc2a 100644
--- a/examples/jms/client-side-load-balancing/pom.xml
+++ b/examples/jms/client-side-load-balancing/pom.xml
@@ -109,7 +109,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClientSideLoadBalancingExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClientSideLoadBalancingExample</clientClass>
                            <systemProperties>
                               <property>
                                  <name>exampleConfigDir</name>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties b/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
index 0aa403a..d3f932c 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
+++ b/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
@@ -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=udp://231.7.7.7:9876
 queue.queue/exampleQueue=exampleQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/clustered-durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index b169bf5..d8a993d 100644
--- a/examples/jms/clustered-durable-subscription/pom.xml
+++ b/examples/jms/clustered-durable-subscription/pom.xml
@@ -89,7 +89,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClusteredDurableSubscriptionExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClusteredDurableSubscriptionExample</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/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
index cecf3ac..ea0014f 100644
--- a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
+++ b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java
@@ -57,7 +57,7 @@ public class ClusteredDurableSubscriptionExample 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("topic.topic/exampleTopic", "exampleTopic");
          ic0 = new InitialContext(properties);
@@ -71,7 +71,7 @@ public class ClusteredDurableSubscriptionExample 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/clustered-grouping/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index c772822..7238790 100644
--- a/examples/jms/clustered-grouping/pom.xml
+++ b/examples/jms/clustered-grouping/pom.xml
@@ -117,7 +117,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClusteredGroupingExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClusteredGroupingExample</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/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
index c5cd790..a536ed5 100644
--- a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
+++ b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredGroupingExample.java
@@ -59,7 +59,7 @@ public class ClusteredGroupingExample 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);
@@ -72,7 +72,7 @@ public class ClusteredGroupingExample 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);
 
@@ -81,7 +81,7 @@ public class ClusteredGroupingExample extends ActiveMQExample
 
          // Step 4. Get an initial context for looking up JNDI from server 2
          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[2]);
          ic2 = new InitialContext(properties);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/clustered-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml
index 494211f..2c0fff4 100644
--- a/examples/jms/clustered-jgroups/pom.xml
+++ b/examples/jms/clustered-jgroups/pom.xml
@@ -93,7 +93,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClusteredJgroupsExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClusteredJgroupsExample</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/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
index 29892b9..b71bafd 100644
--- a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
+++ b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredJgroupsExample.java
@@ -54,7 +54,7 @@ public class ClusteredJgroupsExample 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);
@@ -67,7 +67,7 @@ public class ClusteredJgroupsExample 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/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
index ed96c02..5cbe72c 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
@@ -15,5 +15,5 @@
 # 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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
index b95f5a1..7f579c1 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-java.naming.factory.initial=ActiveMQInitialContextFactory
+java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
 java.naming.provider.url=tcp://localhost:61617

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/clustered-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml
index e009c1c..2240677 100644
--- a/examples/jms/clustered-queue/pom.xml
+++ b/examples/jms/clustered-queue/pom.xml
@@ -89,7 +89,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClusteredQueueExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClusteredQueueExample</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/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 9781771..ad1d19b 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
@@ -55,7 +55,7 @@ public class ClusteredQueueExample 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);
@@ -68,7 +68,7 @@ public class ClusteredQueueExample 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/clustered-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml
index cf7b1bc..b823bc9 100644
--- a/examples/jms/clustered-standalone/pom.xml
+++ b/examples/jms/clustered-standalone/pom.xml
@@ -105,7 +105,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClusteredStandaloneExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClusteredStandaloneExample</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/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 fac5ba6..eb477f9 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
@@ -52,18 +52,18 @@ public class ClusteredStandaloneExample extends ActiveMQExample
       try
       {
          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("topic.topic/exampleTopic", "exampleTopic");
          initialContext0 = 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]);
          initialContext1 = 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[2]);
          initialContext2 = new InitialContext(properties);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 2b51c7e..12edbbb 100644
--- a/examples/jms/clustered-static-discovery/pom.xml
+++ b/examples/jms/clustered-static-discovery/pom.xml
@@ -97,7 +97,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.StaticClusteredQueueExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.StaticClusteredQueueExample</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/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 abc26c2..b7b5795 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
@@ -59,7 +59,7 @@ public class StaticClusteredQueueExample extends ActiveMQExample
       {
          // Step 1. Get an initial context for looking up JNDI from server 3
          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[3]);
          properties.put("queue.queue/exampleQueue", "exampleQueue");
          ic0 = new InitialContext(properties);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 7f5e67c..d5496cc 100644
--- a/examples/jms/clustered-static-oneway/pom.xml
+++ b/examples/jms/clustered-static-oneway/pom.xml
@@ -87,7 +87,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClusterStaticOnewayExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClusterStaticOnewayExample</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/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 1bfe858..21447f5 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
@@ -57,7 +57,7 @@ public class ClusterStaticOnewayExample 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);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/clustered-topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index dc03320..157a489 100644
--- a/examples/jms/clustered-topic/pom.xml
+++ b/examples/jms/clustered-topic/pom.xml
@@ -97,7 +97,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ClusteredTopicExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ClusteredTopicExample</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/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 4378954..9dc02ca 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
@@ -55,7 +55,7 @@ public class ClusteredTopicExample 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("topic.topic/exampleTopic", "exampleTopic");
          ic0 = new InitialContext(properties);
@@ -68,7 +68,7 @@ public class ClusteredTopicExample 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/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 e6f0d71..f1fc4be 100644
--- a/examples/jms/colocated-failover-scale-down/pom.xml
+++ b/examples/jms/colocated-failover-scale-down/pom.xml
@@ -89,7 +89,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ColocatedFailoverScaleDownExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ColocatedFailoverScaleDownExample</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/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 b4b8ce6..824e8c2 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
@@ -55,12 +55,12 @@ public class ColocatedFailoverScaleDownExample 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[1]);
          initialContext1 = 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[0] + "?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1");
          properties.put("queue.queue/exampleQueue", "exampleQueue");
          initialContext = new InitialContext(properties);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/colocated-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml
index a50b09a..0cce45d 100644
--- a/examples/jms/colocated-failover/pom.xml
+++ b/examples/jms/colocated-failover/pom.xml
@@ -89,7 +89,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ColocatedFailoverExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ColocatedFailoverExample</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/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 163faec..061c0d9 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
@@ -55,12 +55,12 @@ public class ColocatedFailoverExample 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[1]);
          initialContext1 = 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[0] + "?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1");
          properties.put("queue.queue/exampleQueue", "exampleQueue");
          initialContext = new InitialContext(properties);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 1e4236f..adf10a8 100644
--- a/examples/jms/consumer-rate-limit/pom.xml
+++ b/examples/jms/consumer-rate-limit/pom.xml
@@ -72,7 +72,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.ConsumerRateLimitExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.ConsumerRateLimitExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

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

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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 ea5cd82..3e1a366 100644
--- a/examples/jms/dead-letter/src/main/resources/jndi.properties
+++ b/examples/jms/dead-letter/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/deadLetterQueue=deadLetterQueue

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/delayed-redelivery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index 5e8732e..5b0dfd9 100644
--- a/examples/jms/delayed-redelivery/pom.xml
+++ b/examples/jms/delayed-redelivery/pom.xml
@@ -64,7 +64,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.DelayedRedeliveryExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.DelayedRedeliveryExample</clientClass>
                            <args>
                               <param>tcp://localhost:61616</param>
                            </args>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 4836ac8..93537c4 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
+++ b/examples/jms/delayed-redelivery/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/divert/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index 9037f0c..9f826ee 100644
--- a/examples/jms/divert/pom.xml
+++ b/examples/jms/divert/pom.xml
@@ -82,7 +82,7 @@ under the License.
                            <goal>runClient</goal>
                         </goals>
                         <configuration>
-                           <clientClass>org.apache.activemq.jms.example.DivertExample</clientClass>
+                           <clientClass>org.apache.activemq.artemis.jms.example.DivertExample</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/divert/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/divert/readme.html b/examples/jms/divert/readme.html
index adcf0ca..545f0b5 100644
--- a/examples/jms/divert/readme.html
+++ b/examples/jms/divert/readme.html
@@ -88,7 +88,7 @@ under the License.
 	     &lt;address&gt;jms.topic.priceUpdates&lt;/address&gt;
 	     &lt;forwarding-address&gt;jms.queue.priceForwarding&lt;/forwarding-address&gt;    
 	     &lt;filter string="office='New York'"/&gt;
-	     &lt;transformer-class-name&gt;org.apache.activemq.jms.example.AddForwardingTimeTransformer&lt;/transformer-class-name&gt;
+	     &lt;transformer-class-name&gt;org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer&lt;/transformer-class-name&gt;
 	     &lt;exclusive&gt;true&lt;/exclusive&gt;
 	  &lt;/divert&gt;
 	     </code>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/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 bfc3e2b..9a66c1f 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
@@ -58,7 +58,7 @@ public class DivertExample extends ActiveMQExample
       {
          // Step 1. Create an initial context to perform the JNDI lookup on the London server
          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/orders", "orders");
          properties.put("topic.topic/priceUpdates", "priceUpdates");
@@ -77,7 +77,7 @@ public class DivertExample extends ActiveMQExample
 
          // Step 6. Create an initial context to perform the JNDI lookup on the New York server
          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]);
          properties.put("topic.topic/newYorkPriceUpdates", "newYorkPriceUpdates");
          initialContextNewYork = new InitialContext(properties);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efbe4e62/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/broker.xml b/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
index 295f882..7c25065 100644
--- a/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
@@ -87,7 +87,7 @@ under the License.
             <address>jms.topic.priceUpdates</address>
             <forwarding-address>jms.queue.priceForwarding</forwarding-address>
             <filter string="office='New York'"/>
-            <transformer-class-name>org.apache.activemq.jms.example.AddForwardingTimeTransformer
+            <transformer-class-name>org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer
             </transformer-class-name>
             <exclusive>true</exclusive>
          </divert>

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


Mime
View raw message