diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md index 747632af68..c00fe101ef 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 diff --git a/docs/user-manual/en/configuring-transports.md b/docs/user-manual/en/configuring-transports.md index 7dd7c23fb5..cf046274dd 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. diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md index 92eabb0032..e8fbf0534a 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 diff --git a/docs/user-manual/en/interoperability.md b/docs/user-manual/en/interoperability.md index 914128da8b..d6b95358fd 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. diff --git a/docs/user-manual/en/large-messages.md b/docs/user-manual/en/large-messages.md index b9870a0d0d..281066c1ab 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 diff --git a/docs/user-manual/en/message-grouping.md b/docs/user-manual/en/message-grouping.md index 09d76d37dd..049efc7545 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 diff --git a/docs/user-manual/en/pre-acknowledge.md b/docs/user-manual/en/pre-acknowledge.md index a0daada710..b16a2d9917 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 diff --git a/docs/user-manual/en/thread-pooling.md b/docs/user-manual/en/thread-pooling.md index 9c24bb7561..2d3b8d1297 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 diff --git a/docs/user-manual/en/using-jms.md b/docs/user-manual/en/using-jms.md index 2ae15d4497..2ae78b6dd6 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 diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml index c27902e4b1..8f1dfba8ea 100644 --- a/examples/jms/aerogear/pom.xml +++ b/examples/jms/aerogear/pom.xml @@ -90,7 +90,7 @@ under the License. runClient - org.apache.activemq.jms.example.AerogearExample + org.apache.activemq.artemis.jms.example.AerogearExample tcp://localhost:61616 diff --git a/examples/jms/aerogear/src/main/resources/jndi.properties b/examples/jms/aerogear/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml index e91a9e0d9b..c3925bf538 100644 --- a/examples/jms/application-layer-failover/pom.xml +++ b/examples/jms/application-layer-failover/pom.xml @@ -78,7 +78,7 @@ under the License. runClient - org.apache.activemq.jms.example.ApplicationLayerFailoverExample + org.apache.activemq.artemis.jms.example.ApplicationLayerFailoverExample tcp://localhost:61616 tcp://localhost:61617 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 78120addd7..787524d190 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 properties = new Hashtable(); - 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); diff --git a/examples/jms/artemis-jms-examples-common/config/server.properties b/examples/jms/artemis-jms-examples-common/config/server.properties index 8d6cc7ab6c..cff66e28f5 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 diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml index 9e5bf122b4..c502c0eff9 100644 --- a/examples/jms/bridge/pom.xml +++ b/examples/jms/bridge/pom.xml @@ -82,7 +82,7 @@ under the License. runClient - org.apache.activemq.jms.example.BridgeExample + org.apache.activemq.artemis.jms.example.BridgeExample tcp://localhost:61616 tcp://localhost:61617 diff --git a/examples/jms/bridge/readme.html b/examples/jms/bridge/readme.html index 96b6c7f467..c511da44e0 100644 --- a/examples/jms/bridge/readme.html +++ b/examples/jms/bridge/readme.html @@ -61,7 +61,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> 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 2eccf54c7c..31120c4b6c 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 properties = new Hashtable(); - 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(); - 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); 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 cc79ef07a5..250a851c55 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. jms.queue.sausage-factory jms.queue.mincing-machine - org.apache.activemq.jms.example.HatColourChangeTransformer + org.apache.activemq.artemis.jms.example.HatColourChangeTransformer -1 remote-connector diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml index 8a5b8af6e9..6069e99af2 100644 --- a/examples/jms/browser/pom.xml +++ b/examples/jms/browser/pom.xml @@ -64,7 +64,7 @@ under the License. runClient - org.apache.activemq.jms.example.QueueBrowserExample + org.apache.activemq.artemis.jms.example.QueueBrowserExample tcp://localhost:61616 diff --git a/examples/jms/browser/src/main/resources/jndi.properties b/examples/jms/browser/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml index 1aca7094ed..7ca5550d83 100644 --- a/examples/jms/client-kickoff/pom.xml +++ b/examples/jms/client-kickoff/pom.xml @@ -95,7 +95,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClientKickoffExample + org.apache.activemq.artemis.jms.example.ClientKickoffExample tcp://localhost:61616 diff --git a/examples/jms/client-kickoff/readme.html b/examples/jms/client-kickoff/readme.html index 6b2732e8f8..0f6872d860 100644 --- a/examples/jms/client-kickoff/readme.html +++ b/examples/jms/client-kickoff/readme.html @@ -116,9 +116,9 @@ under the License.

Warnings be displayed on the server output:

