http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-jms.xml index 452b958..847659f 100644 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/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/clustered-grouping/src/main/resources/hornetq/server2/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-jms.xml index 452b958..847659f 100644 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-jms.xml +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/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/clustered-jgroups/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml index 1cdaf59..aca8a25 100644 --- a/examples/jms/clustered-jgroups/pom.xml +++ b/examples/jms/clustered-jgroups/pom.xml @@ -75,8 +75,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ClusteredJgroupsExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> + <param>tcp://localhost:5445</param> + <param>tcp://localhost:5446</param> </args> </configuration> </execution> @@ -135,11 +135,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/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java index d838a5e..24ae554 100644 --- a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java +++ b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java @@ -57,16 +57,16 @@ public class ClusteredJgroupsExample extends ActiveMQExample ic0 = getContext(0); // Step 2. Look-up the JMS Queue object from JNDI - Queue queue = (Queue)ic0.lookup("/queue/exampleQueue"); + Queue queue = (Queue)ic0.lookup("queue/exampleQueue"); // Step 3. Look-up a JMS Connection Factory object from JNDI on server 0 - ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("/ConnectionFactory"); + ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("ConnectionFactory"); // Step 4. Get an initial context for looking up JNDI from server 1 ic1 = getContext(1); // Step 5. Look-up a JMS Connection Factory object from JNDI on server 1 - ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("/ConnectionFactory"); + ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("ConnectionFactory"); // Step 6. We create a JMS Connection connection0 which is a connection to server 0 connection0 = cf0.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-jms.xml index 452b958..847659f 100644 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/clustered-jgroups/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/clustered-jgroups/src/main/resources/hornetq/server0/client-jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/client-jndi.properties index 080524f..6940f75 100644 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/client-jndi.properties +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/client-jndi.properties @@ -1,3 +1,2 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.provider.url=jnp://localhost:1099 -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml index 452b958..847659f 100644 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/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/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties index 7bcaf95..7905109 100644 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties @@ -1,3 +1,2 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.provider.url=jnp://localhost:2099 -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5446 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-queue/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml index 55147fa..dfb3c5a 100644 --- a/examples/jms/clustered-queue/pom.xml +++ b/examples/jms/clustered-queue/pom.xml @@ -71,8 +71,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ClusteredQueueExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> + <param>tcp://localhost:5445</param> + <param>tcp://localhost:5446</param> </args> </configuration> </execution> @@ -131,11 +131,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/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java index b264886..5c1874d 100644 --- a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java +++ b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java @@ -57,16 +57,16 @@ public class ClusteredQueueExample extends ActiveMQExample ic0 = getContext(0); // Step 2. Look-up the JMS Queue object from JNDI - Queue queue = (Queue)ic0.lookup("/queue/exampleQueue"); + Queue queue = (Queue)ic0.lookup("queue/exampleQueue"); // Step 3. Look-up a JMS Connection Factory object from JNDI on server 0 - ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("/ConnectionFactory"); + ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("ConnectionFactory"); // Step 4. Get an initial context for looking up JNDI from server 1 ic1 = getContext(1); // Step 5. Look-up a JMS Connection Factory object from JNDI on server 1 - ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("/ConnectionFactory"); + ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("ConnectionFactory"); // Step 6. We create a JMS Connection connection0 which is a connection to server 0 connection0 = cf0.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml index 452b958..847659f 100644 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/clustered-queue/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/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml index 452b958..847659f 100644 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/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/clustered-standalone/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml index cb5e4b2..427ec71 100644 --- a/examples/jms/clustered-standalone/pom.xml +++ b/examples/jms/clustered-standalone/pom.xml @@ -89,9 +89,9 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ClusteredStandaloneExample</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> @@ -165,11 +165,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> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java index 7196c71..28704ce 100644 --- a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java +++ b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java @@ -79,19 +79,19 @@ public class ClusteredStandaloneExample extends ActiveMQExample // We create a connection on each node, create a consumer on each connection and send some // messages at a node and verify they are all received by all consumers - ConnectionFactory cf0 = (ConnectionFactory)initialContext0.lookup("/ConnectionFactory"); + ConnectionFactory cf0 = (ConnectionFactory)initialContext0.lookup("ConnectionFactory"); System.out.println("Got cf " + cf0); - ConnectionFactory cf1 = (ConnectionFactory)initialContext1.lookup("/ConnectionFactory"); + ConnectionFactory cf1 = (ConnectionFactory)initialContext1.lookup("ConnectionFactory"); System.out.println("Got cf " + cf1); - ConnectionFactory cf2 = (ConnectionFactory)initialContext2.lookup("/ConnectionFactory"); + ConnectionFactory cf2 = (ConnectionFactory)initialContext2.lookup("ConnectionFactory"); System.out.println("Got cf " + cf2); - Topic topic = (Topic)initialContext0.lookup("/topic/ExampleTopic"); + Topic topic = (Topic)initialContext0.lookup("topic/exampleTopic"); connection0 = cf0.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml index 70a5fd5..845dfe1 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/clustered-standalone/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="exampleTopic"> - <entry name="/topic/ExampleTopic"/> - </topic> + <topic name="exampleTopic"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml index 70a5fd5..212fbd1 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/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 topic used by the example--> - <topic name="exampleTopic"> - <entry name="/topic/ExampleTopic"/> + <topic name="exampleTopic"/> </topic> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml index 70a5fd5..845dfe1 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/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="exampleTopic"> - <entry name="/topic/ExampleTopic"/> - </topic> + <topic name="exampleTopic"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-discovery/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml index 8ce3ac9..5245a17 100644 --- a/examples/jms/clustered-static-discovery/pom.xml +++ b/examples/jms/clustered-static-discovery/pom.xml @@ -83,10 +83,10 @@ <configuration> <clientClass>org.apache.activemq.jms.example.StaticClusteredQueueExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> - <param>jnp://localhost:1299</param> - <param>jnp://localhost:1399</param> + <param>tcp://localhost:5445</param> + <param>tcp://localhost:5446</param> + <param>tcp://localhost:5447</param> + <param>tcp://localhost:5448</param> </args> <systemProperties> <property> @@ -169,11 +169,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/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java index cca25b5..868d611 100644 --- a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java +++ b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java @@ -61,10 +61,10 @@ public class StaticClusteredQueueExample extends ActiveMQExample ic0 = getContext(3); // Step 2. Look-up the JMS Queue object from JNDI - Queue queue = (Queue)ic0.lookup("/queue/exampleQueue"); + Queue queue = (Queue)ic0.lookup("queue/exampleQueue"); // Step 3. Look-up a JMS Connection Factory object from JNDI on server 0 - ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("/ConnectionFactory"); + ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("ConnectionFactory"); //grab an initial connection and wait, in reality you wouldn't do it this way but since we want to ensure an // equal load balance we do this and then create 4 connections round robined http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml index 68d3cce..847659f 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/clustered-static-discovery/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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/jndi.properties b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/jndi.properties deleted file mode 100644 index e2a9832..0000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/jndi.properties +++ /dev/null @@ -1,2 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml index 68d3cce..847659f 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/clustered-static-discovery/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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/jndi.properties b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/jndi.properties deleted file mode 100644 index e2a9832..0000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/jndi.properties +++ /dev/null @@ -1,2 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml index 60569d2..e254e36 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml @@ -18,32 +18,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/clustered-static-discovery/src/main/resources/hornetq/server2/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/jndi.properties b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/jndi.properties deleted file mode 100644 index dd51418..0000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/jndi.properties +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml index 60569d2..e254e36 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml @@ -18,32 +18,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/clustered-static-discovery/src/main/resources/hornetq/server3/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/jndi.properties b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/jndi.properties deleted file mode 100644 index e2a9832..0000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/jndi.properties +++ /dev/null @@ -1,2 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-oneway/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml index 652a01f..0722ddf 100644 --- a/examples/jms/clustered-static-oneway/pom.xml +++ b/examples/jms/clustered-static-oneway/pom.xml @@ -71,9 +71,9 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ClusterStaticOnewayExample</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> @@ -147,11 +147,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/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java index fee4497..2eab7ae 100644 --- a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java +++ b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java @@ -59,10 +59,10 @@ public class ClusterStaticOnewayExample extends ActiveMQExample ic0 = getContext(0); // Step 2. Look-up the JMS Queue object from JNDI - Queue queue = (Queue)ic0.lookup("/queue/exampleQueue"); + Queue queue = (Queue)ic0.lookup("queue/exampleQueue"); // Step 3. Look-up a JMS Connection Factory object from JNDI on server 0 - ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("/ConnectionFactory"); + ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("ConnectionFactory"); //step 4. grab an initial connection and wait, in reality you wouldn't do it this way but since we want to ensure an // equal load balance we do this and then create 4 connections round robined http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml index 68d3cce..847659f 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/clustered-static-oneway/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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/jndi.properties b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/jndi.properties deleted file mode 100644 index e2a9832..0000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/jndi.properties +++ /dev/null @@ -1,2 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml index 68d3cce..847659f 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/clustered-static-oneway/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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/jndi.properties b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/jndi.properties deleted file mode 100644 index e2a9832..0000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/jndi.properties +++ /dev/null @@ -1,2 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml index 60569d2..e254e36 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml @@ -18,32 +18,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/clustered-static-oneway/src/main/resources/hornetq/server2/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/jndi.properties b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/jndi.properties deleted file mode 100644 index 045c093..0000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/jndi.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-topic/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml index 9c68f4b..18d9fb5 100644 --- a/examples/jms/clustered-topic/pom.xml +++ b/examples/jms/clustered-topic/pom.xml @@ -79,8 +79,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ClusteredTopicExample</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/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java index e5a6028..eb51603 100644 --- a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java +++ b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java @@ -57,16 +57,16 @@ public class ClusteredTopicExample extends ActiveMQExample ic0 = getContext(0); // Step 2. Look-up the JMS Topic object from JNDI - Topic topic = (Topic)ic0.lookup("/topic/exampleTopic"); + Topic topic = (Topic)ic0.lookup("topic/exampleTopic"); // Step 3. Look-up a JMS Connection Factory object from JNDI on server 0 - ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("/ConnectionFactory"); + ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("ConnectionFactory"); // Step 4. Get an initial context for looking up JNDI from server 1 ic1 = getContext(1); // Step 5. Look-up a JMS Connection Factory object from JNDI on server 1 - ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("/ConnectionFactory"); + ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("ConnectionFactory"); // Step 6. We create a JMS Connection connection0 which is a connection to server 0 connection0 = cf0.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml index 1dd09a6..ab4841d 100644 --- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/clustered-topic/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="exampleTopic"> - <entry name="/topic/exampleTopic"/> - </topic> + <topic name="exampleTopic"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-jms.xml index 1dd09a6..ab4841d 100644 --- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/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="exampleTopic"> - <entry name="/topic/exampleTopic"/> - </topic> + <topic name="exampleTopic"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/colocated-failover-scale-down/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/colocated-failover-scale-down/pom.xml b/examples/jms/colocated-failover-scale-down/pom.xml index fccdaed..f128ea7 100644 --- a/examples/jms/colocated-failover-scale-down/pom.xml +++ b/examples/jms/colocated-failover-scale-down/pom.xml @@ -71,8 +71,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ColocatedFailoverScaleDownExample</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/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java index 73609af..b65279b 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java +++ b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java @@ -58,9 +58,9 @@ public class ColocatedFailoverScaleDownExample 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/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml index 2bf8233..847659f 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/colocated-failover-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/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml index 2bf8233..847659f 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/colocated-failover-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/colocated-failover/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml index 4d63b88..290ed90 100644 --- a/examples/jms/colocated-failover/pom.xml +++ b/examples/jms/colocated-failover/pom.xml @@ -71,8 +71,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ColocatedFailoverExample</clientClass> <args> - <param>jnp://localhost:1099</param> - <param>jnp://localhost:1199</param> + <param>tcp://localhost:1099</param> + <param>tcp://localhost:1199</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/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java index 533d248..29d57a6 100644 --- a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java +++ b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java @@ -56,9 +56,9 @@ public class ColocatedFailoverExample 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/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml index 2bf8233..847659f 100644 --- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/colocated-failover/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/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml index 2bf8233..0a77a3f 100644 --- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml +++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,30 +1,7 @@ <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/consumer-rate-limit/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml index aa15902..2b95571 100644 --- a/examples/jms/consumer-rate-limit/pom.xml +++ b/examples/jms/consumer-rate-limit/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.ConsumerRateLimitExample</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/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java index 61fdd77..5bb9da8 100644 --- a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java +++ b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java @@ -51,10 +51,10 @@ public class ConsumerRateLimitExample 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/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml index ad3d3e0..0d5c953 100644 --- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,24 +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> - - <!-- We limit consumers created on this connection factory to consume messages at a maximum rate - of 10 messages per sec --> - <consumer-max-rate>10</consumer-max-rate> - - </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/consumer-rate-limit/src/main/resources/hornetq/server0/client-jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/client-jndi.properties index 080524f..6940f75 100644 --- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/client-jndi.properties +++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/client-jndi.properties @@ -1,3 +1,2 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.provider.url=jnp://localhost:1099 -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/dead-letter/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml index ad0315b..6f7ebc8 100644 --- a/examples/jms/dead-letter/pom.xml +++ b/examples/jms/dead-letter/pom.xml @@ -52,7 +52,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.DeadLetterExample</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/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java b/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java index 04c2482..1768955 100644 --- a/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java +++ b/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java @@ -52,10 +52,10 @@ public class DeadLetterExample 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(); @@ -108,7 +108,7 @@ public class DeadLetterExample extends ActiveMQExample // We will now consume the message from the dead letter queue // Step 17. Perform a lookup on the dead letter queue - Queue deadLetterQueue = (Queue)initialContext.lookup("/queue/deadLetterQueue"); + Queue deadLetterQueue = (Queue)initialContext.lookup("queue/deadLetterQueue"); // Step 18. Create a JMS Message Consumer for the dead letter queue MessageConsumer deadLetterConsumer = session.createConsumer(deadLetterQueue); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml index e3ad631..8fa2fbb 100644 --- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,24 +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> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> <!-- the dead letter queue where dead messages will be sent--> - <queue name="deadLetterQueue"> - <entry name="/queue/deadLetterQueue"/> - </queue> + <queue name="deadLetterQueue"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/dead-letter/src/main/resources/hornetq/server0/client-jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/dead-letter/src/main/resources/hornetq/server0/client-jndi.properties index 080524f..6940f75 100644 --- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/client-jndi.properties +++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/client-jndi.properties @@ -1,3 +1,2 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.provider.url=jnp://localhost:1099 -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/delayed-redelivery/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml index 17d18c0..db25002 100644 --- a/examples/jms/delayed-redelivery/pom.xml +++ b/examples/jms/delayed-redelivery/pom.xml @@ -44,7 +44,7 @@ <configuration> <clientClass>org.apache.activemq.jms.example.DelayedRedeliveryExample</clientClass> <args> - <param>jnp://localhost:1099</param> + <param>tcp://localhost:5445</param> </args> </configuration> </execution> @@ -91,11 +91,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/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java index a80c31f..4bfc1ca 100644 --- a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java +++ b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java @@ -55,10 +55,10 @@ public class DelayedRedeliveryExample extends ActiveMQExample initialContext = getContext(0); // Step 2. Perform 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/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml index e3ad631..8fa2fbb 100644 --- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml +++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,24 +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> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> <!-- the dead letter queue where dead messages will be sent--> - <queue name="deadLetterQueue"> - <entry name="/queue/deadLetterQueue"/> - </queue> + <queue name="deadLetterQueue"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/client-jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/client-jndi.properties index 080524f..6940f75 100644 --- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/client-jndi.properties +++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/client-jndi.properties @@ -1,3 +1,2 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.provider.url=jnp://localhost:1099 -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/divert/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml index 011e7c9..d987365 100644 --- a/examples/jms/divert/pom.xml +++ b/examples/jms/divert/pom.xml @@ -64,8 +64,8 @@ <configuration> <clientClass>org.apache.activemq.jms.example.DivertExample</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> @@ -130,11 +130,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>
