http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml index c24e03b..847659f 100644 --- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,51 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <!--the connection factories used by the example--> - - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - - <!-- When the server is cleanly shutdown we don't want to give up, we want to continue - to try to reconnect --> - <failover-on-server-shutdown>true</failover-on-server-shutdown> - - <!-- We need to specify a confirmation-window-size to enable re-attachment, default is -1 which - means no re-attachment --> - <confirmation-window-size>1048576</confirmation-window-size> - - </connection-factory> - - <!-- This is used by the example to send the management operations, it's not central to the example --> - <connection-factory name="ConnectionFactory2"> - <connectors> - <connector-ref connector-name="netty-connector2"/> - </connectors> - <entries> - <entry name="ConnectionFactory2"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-failback-static/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml index 6617de1..631b40f 100644 --- a/examples/jms/replicated-failback-static/pom.xml +++ b/examples/jms/replicated-failback-static/pom.xml @@ -79,8 +79,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ReplicatedFailbackStaticExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> + <param>tcp://localhost:5445</param> + <param>tcp://localhost:5446</param> </args> <systemProperties> <property> @@ -145,11 +145,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java index d9220b9..73edb7e 100644 --- a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java +++ b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java @@ -58,8 +58,8 @@ public class ReplicatedFailbackStaticExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Look up the JMS resources from JNDI - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); - ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); + ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 3. Create a JMS Connection connection = connectionFactory.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml index 889b59d..0d5c953 100644 --- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,33 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml index c3b0393..0d5c953 100644 --- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,32 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-failback/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml index 570e4d8..1aa611d 100644 --- a/examples/jms/replicated-failback/pom.xml +++ b/examples/jms/replicated-failback/pom.xml @@ -79,8 +79,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ReplicatedFailbackExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> + <param>tcp://localhost:5445</param> + <param>tcp://localhost:5446</param> </args> <systemProperties> <property> @@ -145,11 +145,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java index 7105a35..d216f0f 100644 --- a/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java +++ b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java @@ -58,8 +58,8 @@ public class ReplicatedFailbackExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Look up the JMS resources from JNDI - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); - ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); + ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 3. Create a JMS Connection connection = connectionFactory.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml index 889b59d..0d5c953 100644 --- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,33 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml index c3b0393..0d5c953 100644 --- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,32 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-multiple-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml index e6c503a..1afd8ab 100644 --- a/examples/jms/replicated-multiple-failover/pom.xml +++ b/examples/jms/replicated-multiple-failover/pom.xml @@ -101,9 +101,9 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ReplicatedMultipleFailoverExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> - <param>jnp://localhost:1299</param> + <param>tcp://localhost:5445</param> + <param>tcp://localhost:5446</param> + <param>tcp://localhost:5447</param> </args> <systemProperties> <property> @@ -177,11 +177,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java index 0512690..5ca8ffb 100644 --- a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java +++ b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java @@ -55,8 +55,8 @@ public class ReplicatedMultipleFailoverExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Look up the JMS resources from JNDI - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); - ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); + ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 3. Create a JMS Connection connection = connectionFactory.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml index 889b59d..0d5c953 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,33 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml index c3b0393..0d5c953 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,32 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml index 41d711b..0d5c953 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml @@ -1,32 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-transaction-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml index 02f9ea8..5d1dc03 100644 --- a/examples/jms/replicated-transaction-failover/pom.xml +++ b/examples/jms/replicated-transaction-failover/pom.xml @@ -79,8 +79,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ReplicatedTransactionFailoverExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> + <param>tcp://localhost:5445</param> + <param>tcp://localhost:5446</param> </args> <systemProperties> <property> @@ -145,11 +145,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java index 3d2912e..fe0e9d1 100644 --- a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java +++ b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java @@ -57,8 +57,8 @@ public class ReplicatedTransactionFailoverExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Look-up the JMS resources from JNDI - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); - ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); + ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 3. We create a JMS Connection connection = connectionFactory.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml index a4c9e68..0d5c953 100644 --- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,31 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml index a4c9e68..0d5c953 100644 --- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,31 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/request-reply/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml index 3c50986..72fcd0a 100644 --- a/examples/jms/request-reply/pom.xml +++ b/examples/jms/request-reply/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.RequestReplyExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -99,11 +99,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java b/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java index a020f00..cd73411 100644 --- a/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java +++ b/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java @@ -70,10 +70,10 @@ public class RequestReplyExample extends ActiveMQExample initialContext = getContext(0); // Step 3. Lookup the queue for sending the request message - Queue requestQueue = (Queue)initialContext.lookup("/queue/exampleQueue"); + Queue requestQueue = (Queue)initialContext.lookup("queue/exampleQueue"); // Step 4. Lookup for the Connection Factory - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 5. Create a JMS Connection connection = cf.createConnection(); @@ -165,10 +165,10 @@ public class RequestReplyExample extends ActiveMQExample InitialContext initialContext = getContext(0); // Lookup the queue to receive the request message - Queue requestQueue = (Queue)initialContext.lookup("/queue/exampleQueue"); + Queue requestQueue = (Queue)initialContext.lookup("queue/exampleQueue"); // Lookup for the Connection Factory - ConnectionFactory cfact = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + ConnectionFactory cfact = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Create a connection connection = cfact.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml index 452b958..847659f 100644 --- a/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml index 873f44c..1dd3114 100644 --- a/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml +++ b/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="orders"> - <entry name="/queues/orders"/> - </queue> + <queue name="orders"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml b/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml index 03f0a97..b19f027 100644 --- a/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml +++ b/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <topic name="chat"> - <entry name="/topic/chat"/> - </topic> + <topic name="chat"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml index 873f44c..1dd3114 100644 --- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml +++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="orders"> - <entry name="/queues/orders"/> - </queue> + <queue name="orders"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/rest/push/src/main/resources/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/rest/push/src/main/resources/activemq-jms.xml b/examples/jms/rest/push/src/main/resources/activemq-jms.xml index e4ade20..1814447 100644 --- a/examples/jms/rest/push/src/main/resources/activemq-jms.xml +++ b/examples/jms/rest/push/src/main/resources/activemq-jms.xml @@ -1,22 +1,9 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> - <!--the queue used by the example--> - <queue name="orders"> - <entry name="/queues/orders"/> - </queue> - <queue name="shipping"> - <entry name="/queues/shipping"/> - </queue> + <!--the queues used by the example--> + <queue name="orders"/> + <queue name="shipping"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/scale-down/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml index 4264551..f9a23af 100644 --- a/examples/jms/scale-down/pom.xml +++ b/examples/jms/scale-down/pom.xml @@ -71,8 +71,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ScaleDownExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> + <param>tcp://localhost:5445</param> + <param>tcp://localhost:5446</param> </args> <systemProperties> <property> @@ -137,11 +137,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java b/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java index ad9f48e..d942b79 100644 --- a/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java +++ b/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java @@ -56,9 +56,9 @@ public class ScaleDownExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Look up the JMS resources from JNDI - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); - ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); - ConnectionFactory connectionFactory1 = (ConnectionFactory)initialContext1.lookup("/ConnectionFactory"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); + ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); + ConnectionFactory connectionFactory1 = (ConnectionFactory)initialContext1.lookup("ConnectionFactory"); // Step 3. Create a JMS Connections connection = connectionFactory.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml index 2bf8233..847659f 100644 --- a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,30 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml index 2bf8233..847659f 100644 --- a/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,30 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <ha>true</ha> - <!-- Pause 1 second between connect attempts --> - <retry-interval>1000</retry-interval> - - <!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to - implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect - pause is the same length --> - <retry-interval-multiplier>1.0</retry-interval-multiplier> - - <!-- Try reconnecting an unlimited number of times (-1 means "unlimited") --> - <reconnect-attempts>-1</reconnect-attempts> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/scheduled-message/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml index ba480a8..83f1a67 100644 --- a/examples/jms/scheduled-message/pom.xml +++ b/examples/jms/scheduled-message/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ScheduledMessageExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -99,11 +99,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java index 2211aad..92ece47 100644 --- a/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java +++ b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java @@ -54,10 +54,10 @@ public class ScheduledMessageExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Perfom a lookup on the queue - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); // Step 3. Perform a lookup on the Connection Factory - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 4.Create a JMS Connection connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml index 452b958..847659f 100644 --- a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/security/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml index d943938..8eb47f8 100644 --- a/examples/jms/security/pom.xml +++ b/examples/jms/security/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.SecurityExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -99,11 +99,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java b/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java index 45375e0..9a699fb 100644 --- a/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java +++ b/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java @@ -58,12 +58,12 @@ public class SecurityExample extends ActiveMQExample initialContext = getContext(0); // Step 2. perform lookup on the topics - Topic genericTopic = (Topic)initialContext.lookup("/topic/genericTopic"); - Topic europeTopic = (Topic)initialContext.lookup("/topic/europeTopic"); - Topic usTopic = (Topic)initialContext.lookup("/topic/usTopic"); + Topic genericTopic = (Topic)initialContext.lookup("topic/genericTopic"); + Topic europeTopic = (Topic)initialContext.lookup("topic/europeTopic"); + Topic usTopic = (Topic)initialContext.lookup("topic/usTopic"); // Step 3. perform a lookup on the Connection Factory - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 4. Try to create a JMS Connection without user/password. It will fail. try http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml index d2d6100..74a9f79 100644 --- a/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,28 +1,11 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <block-on-durable-send>true</block-on-durable-send> - <block-on-non-durable-send>true</block-on-non-durable-send> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> - <topic name="genericTopic"> - <entry name="/topic/genericTopic"/> - </topic> + <topic name="genericTopic"/> - <topic name="news.europe.europeTopic"> - <entry name="/topic/europeTopic"/> - </topic> + <topic name="news.europe.europeTopic"/> - <topic name="news.us.usTopic"> - <entry name="/topic/usTopic"/> - </topic> + <topic name="news.us.usTopic"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/send-acknowledgements/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml index 07485c6..9a766ca 100644 --- a/examples/jms/send-acknowledgements/pom.xml +++ b/examples/jms/send-acknowledgements/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.SendAcknowledgementsExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -99,11 +99,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java index a0dc06b..31c284e 100644 --- a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java +++ b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java @@ -58,10 +58,10 @@ public class SendAcknowledgementsExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Perfom a lookup on the queue - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); // Step 3. Perform a lookup on the Connection Factory - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 4. Create a JMS Connection connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml index 6bbe84e..0d5c953 100644 --- a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,20 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <confirmation-window-size>1048576</confirmation-window-size> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml index b0ec32c..22db0f2 100644 --- a/examples/jms/spring-integration/pom.xml +++ b/examples/jms/spring-integration/pom.xml @@ -47,7 +47,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.SpringExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -88,11 +88,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/spring-integration/src/main/resources/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/spring-integration/src/main/resources/activemq-jms.xml b/examples/jms/spring-integration/src/main/resources/activemq-jms.xml index bce97ab..3758989 100644 --- a/examples/jms/spring-integration/src/main/resources/activemq-jms.xml +++ b/examples/jms/spring-integration/src/main/resources/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/ssl-enabled/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml index 8ff5d64..8fe2534 100644 --- a/examples/jms/ssl-enabled/pom.xml +++ b/examples/jms/ssl-enabled/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.SSLExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -99,11 +99,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java index 520ba7f..e025afd 100644 --- a/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java +++ b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java @@ -50,10 +50,10 @@ public class SSLExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Perfom a lookup on the queue - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); // Step 3. Perform a lookup on the Connection Factory - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 4.Create a JMS Connection connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml index cc01481..0d5c953 100644 --- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-ssl-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/static-selector-jms/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml index f687e76..ba5cd8a 100644 --- a/examples/jms/static-selector-jms/pom.xml +++ b/examples/jms/static-selector-jms/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.StaticSelectorJMSExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -99,11 +99,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java index cba4367..7b976e4 100644 --- a/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java +++ b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java @@ -55,10 +55,10 @@ public class StaticSelectorJMSExample extends ActiveMQExample initialContext = getContext(0); // Step 2. look-up the JMS queue object from JNDI, this is the queue that has filter configured with it. - Queue queue = (Queue)initialContext.lookup("/queue/selectorQueue"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); // Step 3. look-up the JMS connection factory object from JNDI - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 4. Create a JMS Connection connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml index aa9dbf4..c618cfb 100644 --- a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,19 +1,9 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="selectorQueue"> - <entry name="/queue/selectorQueue"/> + <queue name="exampleQueue"> <selector string="color='red'"/> </queue> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/static-selector/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml index b8019cf..a8a3f37 100644 --- a/examples/jms/static-selector/pom.xml +++ b/examples/jms/static-selector/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.StaticSelectorExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -99,11 +99,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java b/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java index cc23297..11cc7b3 100644 --- a/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java +++ b/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java @@ -55,10 +55,10 @@ public class StaticSelectorExample extends ActiveMQExample initialContext = getContext(0); // Step 2. look-up the JMS queue object from JNDI, this is the queue that has filter configured with it. - Queue queue = (Queue)initialContext.lookup("/queue/selectorQueue"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); // Step 3. look-up the JMS connection factory object from JNDI - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 4. Create a JMS Connection connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml index 1bf18ff..847659f 100644 --- a/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="selectorQueue"> - <entry name="/queue/selectorQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp-websockets/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml index cae3206..3d56027 100644 --- a/examples/jms/stomp-websockets/pom.xml +++ b/examples/jms/stomp-websockets/pom.xml @@ -47,7 +47,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.StompWebSocketExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> <systemProperties> <property> @@ -108,11 +108,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java index 51bdb82..dac21d9 100644 --- a/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java +++ b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java @@ -50,8 +50,8 @@ public class StompWebSocketExample extends ActiveMQExample try { initialContext = getContext(0); - Topic topic = (Topic)initialContext.lookup("/topic/chat"); - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + Topic topic = (Topic)initialContext.lookup("topic/chat"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); connection = cf.createConnection(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml index c872ad6..048f5d2 100644 --- a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the topic used by the example--> - <topic name="chat"> - <entry name="/topic/chat"/> - </topic> + <topic name="chat"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml index 61e4535..ebf7049 100644 --- a/examples/jms/stomp/pom.xml +++ b/examples/jms/stomp/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.StompExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -104,11 +104,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java index 0b2c59a..a27ae30 100644 --- a/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java +++ b/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java @@ -91,8 +91,8 @@ public class StompExample extends ActiveMQExample initialContext = getContext(0); // Step 7. Perform a lookup on the queue and the connection factory - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 8.Create a JMS Connection, Session and a MessageConsumer on the queue connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-jms.xml index 3058fc8..0d5c953 100644 --- a/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp1.1/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml index 71ace4a..251f5c8 100644 --- a/examples/jms/stomp1.1/pom.xml +++ b/examples/jms/stomp1.1/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.StompExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -104,11 +104,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java index 06f6bff..35309c0 100644 --- a/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java +++ b/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java @@ -98,8 +98,8 @@ public class StompExample extends ActiveMQExample initialContext = getContext(0); // Step 7. Perform a lookup on the queue and the connection factory - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 8.Create a JMS Connection, Session and a MessageConsumer on the queue connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml index 3058fc8..0d5c953 100644 --- a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,19 +1,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp1.2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml index 8e658eb..1876e38 100644 --- a/examples/jms/stomp1.2/pom.xml +++ b/examples/jms/stomp1.2/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.StompExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -104,11 +104,6 @@ <artifactId>jboss-jms-api</artifactId> <version>1.1.0.GA</version> </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>5.0.3.GA</version> - </dependency> </dependencies> <configuration> <waitOnStart>false</waitOnStart> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java index 8885328..7b21107 100644 --- a/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java +++ b/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java @@ -97,8 +97,8 @@ public class StompExample extends ActiveMQExample initialContext = getContext(0); // Step 7. Perform a lookup on the queue and the connection factory - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); - ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); + ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); // Step 8.Create a JMS Connection, Session and a MessageConsumer on the queue connection = cf.createConnection();