-            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
+            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
diff --git a/examples/jms/client-kickoff/src/main/resources/jndi.properties b/examples/jms/client-kickoff/src/main/resources/jndi.properties index ed96c02136..5cbe72c798 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 diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml index f7a86f8cff..98e01bd747 100644 --- a/examples/jms/client-side-failoverlistener/pom.xml +++ b/examples/jms/client-side-failoverlistener/pom.xml @@ -98,7 +98,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClientSideFailoverListerExample + org.apache.activemq.artemis.jms.example.ClientSideFailoverListerExample exampleConfigDir 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 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml index 4e4206e236..29ffc2ad76 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. runClient - org.apache.activemq.jms.example.ClientSideLoadBalancingExample + org.apache.activemq.artemis.jms.example.ClientSideLoadBalancingExample exampleConfigDir 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 0aa403a679..d3f932c26e 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 diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml index b169bf5107..d8a993d6c3 100644 --- a/examples/jms/clustered-durable-subscription/pom.xml +++ b/examples/jms/clustered-durable-subscription/pom.xml @@ -89,7 +89,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClusteredDurableSubscriptionExample + org.apache.activemq.artemis.jms.example.ClusteredDurableSubscriptionExample tcp://localhost:61616 tcp://localhost:61617 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 cecf3ac1bf..ea0014f812 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 properties = new Hashtable(); - 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(); - 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); diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml index c772822891..7238790569 100644 --- a/examples/jms/clustered-grouping/pom.xml +++ b/examples/jms/clustered-grouping/pom.xml @@ -117,7 +117,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClusteredGroupingExample + org.apache.activemq.artemis.jms.example.ClusteredGroupingExample tcp://localhost:61616 tcp://localhost:61617 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 c5cd7909f2..a536ed5822 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 properties = new Hashtable(); - 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(); - 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(); - 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); diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml index 494211fab8..2c0fff4820 100644 --- a/examples/jms/clustered-jgroups/pom.xml +++ b/examples/jms/clustered-jgroups/pom.xml @@ -93,7 +93,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClusteredJgroupsExample + org.apache.activemq.artemis.jms.example.ClusteredJgroupsExample tcp://localhost:61616 tcp://localhost:61617 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 29892b93e1..b71bafd89d 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 properties = new Hashtable(); - 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(); - 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); 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 ed96c02136..5cbe72c798 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 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 b95f5a1101..7f579c1866 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 diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml index e009c1c657..22406775a5 100644 --- a/examples/jms/clustered-queue/pom.xml +++ b/examples/jms/clustered-queue/pom.xml @@ -89,7 +89,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClusteredQueueExample + org.apache.activemq.artemis.jms.example.ClusteredQueueExample tcp://localhost:61616 tcp://localhost:61617 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 9781771b8d..ad1d19b27a 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 properties = new Hashtable(); - 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(); - 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); diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml index cf7b1bc5d3..b823bc9326 100644 --- a/examples/jms/clustered-standalone/pom.xml +++ b/examples/jms/clustered-standalone/pom.xml @@ -105,7 +105,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClusteredStandaloneExample + org.apache.activemq.artemis.jms.example.ClusteredStandaloneExample tcp://localhost:61616 tcp://localhost:61617 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 fac5ba60eb..eb477f932e 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 properties = new Hashtable(); - 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(); - 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(); - 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); diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml index 2b51c7e4ce..12edbbbcac 100644 --- a/examples/jms/clustered-static-discovery/pom.xml +++ b/examples/jms/clustered-static-discovery/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.StaticClusteredQueueExample + org.apache.activemq.artemis.jms.example.StaticClusteredQueueExample tcp://localhost:61616 tcp://localhost:61617 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 abc26c2fe0..b7b57952ff 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 properties = new Hashtable(); - 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); diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml index 7f5e67c9c7..d5496ccde5 100644 --- a/examples/jms/clustered-static-oneway/pom.xml +++ b/examples/jms/clustered-static-oneway/pom.xml @@ -87,7 +87,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClusterStaticOnewayExample + org.apache.activemq.artemis.jms.example.ClusterStaticOnewayExample tcp://localhost:61616 tcp://localhost:61617 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 1bfe8585f0..21447f5cbc 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 properties = new Hashtable(); - 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); diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml index dc033206aa..157a4890b3 100644 --- a/examples/jms/clustered-topic/pom.xml +++ b/examples/jms/clustered-topic/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.ClusteredTopicExample + org.apache.activemq.artemis.jms.example.ClusteredTopicExample tcp://localhost:61616 tcp://localhost:61617 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 4378954d3f..9dc02ca4e8 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 properties = new Hashtable(); - 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(); - 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); diff --git a/examples/jms/colocated-failover-scale-down/pom.xml b/examples/jms/colocated-failover-scale-down/pom.xml index e6f0d7109f..f1fc4be1ea 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. runClient - org.apache.activemq.jms.example.ColocatedFailoverScaleDownExample + org.apache.activemq.artemis.jms.example.ColocatedFailoverScaleDownExample tcp://localhost:61616 tcp://localhost:61617 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 b4b8ce6f36..824e8c268a 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 properties = new Hashtable(); - 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(); - 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); diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml index a50b09ab61..0cce45dd47 100644 --- a/examples/jms/colocated-failover/pom.xml +++ b/examples/jms/colocated-failover/pom.xml @@ -89,7 +89,7 @@ under the License. runClient - org.apache.activemq.jms.example.ColocatedFailoverExample + org.apache.activemq.artemis.jms.example.ColocatedFailoverExample tcp://localhost:61616 tcp://localhost:61617 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 163faecf42..061c0d9ffc 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 properties = new Hashtable(); - 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(); - 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); diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml index 1e4236fbfb..adf10a8716 100644 --- a/examples/jms/consumer-rate-limit/pom.xml +++ b/examples/jms/consumer-rate-limit/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.ConsumerRateLimitExample + org.apache.activemq.artemis.jms.example.ConsumerRateLimitExample tcp://localhost:61616 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 c7c59beb86..74729fe114 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 diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml index 0f50f2d706..9149e906e3 100644 --- a/examples/jms/dead-letter/pom.xml +++ b/examples/jms/dead-letter/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.DeadLetterExample + org.apache.activemq.artemis.jms.example.DeadLetterExample tcp://localhost:61616 diff --git a/examples/jms/dead-letter/src/main/resources/jndi.properties b/examples/jms/dead-letter/src/main/resources/jndi.properties index ea5cd8207d..3e1a36612f 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 diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml index 5e8732edc9..5b0dfd9b7d 100644 --- a/examples/jms/delayed-redelivery/pom.xml +++ b/examples/jms/delayed-redelivery/pom.xml @@ -64,7 +64,7 @@ under the License. runClient - org.apache.activemq.jms.example.DelayedRedeliveryExample + org.apache.activemq.artemis.jms.example.DelayedRedeliveryExample tcp://localhost:61616 diff --git a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties b/examples/jms/delayed-redelivery/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml index 9037f0c03f..9f826eed4c 100644 --- a/examples/jms/divert/pom.xml +++ b/examples/jms/divert/pom.xml @@ -82,7 +82,7 @@ under the License. runClient - org.apache.activemq.jms.example.DivertExample + org.apache.activemq.artemis.jms.example.DivertExample tcp://localhost:61616 tcp://localhost:61617 diff --git a/examples/jms/divert/readme.html b/examples/jms/divert/readme.html index adcf0cae20..545f0b58c0 100644 --- a/examples/jms/divert/readme.html +++ b/examples/jms/divert/readme.html @@ -88,7 +88,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> + <transformer-class-name>org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer</transformer-class-name> <exclusive>true</exclusive> </divert> 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 bfc3e2b66c..9a66c1fd44 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 properties = new Hashtable(); - 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(); - 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); 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 295f882d75..7c25065111 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.
jms.topic.priceUpdates
jms.queue.priceForwarding - org.apache.activemq.jms.example.AddForwardingTimeTransformer + org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer true diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml index d4b4d4043b..12d2bed5ec 100644 --- a/examples/jms/durable-subscription/pom.xml +++ b/examples/jms/durable-subscription/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.DurableSubscriptionExample + org.apache.activemq.artemis.jms.example.DurableSubscriptionExample tcp://localhost:61616 diff --git a/examples/jms/durable-subscription/src/main/resources/jndi.properties b/examples/jms/durable-subscription/src/main/resources/jndi.properties index 560b0cbb83..54bed6dbdd 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 diff --git a/examples/jms/embedded-simple/pom.xml b/examples/jms/embedded-simple/pom.xml index 415b4cc4d7..93b36600ee 100644 --- a/examples/jms/embedded-simple/pom.xml +++ b/examples/jms/embedded-simple/pom.xml @@ -68,7 +68,7 @@ under the License. runClient - org.apache.activemq.jms.example.EmbeddedExample + org.apache.activemq.artemis.jms.example.EmbeddedExample tcp://localhost:61616 tcp://localhost:61616 diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml index 28dd040df6..94b50b44d1 100644 --- a/examples/jms/embedded/pom.xml +++ b/examples/jms/embedded/pom.xml @@ -68,7 +68,7 @@ under the License. runClient - org.apache.activemq.jms.example.EmbeddedExample + org.apache.activemq.artemis.jms.example.EmbeddedExample tcp://localhost:61616 tcp://localhost:61617 diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml index f5713c0534..3298454140 100644 --- a/examples/jms/expiry/pom.xml +++ b/examples/jms/expiry/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.ExpiryExample + org.apache.activemq.artemis.jms.example.ExpiryExample tcp://localhost:61616 diff --git a/examples/jms/expiry/src/main/resources/jndi.properties b/examples/jms/expiry/src/main/resources/jndi.properties index 00a4ce5c68..231fa3087e 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 diff --git a/examples/jms/ha-policy-autobackup/pom.xml b/examples/jms/ha-policy-autobackup/pom.xml index b750ad23aa..78e5555d23 100644 --- a/examples/jms/ha-policy-autobackup/pom.xml +++ b/examples/jms/ha-policy-autobackup/pom.xml @@ -89,7 +89,7 @@ under the License. runClient - org.apache.activemq.jms.example.HAPolicyAutoBackupExample + org.apache.activemq.artemis.jms.example.HAPolicyAutoBackupExample tcp://localhost:61616 tcp://localhost:61617 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 a2b43a20d6..37bc28a243 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 properties = new Hashtable(); - 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(); - 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); diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml index 71e62e79a3..032046613c 100644 --- a/examples/jms/http-transport/pom.xml +++ b/examples/jms/http-transport/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.HttpTransportExample + org.apache.activemq.artemis.jms.example.HttpTransportExample tcp://localhost:61616 diff --git a/examples/jms/http-transport/src/main/resources/jndi.properties b/examples/jms/http-transport/src/main/resources/jndi.properties index 939589a163..15dae0bb59 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 diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml index 1493eb1ebe..74e7dd5576 100644 --- a/examples/jms/instantiate-connection-factory/pom.xml +++ b/examples/jms/instantiate-connection-factory/pom.xml @@ -82,7 +82,7 @@ under the License. runClient - org.apache.activemq.jms.example.InstantiateConnectionFactoryExample + org.apache.activemq.artemis.jms.example.InstantiateConnectionFactoryExample tcp://localhost:61616 diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml index 4aa6c42438..38815942e4 100644 --- a/examples/jms/interceptor/pom.xml +++ b/examples/jms/interceptor/pom.xml @@ -77,7 +77,7 @@ under the License. runClient - org.apache.activemq.jms.example.InterceptorExample + org.apache.activemq.artemis.jms.example.InterceptorExample tcp://localhost:61616 diff --git a/examples/jms/interceptor/readme.html b/examples/jms/interceptor/readme.html index 8f4e188688..b262596f5c 100644 --- a/examples/jms/interceptor/readme.html +++ b/examples/jms/interceptor/readme.html @@ -45,7 +45,7 @@ under the License. <configuration> ... <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> ... </configuration> 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 b9d2c3c013..1ff8a1fc83 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. - org.apache.activemq.jms.example.SimpleInterceptor + org.apache.activemq.artemis.jms.example.SimpleInterceptor diff --git a/examples/jms/interceptor/src/main/resources/jndi.properties b/examples/jms/interceptor/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/jms-auto-closeable/pom.xml b/examples/jms/jms-auto-closeable/pom.xml index 2348f36d30..a669bb0a83 100644 --- a/examples/jms/jms-auto-closeable/pom.xml +++ b/examples/jms/jms-auto-closeable/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.JMSAutoCloseableExample + org.apache.activemq.artemis.jms.example.JMSAutoCloseableExample 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 4836ac892f..93537c415a 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 diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml index 63588f43e5..25f6e054f3 100644 --- a/examples/jms/jms-bridge/pom.xml +++ b/examples/jms/jms-bridge/pom.xml @@ -82,7 +82,7 @@ under the License. runClient - org.apache.activemq.jms.example.JMSBridgeExample + org.apache.activemq.artemis.jms.example.JMSBridgeExample tcp://localhost:61616 tcp://localhost:5455 diff --git a/examples/jms/jms-bridge/readme.html b/examples/jms/jms-bridge/readme.html index e76f3eebcb..0f167d7bd6 100644 --- a/examples/jms/jms-bridge/readme.html +++ b/examples/jms/jms-bridge/readme.html @@ -58,7 +58,7 @@ under the License. Bridge itself:

          <!-- The JMS Bridge -->
