You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/12/05 16:38:29 UTC
[05/13] activemq-6 git commit: ACTIVEMQ6-14 Replace JNDI server with
client impl
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml
index 0a8701d..0d5c953 100644
--- a/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,18 +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" signature="queue">
- <connectors>
- <connector-ref connector-name="netty"/>
- </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/message-counters/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index 84de40b..2bca2d4 100644
--- a/examples/jms/message-counters/pom.xml
+++ b/examples/jms/message-counters/pom.xml
@@ -75,7 +75,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.MessageCounterExample</clientClass>
<args>
- <param>jnp://localhost:1099</param>
+ <param>tcp://localhost:5445</param>
</args>
</configuration>
</execution>
@@ -122,11 +122,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/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java b/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
index b3747e8..a1b697a 100644
--- a/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
+++ b/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
@@ -65,10 +65,10 @@ public class MessageCounterExample 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
- QueueConnectionFactory cf = (QueueConnectionFactory)initialContext.lookup("/ConnectionFactory");
+ QueueConnectionFactory cf = (QueueConnectionFactory)initialContext.lookup("ConnectionFactory");
// Step 4.Create a JMS Connection, session and a producer for the queue
connection = cf.createQueueConnection();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
index 5814b76..44be37f 100644
--- a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/message-counters/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" signature="queue">
- <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 expiry queue where expired messages will be sent-->
- <queue name="expiryQueue">
- <entry name="/queue/expiryQueue"/>
- </queue>
+ <queue name="expiryQueue"/>
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/message-group/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 2cfaa15..69571d9 100644
--- a/examples/jms/message-group/pom.xml
+++ b/examples/jms/message-group/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.MessageGroupExample</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/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java b/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
index 27e8b04..1a2cf49 100644
--- a/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
+++ b/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
@@ -60,10 +60,10 @@ public class MessageGroupExample 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/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
index 452b958..847659f 100644
--- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-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/message-group2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 2e0f983..866e984 100644
--- a/examples/jms/message-group2/pom.xml
+++ b/examples/jms/message-group2/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.MessageGroup2Example</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/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java b/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
index 9f98f8a..ce46238 100644
--- a/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
+++ b/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
@@ -59,10 +59,10 @@ public class MessageGroup2Example 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/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
index ec6c3d9..847659f 100644
--- a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/message-group2/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>
- <group-id>Group-0</group-id>
- </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/message-priority/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index db6c291..631f6bd 100644
--- a/examples/jms/message-priority/pom.xml
+++ b/examples/jms/message-priority/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.MessagePriorityExample</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/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java b/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
index 6a2931e..e094b72 100644
--- a/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
+++ b/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
@@ -60,10 +60,10 @@ public class MessagePriorityExample extends ActiveMQExample
initialContext = getContext(0);
// Step 2. look-up the JMS queue object from JNDI
- Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
+ 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/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml
index 452b958..847659f 100644
--- a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/message-priority/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/multiple-failover-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index b9827f6..8264323 100644
--- a/examples/jms/multiple-failover-failback/pom.xml
+++ b/examples/jms/multiple-failover-failback/pom.xml
@@ -101,9 +101,9 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.MultipleFailoverFailbackExample</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/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
index 9cf1f9f..b6af378 100644
--- a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
+++ b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
@@ -55,8 +55,8 @@ public class MultipleFailoverFailbackExample 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/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
index 889b59d..0d5c953 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/multiple-failover-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/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
index c3b0393..0d5c953 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
+++ b/examples/jms/multiple-failover-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/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
index 41d711b..0d5c953 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
+++ b/examples/jms/multiple-failover-failback/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/multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index e8c0744..844f22c 100644
--- a/examples/jms/multiple-failover/pom.xml
+++ b/examples/jms/multiple-failover/pom.xml
@@ -101,9 +101,9 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.MultipleFailoverExample</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/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
index 41849c9..8f430a3 100644
--- a/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
+++ b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
@@ -55,8 +55,8 @@ public class MultipleFailoverExample 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/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
index 889b59d..0d5c953 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/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/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
index c3b0393..0d5c953 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
+++ b/examples/jms/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/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
index 41d711b..0d5c953 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
+++ b/examples/jms/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/no-consumer-buffering/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index 0415b4b..b205475 100644
--- a/examples/jms/no-consumer-buffering/pom.xml
+++ b/examples/jms/no-consumer-buffering/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.NoConsumerBufferingExample</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/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
index 61e5ff6..98af21d 100644
--- a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
+++ b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
@@ -51,10 +51,10 @@ public class NoConsumerBufferingExample 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/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
index a679ccc..0d5c953 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/no-consumer-buffering/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 set the consumer window size to 0, which means messages are not buffered at all
- on the client side -->
- <consumer-window-size>0</consumer-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/non-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index 54afb76..0bd9fa5 100644
--- a/examples/jms/non-transaction-failover/pom.xml
+++ b/examples/jms/non-transaction-failover/pom.xml
@@ -85,8 +85,8 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.NonTransactionFailoverExample</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>
@@ -151,11 +151,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/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
index 68f79e9..fc37097 100644
--- a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
+++ b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
@@ -56,8 +56,8 @@ public class NonTransactionFailoverExample 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/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
index c3b0393..0d5c953 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/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/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
index a5ea085..0d5c953 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
+++ b/examples/jms/non-transaction-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/openwire/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index b2ba575..b129d99 100644
--- a/examples/jms/openwire/pom.xml
+++ b/examples/jms/openwire/pom.xml
@@ -56,7 +56,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.OpenWireExample</clientClass>
<args>
- <param>jnp://localhost:1099</param>
+ <param>tcp://localhost:5445</param>
</args>
</configuration>
</execution>
@@ -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/openwire/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml
index 3058fc8..0d5c953 100644
--- a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/openwire/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/paging/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml
index d635df5..6081b2b 100644
--- a/examples/jms/paging/pom.xml
+++ b/examples/jms/paging/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.PagingExample</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/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java b/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java
index 1ba955e..fe50d82 100644
--- a/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java
+++ b/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java
@@ -52,11 +52,11 @@ public class PagingExample extends ActiveMQExample
initialContext = getContext(0);
// Step 2. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");
+ ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
// Step 3. We look-up the JMS queue object from JNDI. pagingQueue is configured to hold a very limited number
// of bytes in memory
- Queue pageQueue = (Queue)initialContext.lookup("/queue/pagingQueue");
+ Queue pageQueue = (Queue)initialContext.lookup("queue/pagingQueue");
// Step 4. Lookup for a JMS Queue
Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml
index 16a1074..980f889 100644
--- a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,23 +1,10 @@
<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-->
- <queue name="exampleQueue">
- <entry name="/queue/exampleQueue"/>
- </queue>
+ <queue name="exampleQueue"/>
- <queue name="pagingQueue">
- <entry name="/queue/pagingQueue"/>
- </queue>
+ <queue name="pagingQueue"/>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml
index 3416cf6..6b04923 100644
--- a/examples/jms/perf/pom.xml
+++ b/examples/jms/perf/pom.xml
@@ -34,11 +34,6 @@
<version>1.1.0.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <version>5.0.5.Final</version>
- </dependency>
- <dependency>
<groupId>org.apache.activemq.examples.jms</groupId>
<artifactId>activemq-jms-examples-common</artifactId>
<version>${project.version}</version>
@@ -118,11 +113,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/perf/src/main/resources/client.jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/client.jndi.properties b/examples/jms/perf/src/main/resources/client.jndi.properties
index 080524f..6940f75 100644
--- a/examples/jms/perf/src/main/resources/client.jndi.properties
+++ b/examples/jms/perf/src/main/resources/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/perf/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml
index 0fe8db1..613bf94 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,18 +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>
- </connection-factory>
-
- <queue name="perfQueue">
- <entry name="perfQueue"/>
- </queue>
+
+ <queue name="perfQueue"/>
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/pre-acknowledge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index 35112bd..14623b8 100644
--- a/examples/jms/pre-acknowledge/pom.xml
+++ b/examples/jms/pre-acknowledge/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.PreacknowledgeExample</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/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java
index 18aaa25..e3f2c7a 100644
--- a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java
+++ b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java
@@ -63,9 +63,9 @@ public class PreacknowledgeExample extends ActiveMQExample
initialContext = getContext(0);
// Step 2. Perform the look-ups
- Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
+ Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");
+ ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
// Step 3. Create a the JMS objects
connection = cf.createConnection();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml
index 3058fc8..0d5c953 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/pre-acknowledge/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/producer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml
index 35dcd66..6d4bf66 100644
--- a/examples/jms/producer-rate-limit/pom.xml
+++ b/examples/jms/producer-rate-limit/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.ProducerRateLimitExample</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/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
index 61fd763..1b78bd9 100644
--- a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
+++ b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java
@@ -51,10 +51,10 @@ public class ProducerRateLimitExample 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/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
index c68b505..0d5c953 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/producer-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 producers created on this connection factory to produce messages at a maximum rate
- of 50 messages per sec -->
- <producer-max-rate>50</producer-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/proton-cpp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml
index 801d97d..32d30c3 100644
--- a/examples/jms/proton-cpp/pom.xml
+++ b/examples/jms/proton-cpp/pom.xml
@@ -34,11 +34,6 @@
<version>1.1.0.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <version>5.0.5.Final</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
<artifactId>jboss-jms-api_2.0_spec</artifactId>
</dependency>
@@ -119,11 +114,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/proton-j/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index 7f2fad5..f530c43 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/pom.xml
@@ -53,7 +53,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.ProtonJExample</clientClass>
<args>
- <param>jnp://localhost:1099</param>
+ <param>tcp://localhost:5445</param>
</args>
</configuration>
</execution>
@@ -105,11 +105,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/proton-ruby/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml
index d3a2e7a..7c6ce21 100644
--- a/examples/jms/proton-ruby/pom.xml
+++ b/examples/jms/proton-ruby/pom.xml
@@ -83,11 +83,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/queue-message-redistribution/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index a8868e8..d2b79af 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/pom.xml
@@ -79,8 +79,8 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueMessageRedistributionExample</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/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
index d8183d6..732f36d 100644
--- a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
+++ b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java
@@ -59,16 +59,16 @@ public class QueueMessageRedistributionExample 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/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
index 452b958..847659f 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
index 452b958..847659f 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
+++ b/examples/jms/queue-message-redistribution/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/queue-requestor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index f9e6eac..1c644d9 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueRequestorExample</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/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
index a0c23b1..b2f3d5b 100644
--- a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
+++ b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
@@ -51,10 +51,10 @@ public class QueueRequestorExample 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. Look-up the JMS queue connection factory
- QueueConnectionFactory cf = (QueueConnectionFactory)initialContext.lookup("/ConnectionFactory");
+ QueueConnectionFactory cf = (QueueConnectionFactory)initialContext.lookup("ConnectionFactory");
// Step 4. Create a TextReverserService which consumes messages from the queue and sends message with reversed
// text
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
index f38ed2d..0d5c953 100644
--- a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/queue-requestor/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" signature="queue">
- <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/queue-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index 0cc2420..cb7024a 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueSelectorExample</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/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java b/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
index 57ef227..ccb5250 100644
--- a/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
+++ b/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
@@ -55,10 +55,10 @@ public class QueueSelectorExample extends ActiveMQExample
initialContext = getContext(0);
// Step 2. look-up the JMS queue object from JNDI
- Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
+ 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/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
index 452b958..847659f 100644
--- a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/queue-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="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/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 97797a0..307d2f8 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -52,7 +52,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueExample</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/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java b/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
index a9dffee..a838c73 100644
--- a/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
+++ b/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
@@ -50,10 +50,10 @@ public class QueueExample 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/queue/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml
index 3058fc8..0d5c953 100644
--- a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/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>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/examples/jms/reattach-node/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index f7d955e..97fee3c 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/pom.xml
@@ -47,7 +47,7 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.ReattachExample</clientClass>
<args>
- <param>jnp://localhost:1099</param>
+ <param>tcp://localhost:5445</param>
</args>
<systemProperties>
<property>
@@ -103,11 +103,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/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
index 303f2da..65d40fe 100644
--- a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
+++ b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
@@ -56,10 +56,10 @@ public class ReattachExample 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();
@@ -136,7 +136,7 @@ public class ReattachExample extends ActiveMQExample
// when the main connection has been stopped
private void stopStartAcceptor(final InitialContext initialContext, final boolean stop) throws Exception
{
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory2");
+ ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory2");
Connection connection = null;
try