You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2014/12/10 17:12:00 UTC
[34/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 0611367..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
-
- <!-- Connector to the other node -->
- <connector name="remote-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
- </acceptors>
-
- <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
- before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
- <queues>
- <queue name="jms.queue.sausage-factory">
- <address>jms.queue.sausage-factory</address>
- </queue>
- </queues>
-
- <!-- We set-up a bridge that forwards from a queue on this node to an address on another node.
- We specify a filter with the bridge, and a transformer too. The filter and transformer are optional -->
- <bridges>
- <bridge name="my-bridge">
- <queue-name>jms.queue.sausage-factory</queue-name>
- <forwarding-address>jms.queue.mincing-machine</forwarding-address>
- <filter string="name='aardvark'"/>
- <transformer-class-name>org.apache.activemq.jms.example.HatColourChangeTransformer</transformer-class-name>
- <reconnect-attempts>-1</reconnect-attempts>
- <static-connectors>
- <connector-ref>remote-connector</connector-ref>
- </static-connectors>
- </bridge>
- </bridges>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 3f96251..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!--the queue used by the example-->
- <queue name="sausage-factory"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 58ab92e..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
-
- <!-- Connectors -->
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index e4fe85a..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!--the queue used by the example-->
- <queue name="mincing-machine"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index ffcd947..5056aaa 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -94,7 +94,7 @@
</dependencies>
<configuration>
<waitOnStart>false</waitOnStart>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
<systemProperties>
<property>
<name>build.directory</name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java b/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
index 52e7fe1..729ea8d 100644
--- a/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
+++ b/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
@@ -52,7 +52,7 @@ public class QueueBrowserExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Perfom a lookup on the queue
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7939deb
--- /dev/null
+++ b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,34 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,8 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index aee59c8..0000000
--- a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
-
- <!-- Connectors -->
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.exampleQueue">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!--the queue used by the example-->
- <queue name="exampleQueue"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/jndi.properties b/examples/jms/browser/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/browser/src/main/resources/jndi.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index 3e0a2ed..fb79158 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -125,7 +125,7 @@
</dependencies>
<configuration>
<waitOnStart>false</waitOnStart>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
index 80957f7..c9864c3 100644
--- a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
+++ b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
@@ -57,7 +57,7 @@ public class ClientKickoffExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Perform a lookup on the Connection Factory
QueueConnectionFactory cf = (QueueConnectionFactory)initialContext.lookup("ConnectionFactory");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b2cbb37
--- /dev/null
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,23 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+
+ <!-- true to expose ActiveMQ resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..10a6dba
--- /dev/null
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,5 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index df1ebc8..0000000
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
-
- <!-- true to expose ActiveMQ resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- </acceptors>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 10a6dba..0000000
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/jndi.properties b/examples/jms/client-kickoff/src/main/resources/jndi.properties
new file mode 100644
index 0000000..6940f75
--- /dev/null
+++ b/examples/jms/client-kickoff/src/main/resources/jndi.properties
@@ -0,0 +1,2 @@
+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/a102983d/examples/jms/client-side-failoverlistener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index 402cced..bbc4b68 100644
--- a/examples/jms/client-side-failoverlistener/pom.xml
+++ b/examples/jms/client-side-failoverlistener/pom.xml
@@ -36,7 +36,7 @@
<goal>start</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
<systemProperties>
<property>
<name>build.directory</name>
@@ -55,9 +55,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1199</jndiPort>
- <jndiRmiPort>1198</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -79,10 +77,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ClientSideFailoverListerExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -97,7 +91,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -106,7 +100,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/readme.html b/examples/jms/client-side-failoverlistener/readme.html
index 6f8f073..eee1da4 100644
--- a/examples/jms/client-side-failoverlistener/readme.html
+++ b/examples/jms/client-side-failoverlistener/readme.html
@@ -11,7 +11,7 @@
<p>This example demonstrates how you can listen on failover event on the client side.</p>
<p>In this example there are two nodes running in a cluster, both server will be running for start,
- but after a while the first server will crash. This will trigger an fail oever event.</p>
+ but after a while the first server will crash. This will trigger an fail-over event.</p>
<h2>Example step-by-step</h2>
<p><em>To run the example, simply type <code>mvn verify</code> from this directory</em></p>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
index 46b7b63..07f2fe8 100644
--- a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
+++ b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
@@ -55,7 +55,7 @@ public class ClientSideFailoverListerExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from server 0
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS Queue object from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b42e5aa
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+
+ <ha-policy>
+ <shared-store>
+ <master/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,8 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..00f88be
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml
@@ -0,0 +1,8 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index b42e5aa..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
-
- <ha-policy>
- <shared-store>
- <master/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.exampleQueue">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!--the queue used by the example-->
- <queue name="exampleQueue"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 00f88be..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.exampleQueue">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!--the queue used by the example-->
- <queue name="exampleQueue"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
new file mode 100644
index 0000000..4aa3c29
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+queue.queue/exampleQueue=exampleQueue
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index 9ce2b28..2ef08c4 100644
--- a/examples/jms/client-side-load-balancing/pom.xml
+++ b/examples/jms/client-side-load-balancing/pom.xml
@@ -36,16 +36,12 @@
<goal>start</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
<systemProperties>
<property>
<name>build.directory</name>
<value>${basedir}/target/</value>
</property>
- <property>
- <name>udp-address</name>
- <value>${udp-address}</value>
- </property>
</systemProperties>
</configuration>
</execution>
@@ -55,9 +51,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1199</jndiPort>
- <jndiRmiPort>1198</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -77,19 +71,13 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
<name>build.directory</name>
<value>${basedir}/target/</value>
</property>
- <property>
- <name>udp-address</name>
- <value>${udp-address}</value>
- </property>
</systemProperties>
</configuration>
</execution>
@@ -100,10 +88,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ClientSideLoadBalancingExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -118,7 +102,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -127,7 +111,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -136,7 +120,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
index be1895a..1536107 100644
--- a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
+++ b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
@@ -56,7 +56,7 @@ public class ClientSideLoadBalancingExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from server 0
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS Queue object from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..96c4ee2
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,73 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+ <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
+
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <max-hops>0</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,8 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..b86baae
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+
+ <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <max-hops>0</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml
@@ -0,0 +1,8 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..8e056d5
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+
+ <bindings-directory>${build.directory}/server2/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <max-hops>0</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml
@@ -0,0 +1,8 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 96c4ee2..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
-
- <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
-
- <!-- Connectors -->
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
-
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <max-hops>0</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.exampleQueue">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!--the queue used by the example-->
- <queue name="exampleQueue"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index b86baae..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
-
-
- <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <max-hops>0</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.exampleQueue">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!--the queue used by the example-->
- <queue name="exampleQueue"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file