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:11:49 UTC
[23/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..70b8a58
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,87 @@
+<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>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</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>
+
+ <address-settings>
+ <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions
+ Default redistribution delay as -1 which means "disable redistribution"
+ Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed
+ then another one quickly recreated you might want to set it thus, to avoid unnecessary
+ redistribution -->
+ <address-setting match="jms.#">
+ <redistribution-delay>0</redistribution-delay>
+ </address-setting>
+ </address-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 5884905..0000000
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,86 +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>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</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>
-
- <address-settings>
- <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions
- Default redistribution delay as -1 which means "disable redistribution"
- Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed
- then another one quickly recreated you might want to set it thus, to avoid unnecessary
- redistribution -->
- <address-setting match="jms.#">
- <redistribution-delay>0</redistribution-delay>
- </address-setting>
- </address-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 70b8a58..0000000
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,87 +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>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</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>
-
- <address-settings>
- <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions
- Default redistribution delay as -1 which means "disable redistribution"
- Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed
- then another one quickly recreated you might want to set it thus, to avoid unnecessary
- redistribution -->
- <address-setting match="jms.#">
- <redistribution-delay>0</redistribution-delay>
- </address-setting>
- </address-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue-message-redistribution/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/queue-requestor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index 1c644d9..4cf4351 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueRequestorExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -102,7 +99,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/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 b2f3d5b..a6fc186 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
@@ -48,7 +48,7 @@ public class QueueRequestorExample 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/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..9d3a1bb
--- /dev/null
+++ b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,41 @@
+<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 queues -->
+ <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 for JMS temporary queue -->
+ <security-setting match="jms.tempqueue.#">
+ <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/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index e1af71e..0000000
--- a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,50 +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 queues -->
- <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 for JMS temporary queue -->
- <security-setting match="jms.tempqueue.#">
- <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/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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/jndi.properties b/examples/jms/queue-requestor/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/queue-requestor/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/queue-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index cb7024a..693bc6a 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueSelectorExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -102,7 +99,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/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 ccb5250..de2d9db 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
@@ -52,7 +52,7 @@ public class QueueSelectorExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- 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/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..27874f9
--- /dev/null
+++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,33 @@
+<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>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/queue-selector/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/queue-selector/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue-selector/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/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 676ebfc..0000000
--- a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,41 +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>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/queue-selector/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/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue-selector/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/queue-selector/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/jndi.properties b/examples/jms/queue-selector/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/queue-selector/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/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 307d2f8..1bbeac3 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -29,6 +29,7 @@
<plugin>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<id>start</id>
@@ -51,9 +52,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -102,7 +100,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/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 a838c73..2e38514 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
@@ -47,7 +47,7 @@ public class QueueExample 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/queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/queue/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>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/queue/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/queue/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue/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/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index e0acd1d..0000000
--- a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,43 +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>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/queue/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/queue/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue/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/queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/jndi.properties b/examples/jms/queue/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/queue/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/reattach-node/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index 97fee3c..9498e03 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/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>
</configuration>
</execution>
<execution>
@@ -46,9 +46,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ReattachExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -63,7 +60,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/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 65d40fe..9a9d58f 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
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.jms.example;
+import java.util.Hashtable;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Message;
@@ -53,7 +55,7 @@ public class ReattachExample 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 queue
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -86,7 +88,7 @@ public class ReattachExample extends ActiveMQExample
// Step 11. To simulate a temporary problem on the network, we stop the remoting acceptor on the
// server which will close all connections
- stopAcceptor(initialContext);
+ stopAcceptor();
System.out.println("Acceptor now stopped, will wait for 10 seconds. This simulates the network connection failing for a while");
@@ -95,7 +97,7 @@ public class ReattachExample extends ActiveMQExample
System.out.println("Re-starting acceptor");
- startAcceptor(initialContext);
+ startAcceptor();
System.out.println("Restarted acceptor. The client will now reconnect.");
@@ -121,22 +123,26 @@ public class ReattachExample extends ActiveMQExample
}
}
- private void stopAcceptor(final InitialContext ic) throws Exception
+ private void stopAcceptor() throws Exception
{
- stopStartAcceptor(ic, true);
+ stopStartAcceptor(true);
}
- private void startAcceptor(final InitialContext ic) throws Exception
+ private void startAcceptor() throws Exception
{
- stopStartAcceptor(ic, false);
+ stopStartAcceptor(false);
}
// To do this we send a management message to close the acceptor, we do this on a different
// connection factory which uses a different remoting connection so we can still send messages
// when the main connection has been stopped
- private void stopStartAcceptor(final InitialContext initialContext, final boolean stop) throws Exception
+ private void stopStartAcceptor(final boolean stop) throws Exception
{
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory2");
+ Hashtable<String, Object> properties = new Hashtable<String, Object>();
+ properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+ properties.put("java.naming.provider.url", "tcp://localhost:5446");
+ InitialContext initialContext = new InitialContext(properties);
+ ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
Connection connection = null;
try
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..a090748
--- /dev/null
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,66 @@
+<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>
+
+ <!-- We just use this connector so we can send management operations while the other acceptor
+ is stopped -->
+ <connector name="netty-connector2">
+ <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>
+
+ <!-- We just use this acceptor so we can send management operations while the other acceptor
+ is stopped -->
+ <acceptor name="netty-acceptor2">
+ <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.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-setting match="jms.queue.activemq.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/reattach-node/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/reattach-node/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..58ecc13
--- /dev/null
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml
@@ -0,0 +1,11 @@
+<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"/>
+
+ <!-- We give guest the admin role so it can do management operations for the example -
+ you don't want to do this in real life -->
+ <role name="admin"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index a090748..0000000
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,66 +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>
-
- <!-- We just use this connector so we can send management operations while the other acceptor
- is stopped -->
- <connector name="netty-connector2">
- <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>
-
- <!-- We just use this acceptor so we can send management operations while the other acceptor
- is stopped -->
- <acceptor name="netty-acceptor2">
- <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.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-setting match="jms.queue.activemq.management">
- <!-- only the admin role can interact with the management address -->
- <permission type="consume" roles="admin"/>
- <permission type="send" roles="admin"/>
- <permission type="manage" roles="admin"/>
- </security-setting>
- </security-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/reattach-node/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/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index 58ecc13..0000000
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
+++ /dev/null
@@ -1,11 +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"/>
-
- <!-- We give guest the admin role so it can do management operations for the example -
- you don't want to do this in real life -->
- <role name="admin"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/jndi.properties b/examples/jms/reattach-node/src/main/resources/jndi.properties
new file mode 100644
index 0000000..c801182
--- /dev/null
+++ b/examples/jms/reattach-node/src/main/resources/jndi.properties
@@ -0,0 +1,8 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+connection.ConnectionFactory.failoverOnServerShutdown=true
+connection.ConnectionFactory.confirmationWindowSize=1048576
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index 631b40f..7358cae 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/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>
@@ -78,10 +76,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ReplicatedFailbackStaticExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -96,7 +90,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -105,7 +99,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/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
index 73edb7e..dde65bb 100644
--- a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
+++ b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
@@ -55,7 +55,7 @@ public class ReplicatedFailbackStaticExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -100,7 +100,7 @@ public class ReplicatedFailbackStaticExample extends ActiveMQExample
// Step 10. Crash server #1, the live server, and wait a little while to make sure
// it has really crashed
- Thread.sleep(2000);
+ Thread.sleep(5000);
killServer(0);
// Step 11. Acknowledging the 2nd half of the sent messages will fail as failover to the
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..684bd36
--- /dev/null
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,68 @@
+<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>
+
+ <cluster-user>exampleUser</cluster-user>
+
+ <cluster-password>secret</cluster-password>
+
+ <ha-policy>
+ <replication>
+ <master>
+ <!--we need this for auto failback-->
+ <check-for-live-server>true</check-for-live-server>
+ </master>
+ </replication>
+ </ha-policy>
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ <connector name="netty-backup-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>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <static-connectors>
+ <connector-ref>netty-backup-connector</connector-ref>
+ </static-connectors>
+ </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/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-failback-static/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/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-failback-static/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/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..b6e3935
--- /dev/null
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,70 @@
+<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>
+
+ <cluster-user>exampleUser</cluster-user>
+
+ <cluster-password>secret</cluster-password>
+
+ <ha-policy>
+ <replication>
+ <slave>
+ <allow-failback>true</allow-failback>
+ <!-- not needed but tells the backup not to restart after failback as there will be > 0 backups saved -->
+ <max-saved-replicated-journals-size>0</max-saved-replicated-journals-size>
+ </slave>
+ </replication>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-live-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ <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>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <static-connectors>
+ <connector-ref>netty-live-connector</connector-ref>
+ </static-connectors>
+ </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/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-failback-static/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/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-failback-static/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/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 3854f19..0000000
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,69 +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>
-
- <cluster-user>exampleUser</cluster-user>
-
- <cluster-password>secret</cluster-password>
-
- <ha-policy>
- <replication>
- <master>
- <!--we need this for auto failback-->
- <check-for-live-server>true</check-for-live-server>
- <allow-failback>true</allow-failback>
- </master>
- </replication>
- </ha-policy>
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-backup-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>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <static-connectors>
- <connector-ref>netty-backup-connector</connector-ref>
- </static-connectors>
- </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/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-failback-static/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/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-failback-static/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