-         <bean name="JMSBridge" class="org.apache.activemq.jms.bridge.impl.JMSBridgeImpl">
+         <bean name="JMSBridge" class="org.apache.activemq.artemis.jms.bridge.impl.JMSBridgeImpl">
          ...
          </bean>
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 b2a92e3681..3947aa01e6 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 jndiProps = new Hashtable(); 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; diff --git a/examples/jms/jms-completion-listener/pom.xml b/examples/jms/jms-completion-listener/pom.xml index 787dd77152..2f51b5303d 100644 --- a/examples/jms/jms-completion-listener/pom.xml +++ b/examples/jms/jms-completion-listener/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.JMSCompletionListenerExample + org.apache.activemq.artemis.jms.example.JMSCompletionListenerExample 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 4836ac892f..93537c415a 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 diff --git a/examples/jms/jms-context/pom.xml b/examples/jms/jms-context/pom.xml index 3fa2f40b47..4accf30af2 100644 --- a/examples/jms/jms-context/pom.xml +++ b/examples/jms/jms-context/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.JMSContextExample + org.apache.activemq.artemis.jms.example.JMSContextExample diff --git a/examples/jms/jms-context/src/main/resources/jndi.properties b/examples/jms/jms-context/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml index 36b75035ed..3bded31419 100644 --- a/examples/jms/jms-shared-consumer/pom.xml +++ b/examples/jms/jms-shared-consumer/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.JMSSharedConsumerExample + org.apache.activemq.artemis.jms.example.JMSSharedConsumerExample tcp://localhost:61616 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 560b0cbb83..54bed6dbdd 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 diff --git a/examples/jms/jmx/pom.xml b/examples/jms/jmx/pom.xml index 626209b967..3fa52395ce 100644 --- a/examples/jms/jmx/pom.xml +++ b/examples/jms/jmx/pom.xml @@ -100,7 +100,7 @@ under the License. runClient - org.apache.activemq.jms.example.JMXExample + org.apache.activemq.artemis.jms.example.JMXExample diff --git a/examples/jms/jmx/src/main/resources/jndi.properties b/examples/jms/jmx/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/large-message/pom.xml b/examples/jms/large-message/pom.xml index b4be070613..8beadff248 100644 --- a/examples/jms/large-message/pom.xml +++ b/examples/jms/large-message/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.LargeMessageExample + org.apache.activemq.artemis.jms.example.LargeMessageExample exampleConfigDir diff --git a/examples/jms/large-message/src/main/resources/jndi.properties b/examples/jms/large-message/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/last-value-queue/pom.xml b/examples/jms/last-value-queue/pom.xml index d8085dec23..453a837731 100644 --- a/examples/jms/last-value-queue/pom.xml +++ b/examples/jms/last-value-queue/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.LastValueQueueExample + org.apache.activemq.artemis.jms.example.LastValueQueueExample 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 4836ac892f..93537c415a 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 diff --git a/examples/jms/management-notifications/pom.xml b/examples/jms/management-notifications/pom.xml index 3dda29805a..d1c8b0152e 100644 --- a/examples/jms/management-notifications/pom.xml +++ b/examples/jms/management-notifications/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.ManagementNotificationExample + org.apache.activemq.artemis.jms.example.ManagementNotificationExample diff --git a/examples/jms/management-notifications/src/main/resources/jndi.properties b/examples/jms/management-notifications/src/main/resources/jndi.properties index 230b95f3b1..258224578f 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 diff --git a/examples/jms/management/pom.xml b/examples/jms/management/pom.xml index 36722846b7..95ba0ff0de 100644 --- a/examples/jms/management/pom.xml +++ b/examples/jms/management/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.ManagementExample + org.apache.activemq.artemis.jms.example.ManagementExample diff --git a/examples/jms/management/src/main/resources/jndi.properties b/examples/jms/management/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml index 3f78368032..dcf47af6f2 100644 --- a/examples/jms/message-counters/pom.xml +++ b/examples/jms/message-counters/pom.xml @@ -95,7 +95,7 @@ under the License. runClient - org.apache.activemq.jms.example.MessageCounterExample + org.apache.activemq.artemis.jms.example.MessageCounterExample diff --git a/examples/jms/message-counters/src/main/resources/jndi.properties b/examples/jms/message-counters/src/main/resources/jndi.properties index 00a4ce5c68..231fa3087e 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 diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml index 6c8f168298..f7f8c7c3ea 100644 --- a/examples/jms/message-group/pom.xml +++ b/examples/jms/message-group/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.MessageGroupExample + org.apache.activemq.artemis.jms.example.MessageGroupExample diff --git a/examples/jms/message-group/src/main/resources/jndi.properties b/examples/jms/message-group/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml index 922e0f2937..bfb0797103 100644 --- a/examples/jms/message-group2/pom.xml +++ b/examples/jms/message-group2/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.MessageGroup2Example + org.apache.activemq.artemis.jms.example.MessageGroup2Example diff --git a/examples/jms/message-group2/src/main/resources/jndi.properties b/examples/jms/message-group2/src/main/resources/jndi.properties index 9108d84975..5adc898ad6 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 diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml index 6cb4f6459d..445660f582 100644 --- a/examples/jms/message-priority/pom.xml +++ b/examples/jms/message-priority/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.MessagePriorityExample + org.apache.activemq.artemis.jms.example.MessagePriorityExample diff --git a/examples/jms/message-priority/src/main/resources/jndi.properties b/examples/jms/message-priority/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml index 591c5612f2..31596182c3 100644 --- a/examples/jms/multiple-failover-failback/pom.xml +++ b/examples/jms/multiple-failover-failback/pom.xml @@ -117,7 +117,7 @@ under the License. runClient - org.apache.activemq.jms.example.MultipleFailoverFailbackExample + org.apache.activemq.artemis.jms.example.MultipleFailoverFailbackExample exampleConfigDir 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 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml index 92e521de0d..50ca4f94cd 100644 --- a/examples/jms/multiple-failover/pom.xml +++ b/examples/jms/multiple-failover/pom.xml @@ -117,7 +117,7 @@ under the License. runClient - org.apache.activemq.jms.example.MultipleFailoverExample + org.apache.activemq.artemis.jms.example.MultipleFailoverExample exampleConfigDir diff --git a/examples/jms/multiple-failover/src/main/resources/jndi.properties b/examples/jms/multiple-failover/src/main/resources/jndi.properties index 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml index 16f5d78c8b..a3af26e7c9 100644 --- a/examples/jms/no-consumer-buffering/pom.xml +++ b/examples/jms/no-consumer-buffering/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.NoConsumerBufferingExample + org.apache.activemq.artemis.jms.example.NoConsumerBufferingExample 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 fdc5940f2e..d9b77a6df8 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 diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml index 41e79b91b1..62a2ff7a4c 100644 --- a/examples/jms/non-transaction-failover/pom.xml +++ b/examples/jms/non-transaction-failover/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.NonTransactionFailoverExample + org.apache.activemq.artemis.jms.example.NonTransactionFailoverExample exampleConfigDir 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 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml index 92738bbab5..6594f43c5b 100644 --- a/examples/jms/openwire/pom.xml +++ b/examples/jms/openwire/pom.xml @@ -60,7 +60,7 @@ under the License. runClient - org.apache.activemq.jms.example.OpenWireExample + org.apache.activemq.artemis.jms.example.OpenWireExample diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml index 49c5e32756..ccb601afbe 100644 --- a/examples/jms/paging/pom.xml +++ b/examples/jms/paging/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.PagingExample + org.apache.activemq.artemis.jms.example.PagingExample diff --git a/examples/jms/paging/src/main/resources/jndi.properties b/examples/jms/paging/src/main/resources/jndi.properties index 5ce6ed4e8e..6f70010dc6 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 diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml index f3afbff9e1..1dbb3e4d60 100644 --- a/examples/jms/perf/pom.xml +++ b/examples/jms/perf/pom.xml @@ -146,7 +146,7 @@ under the License. - org.apache.activemq.jms.example.PerfListener + org.apache.activemq.artemis.jms.example.PerfListener @@ -169,7 +169,7 @@ under the License. - org.apache.activemq.jms.example.PerfSender + org.apache.activemq.artemis.jms.example.PerfSender diff --git a/examples/jms/perf/src/main/resources/jndi.properties b/examples/jms/perf/src/main/resources/jndi.properties index 3d1a38f21e..bcf6926185 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 diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml index e96d6588e3..85f90754b3 100644 --- a/examples/jms/pre-acknowledge/pom.xml +++ b/examples/jms/pre-acknowledge/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.PreacknowledgeExample + org.apache.activemq.artemis.jms.example.PreacknowledgeExample tcp://localhost:61616 diff --git a/examples/jms/pre-acknowledge/src/main/resources/jndi.properties b/examples/jms/pre-acknowledge/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml index bdc85f705b..4876db7604 100644 --- a/examples/jms/producer-rate-limit/pom.xml +++ b/examples/jms/producer-rate-limit/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.ProducerRateLimitExample + org.apache.activemq.artemis.jms.example.ProducerRateLimitExample 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 396f3fa263..0e42b2aafc 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 diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml index abc8623d82..bca89a290d 100644 --- a/examples/jms/proton-cpp/pom.xml +++ b/examples/jms/proton-cpp/pom.xml @@ -73,7 +73,7 @@ under the License. runClient - org.apache.activemq.jms.example.ProtonCPPExample + org.apache.activemq.artemis.jms.example.ProtonCPPExample diff --git a/examples/jms/proton-cpp/src/main/resources/jndi.properties b/examples/jms/proton-cpp/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml index b84f82f830..05d3c34aa2 100644 --- a/examples/jms/proton-j/pom.xml +++ b/examples/jms/proton-j/pom.xml @@ -73,7 +73,7 @@ under the License. runClient - org.apache.activemq.jms.example.ProtonJExample + org.apache.activemq.artemis.jms.example.ProtonJExample tcp://localhost:61616 diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml index b75e6ceb49..e937175434 100644 --- a/examples/jms/queue-message-redistribution/pom.xml +++ b/examples/jms/queue-message-redistribution/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.QueueMessageRedistributionExample + org.apache.activemq.artemis.jms.example.QueueMessageRedistributionExample tcp://localhost:61616 tcp://localhost:61617 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 ed3f6e17a7..b9eb17c030 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 properties = new Hashtable(); - 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(); - 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); diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml index ef1688dcbe..0442335561 100644 --- a/examples/jms/queue-requestor/pom.xml +++ b/examples/jms/queue-requestor/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.QueueRequestorExample + org.apache.activemq.artemis.jms.example.QueueRequestorExample diff --git a/examples/jms/queue-requestor/src/main/resources/jndi.properties b/examples/jms/queue-requestor/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml index d81321218f..73f245fd9e 100644 --- a/examples/jms/queue-selector/pom.xml +++ b/examples/jms/queue-selector/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.QueueSelectorExample + org.apache.activemq.artemis.jms.example.QueueSelectorExample diff --git a/examples/jms/queue-selector/src/main/resources/jndi.properties b/examples/jms/queue-selector/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml index 5848d7e6e0..f6f0aad5cc 100644 --- a/examples/jms/queue/pom.xml +++ b/examples/jms/queue/pom.xml @@ -73,7 +73,7 @@ under the License. runClient - org.apache.activemq.jms.example.QueueExample + org.apache.activemq.artemis.jms.example.QueueExample diff --git a/examples/jms/queue/src/main/resources/jndi.properties b/examples/jms/queue/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml index 2154f7225a..068dbc7465 100644 --- a/examples/jms/reattach-node/pom.xml +++ b/examples/jms/reattach-node/pom.xml @@ -67,7 +67,7 @@ under the License. runClient - org.apache.activemq.jms.example.ReattachExample + org.apache.activemq.artemis.jms.example.ReattachExample exampleConfigDir 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 b5c7705bf9..d60ba94d03 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 properties = new Hashtable(); - 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"); diff --git a/examples/jms/reattach-node/src/main/resources/jndi.properties b/examples/jms/reattach-node/src/main/resources/jndi.properties index d3fc2ee5f0..b6f8ff841a 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 diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml index 51b0a24b21..519fe40aff 100644 --- a/examples/jms/replicated-failback-static/pom.xml +++ b/examples/jms/replicated-failback-static/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.ReplicatedFailbackStaticExample + org.apache.activemq.artemis.jms.example.ReplicatedFailbackStaticExample exampleConfigDir 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 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml index b77a3485b6..45bbd23e85 100644 --- a/examples/jms/replicated-failback/pom.xml +++ b/examples/jms/replicated-failback/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.ReplicatedFailbackExample + org.apache.activemq.artemis.jms.example.ReplicatedFailbackExample exampleConfigDir diff --git a/examples/jms/replicated-failback/src/main/resources/jndi.properties b/examples/jms/replicated-failback/src/main/resources/jndi.properties index 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml index 497c0e30b9..9c95b19319 100644 --- a/examples/jms/replicated-multiple-failover/pom.xml +++ b/examples/jms/replicated-multiple-failover/pom.xml @@ -117,7 +117,7 @@ under the License. runClient - org.apache.activemq.jms.example.ReplicatedMultipleFailoverExample + org.apache.activemq.artemis.jms.example.ReplicatedMultipleFailoverExample exampleConfigDir 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 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml index 0dc9d07bc0..ac4dcd8752 100644 --- a/examples/jms/replicated-transaction-failover/pom.xml +++ b/examples/jms/replicated-transaction-failover/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.ReplicatedTransactionFailoverExample + org.apache.activemq.artemis.jms.example.ReplicatedTransactionFailoverExample exampleConfigDir 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 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml index a16d881b41..c6402176a7 100644 --- a/examples/jms/request-reply/pom.xml +++ b/examples/jms/request-reply/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.RequestReplyExample + org.apache.activemq.artemis.jms.example.RequestReplyExample diff --git a/examples/jms/request-reply/src/main/resources/jndi.properties b/examples/jms/request-reply/src/main/resources/jndi.properties index 07c84f2410..7f7a19f280 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 diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml index a6869cd75d..9801db34a0 100644 --- a/examples/jms/scale-down/pom.xml +++ b/examples/jms/scale-down/pom.xml @@ -89,7 +89,7 @@ under the License. runClient - org.apache.activemq.jms.example.ScaleDownExample + org.apache.activemq.artemis.jms.example.ScaleDownExample tcp://localhost:61616 tcp://localhost:61617 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 06251c238a..05ba849686 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 properties = new Hashtable(); - 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(); - 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); diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml index 88d3340e2f..f3fec4a5d3 100644 --- a/examples/jms/scheduled-message/pom.xml +++ b/examples/jms/scheduled-message/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.ScheduledMessageExample + org.apache.activemq.artemis.jms.example.ScheduledMessageExample diff --git a/examples/jms/scheduled-message/src/main/resources/jndi.properties b/examples/jms/scheduled-message/src/main/resources/jndi.properties index 4836ac892f..93537c415a 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 diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml index 49d09c4631..81a3268a28 100644 --- a/examples/jms/security/pom.xml +++ b/examples/jms/security/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.SecurityExample + org.apache.activemq.artemis.jms.example.SecurityExample diff --git a/examples/jms/security/src/main/resources/jndi.properties b/examples/jms/security/src/main/resources/jndi.properties index c99ee9f020..0a3b640261 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 diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml index 8401190b6f..86cc852d66 100644 --- a/examples/jms/send-acknowledgements/pom.xml +++ b/examples/jms/send-acknowledgements/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.SendAcknowledgementsExample + org.apache.activemq.artemis.jms.example.SendAcknowledgementsExample diff --git a/examples/jms/send-acknowledgements/src/main/resources/jndi.properties b/examples/jms/send-acknowledgements/src/main/resources/jndi.properties index 612dd06af8..8421f257d4 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 diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml index c25b9326c3..6e2bc9fefc 100644 --- a/examples/jms/spring-integration/pom.xml +++ b/examples/jms/spring-integration/pom.xml @@ -67,7 +67,7 @@ under the License. runClient - org.apache.activemq.jms.example.SpringExample + org.apache.activemq.artemis.jms.example.SpringExample 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 68d1f945c4..a67de7393d 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. - + diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml index 9a49a0ec0b..6dea2e33c1 100644 --- a/examples/jms/ssl-enabled/pom.xml +++ b/examples/jms/ssl-enabled/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.SSLExample + org.apache.activemq.artemis.jms.example.SSLExample diff --git a/examples/jms/ssl-enabled/src/main/resources/jndi.properties b/examples/jms/ssl-enabled/src/main/resources/jndi.properties index 3ef33e683a..7929c7c4fa 100644 --- a/examples/jms/ssl-enabled/src/main/resources/jndi.properties +++ b/examples/jms/ssl-enabled/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:5500?sslEnabled=true&trustStorePath=activemq/server0/activemq.example.truststore&trustStorePassword=activemqexample queue.queue/exampleQueue=exampleQueue diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml index 77e63f053e..fb34504ff8 100644 --- a/examples/jms/static-selector-jms/pom.xml +++ b/examples/jms/static-selector-jms/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.StaticSelectorJMSExample + org.apache.activemq.artemis.jms.example.StaticSelectorJMSExample tcp://localhost:61616 diff --git a/examples/jms/static-selector-jms/src/main/resources/jndi.properties b/examples/jms/static-selector-jms/src/main/resources/jndi.properties index 4836ac892f..93537c415a 100644 --- a/examples/jms/static-selector-jms/src/main/resources/jndi.properties +++ b/examples/jms/static-selector-jms/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 diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml index a8dbd43bc7..b8698860bd 100644 --- a/examples/jms/static-selector/pom.xml +++ b/examples/jms/static-selector/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.StaticSelectorExample + org.apache.activemq.artemis.jms.example.StaticSelectorExample diff --git a/examples/jms/static-selector/src/main/resources/jndi.properties b/examples/jms/static-selector/src/main/resources/jndi.properties index 4836ac892f..93537c415a 100644 --- a/examples/jms/static-selector/src/main/resources/jndi.properties +++ b/examples/jms/static-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 diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml index 0281a0ab9b..a168b30325 100644 --- a/examples/jms/stomp-websockets/pom.xml +++ b/examples/jms/stomp-websockets/pom.xml @@ -67,7 +67,7 @@ under the License. runClient - org.apache.activemq.jms.example.StompWebSocketExample + org.apache.activemq.artemis.jms.example.StompWebSocketExample tcp://localhost:61616 diff --git a/examples/jms/stomp-websockets/src/main/resources/jndi.properties b/examples/jms/stomp-websockets/src/main/resources/jndi.properties index be7c985509..1828f84154 100644 --- a/examples/jms/stomp-websockets/src/main/resources/jndi.properties +++ b/examples/jms/stomp-websockets/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/chat=chat diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml index a4adf6fcad..98d0796700 100644 --- a/examples/jms/stomp/pom.xml +++ b/examples/jms/stomp/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.StompExample + org.apache.activemq.artemis.jms.example.StompExample diff --git a/examples/jms/stomp/src/main/resources/jndi.properties b/examples/jms/stomp/src/main/resources/jndi.properties index 4836ac892f..93537c415a 100644 --- a/examples/jms/stomp/src/main/resources/jndi.properties +++ b/examples/jms/stomp/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 diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml index 1644a7e4f4..1946dbe7dc 100644 --- a/examples/jms/stomp1.1/pom.xml +++ b/examples/jms/stomp1.1/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.StompExample + org.apache.activemq.artemis.jms.example.StompExample diff --git a/examples/jms/stomp1.1/src/main/resources/jndi.properties b/examples/jms/stomp1.1/src/main/resources/jndi.properties index 4836ac892f..93537c415a 100644 --- a/examples/jms/stomp1.1/src/main/resources/jndi.properties +++ b/examples/jms/stomp1.1/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 diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml index ac8a27bffa..c25b1d7923 100644 --- a/examples/jms/stomp1.2/pom.xml +++ b/examples/jms/stomp1.2/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.StompExample + org.apache.activemq.artemis.jms.example.StompExample diff --git a/examples/jms/stomp1.2/src/main/resources/jndi.properties b/examples/jms/stomp1.2/src/main/resources/jndi.properties index 4836ac892f..93537c415a 100644 --- a/examples/jms/stomp1.2/src/main/resources/jndi.properties +++ b/examples/jms/stomp1.2/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 diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml index c27e4793ca..7a5e9cd179 100644 --- a/examples/jms/stop-server-failover/pom.xml +++ b/examples/jms/stop-server-failover/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.StopServerFailoverExample + org.apache.activemq.artemis.jms.example.StopServerFailoverExample tcp://localhost:61616 tcp://localhost:61617 diff --git a/examples/jms/stop-server-failover/src/main/resources/jndi.properties b/examples/jms/stop-server-failover/src/main/resources/jndi.properties index 07c84f2410..7f7a19f280 100644 --- a/examples/jms/stop-server-failover/src/main/resources/jndi.properties +++ b/examples/jms/stop-server-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 diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml index 6777edc202..9c1d2ddaa1 100644 --- a/examples/jms/symmetric-cluster/pom.xml +++ b/examples/jms/symmetric-cluster/pom.xml @@ -177,7 +177,7 @@ under the License. runClient - org.apache.activemq.jms.example.SymmetricClusterExample + org.apache.activemq.artemis.jms.example.SymmetricClusterExample tcp://localhost:61616 tcp://localhost:61617 diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml index df145d0571..7d598aea1a 100644 --- a/examples/jms/temp-queue/pom.xml +++ b/examples/jms/temp-queue/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.TemporaryQueueExample + org.apache.activemq.artemis.jms.example.TemporaryQueueExample diff --git a/examples/jms/temp-queue/src/main/resources/jndi.properties b/examples/jms/temp-queue/src/main/resources/jndi.properties index 4836ac892f..93537c415a 100644 --- a/examples/jms/temp-queue/src/main/resources/jndi.properties +++ b/examples/jms/temp-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 diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml index e45cd83348..12af5e1051 100644 --- a/examples/jms/topic-hierarchies/pom.xml +++ b/examples/jms/topic-hierarchies/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.TopicHierarchyExample + org.apache.activemq.artemis.jms.example.TopicHierarchyExample diff --git a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties index ed96c02136..5cbe72c798 100644 --- a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties +++ b/examples/jms/topic-hierarchies/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 diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml index 6ef0b1161d..0ef6ea9663 100644 --- a/examples/jms/topic-selector-example1/pom.xml +++ b/examples/jms/topic-selector-example1/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.TopicSelectorExample1 + org.apache.activemq.artemis.jms.example.TopicSelectorExample1 diff --git a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties b/examples/jms/topic-selector-example1/src/main/resources/jndi.properties index 560b0cbb83..54bed6dbdd 100644 --- a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties +++ b/examples/jms/topic-selector-example1/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 diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml index 742d692aa1..68bb1847ed 100644 --- a/examples/jms/topic-selector-example2/pom.xml +++ b/examples/jms/topic-selector-example2/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.TopicSelectorExample2 + org.apache.activemq.artemis.jms.example.TopicSelectorExample2 diff --git a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties b/examples/jms/topic-selector-example2/src/main/resources/jndi.properties index 560b0cbb83..54bed6dbdd 100644 --- a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties +++ b/examples/jms/topic-selector-example2/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 diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml index e259b9313e..96d5936638 100644 --- a/examples/jms/topic/pom.xml +++ b/examples/jms/topic/pom.xml @@ -71,7 +71,7 @@ under the License. runClient - org.apache.activemq.jms.example.TopicExample + org.apache.activemq.artemis.jms.example.TopicExample tcp://localhost:61616 diff --git a/examples/jms/topic/src/main/resources/jndi.properties b/examples/jms/topic/src/main/resources/jndi.properties index 560b0cbb83..54bed6dbdd 100644 --- a/examples/jms/topic/src/main/resources/jndi.properties +++ b/examples/jms/topic/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 diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml index cf4254eb07..2b9869fa93 100644 --- a/examples/jms/transaction-failover/pom.xml +++ b/examples/jms/transaction-failover/pom.xml @@ -97,7 +97,7 @@ under the License. runClient - org.apache.activemq.jms.example.TransactionFailoverExample + org.apache.activemq.artemis.jms.example.TransactionFailoverExample exampleConfigDir diff --git a/examples/jms/transaction-failover/src/main/resources/jndi.properties b/examples/jms/transaction-failover/src/main/resources/jndi.properties index 07c84f2410..7f7a19f280 100644 --- a/examples/jms/transaction-failover/src/main/resources/jndi.properties +++ b/examples/jms/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 diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml index 22adc90171..c0697bdb0e 100644 --- a/examples/jms/transactional/pom.xml +++ b/examples/jms/transactional/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.TransactionalExample + org.apache.activemq.artemis.jms.example.TransactionalExample diff --git a/examples/jms/transactional/src/main/resources/jndi.properties b/examples/jms/transactional/src/main/resources/jndi.properties index 4836ac892f..93537c415a 100644 --- a/examples/jms/transactional/src/main/resources/jndi.properties +++ b/examples/jms/transactional/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 diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml index 31fe3f65a1..5306fd4037 100644 --- a/examples/jms/xa-heuristic/pom.xml +++ b/examples/jms/xa-heuristic/pom.xml @@ -90,7 +90,7 @@ under the License. runClient - org.apache.activemq.jms.example.XAHeuristicExample + org.apache.activemq.artemis.jms.example.XAHeuristicExample diff --git a/examples/jms/xa-heuristic/src/main/resources/jndi.properties b/examples/jms/xa-heuristic/src/main/resources/jndi.properties index 79d8e1a018..77561f7538 100644 --- a/examples/jms/xa-heuristic/src/main/resources/jndi.properties +++ b/examples/jms/xa-heuristic/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 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF queue.queue/exampleQueue=exampleQueue diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml index 81a1b44429..1d6e9768cb 100644 --- a/examples/jms/xa-receive/pom.xml +++ b/examples/jms/xa-receive/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.XAReceiveExample + org.apache.activemq.artemis.jms.example.XAReceiveExample diff --git a/examples/jms/xa-receive/src/main/resources/jndi.properties b/examples/jms/xa-receive/src/main/resources/jndi.properties index 79d8e1a018..77561f7538 100644 --- a/examples/jms/xa-receive/src/main/resources/jndi.properties +++ b/examples/jms/xa-receive/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 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF queue.queue/exampleQueue=exampleQueue diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml index 2052a8b8fd..b24944c2cb 100644 --- a/examples/jms/xa-send/pom.xml +++ b/examples/jms/xa-send/pom.xml @@ -72,7 +72,7 @@ under the License. runClient - org.apache.activemq.jms.example.XASendExample + org.apache.activemq.artemis.jms.example.XASendExample diff --git a/examples/jms/xa-send/src/main/resources/jndi.properties b/examples/jms/xa-send/src/main/resources/jndi.properties index 79d8e1a018..77561f7538 100644 --- a/examples/jms/xa-send/src/main/resources/jndi.properties +++ b/examples/jms/xa-send/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 connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF queue.queue/exampleQueue=exampleQueue diff --git a/examples/soak/normal/pom.xml b/examples/soak/normal/pom.xml index 7c0c4b904c..b63f780da2 100644 --- a/examples/soak/normal/pom.xml +++ b/examples/soak/normal/pom.xml @@ -108,7 +108,7 @@ under the License. runClient - org.apache.activemq.jms.soak.example.SoakReceiver + org.apache.activemq.artemis.jms.soak.example.SoakReceiver tcp://localhost:61616 @@ -120,7 +120,7 @@ under the License. runClient - org.apache.activemq.jms.soak.example.SoakSender + org.apache.activemq.artemis.jms.soak.example.SoakSender tcp://localhost:61616 @@ -154,7 +154,7 @@ under the License. runClient - org.apache.activemq.jms.soak.example.SoakReceiver + org.apache.activemq.artemis.jms.soak.example.SoakReceiver tcp://localhost:61616 @@ -166,7 +166,7 @@ under the License. runClient - org.apache.activemq.jms.soak.example.SoakSender + org.apache.activemq.artemis.jms.soak.example.SoakSender tcp://localhost:61616 diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java index 5e22c9b2d9..3099d851c7 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakReceiver.java @@ -65,7 +65,7 @@ public class SoakReceiver Hashtable jndiProps = new Hashtable(); jndiProps.put("connectionFactory.ConnectionFactory", jndiURL); - jndiProps.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + jndiProps.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory"); final SoakReceiver receiver = new SoakReceiver(jndiProps, params); diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java index 7f51a5391a..64b60ac8e0 100644 --- a/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java +++ b/examples/soak/normal/src/main/java/org/apache/activemq/artemis/jms/soak/example/SoakSender.java @@ -56,7 +56,7 @@ public class SoakSender Hashtable jndiProps = new Hashtable(); jndiProps.put("connectionFactory.ConnectionFactory", jndiURL); - jndiProps.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + jndiProps.put("java.naming.factory.initial", "org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory"); final SoakSender sender = new SoakSender(jndiProps, params);