http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 9befeed..0000000
--- 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml
 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index 12d60e0..0000000
--- 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-   <!--the connection factory used by the example-->
-   <connection-factory name="ConnectionFactory" signature="queue">
-      <connectors>
-         <connector-ref connector-name="netty-connector"/>
-      </connectors>
-      <entries>
-         <entry name="ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <!--the queue used by the example-->
-   <queue name="exampleQueue">
-      <entry name="/queue/exampleQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/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
new file mode 100644
index 0000000..172e6e5
--- /dev/null
+++ 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,41 @@
+<configuration xmlns="urn:activemq"            
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq 
/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/aeaba392/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
new file mode 100644
index 0000000..112fefc
--- /dev/null
+++ 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -0,0 +1,19 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+   <!--the connection factory used by the example-->
+   <connection-factory name="ConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty-connector"/>
+      </connectors>
+      <entries>
+         <entry name="ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <!--the queue used by the example-->
+   <queue name="exampleQueue">
+      <entry name="/queue/exampleQueue"/>
+   </queue>
+
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/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
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /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/aeaba392/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 0cd2aff..0000000
--- 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<configuration xmlns="urn:activemq"            
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index 86a4c75..0000000
--- 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-   <!--the connection factory used by the example-->
-   <connection-factory name="ConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty-connector"/>
-      </connectors>
-      <entries>
-         <entry name="ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <!--the queue used by the example-->
-   <queue name="exampleQueue">
-      <entry name="/queue/exampleQueue"/>
-   </queue>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/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
new file mode 100644
index 0000000..c2dc300
--- /dev/null
+++ 
b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,43 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq 
/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/aeaba392/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
new file mode 100644
index 0000000..9a03836
--- /dev/null
+++ b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -0,0 +1,19 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+   <!--the connection factory used by the example-->
+   <connection-factory name="ConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty-connector"/>
+      </connectors>
+      <entries>
+         <entry name="ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <!--the queue used by the example-->
+   <queue name="exampleQueue">
+      <entry name="/queue/exampleQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/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
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /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/aeaba392/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 62eedeb..0000000
--- 
a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index c2e9a5c..0000000
--- a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-   <!--the connection factory used by the example-->
-   <connection-factory name="ConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty-connector"/>
-      </connectors>
-      <entries>
-         <entry name="ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <!--the queue used by the example-->
-   <queue name="exampleQueue">
-      <entry name="/queue/exampleQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml 
b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/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
new file mode 100644
index 0000000..285bc1d
--- /dev/null
+++ 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,66 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq 
/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.hornetq.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/aeaba392/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
new file mode 100644
index 0000000..0db03be
--- /dev/null
+++ 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -0,0 +1,51 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            
+   <!--the connection factories used by the example-->
+   
+   <connection-factory name="ConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty-connector"/>
+      </connectors>
+      <entries>
+         <entry name="ConnectionFactory"/>
+      </entries>
+               
+      <!-- Pause 1 second between connect attempts -->
+      <retry-interval>1000</retry-interval>
+      
+      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to 
+      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
+      pause is the same length -->
+      <retry-interval-multiplier>1.0</retry-interval-multiplier>
+      
+      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
+      <reconnect-attempts>-1</reconnect-attempts>
+      
+      <!-- When the server is cleanly shutdown we don't want to give up, we 
want to continue
+      to try to reconnect -->
+      <failover-on-server-shutdown>true</failover-on-server-shutdown>
+      
+      <!-- We need to specify a confirmation-window-size to enable 
re-attachment, default is -1 which
+      means no re-attachment -->
+      <confirmation-window-size>1048576</confirmation-window-size>
+      
+   </connection-factory>
+   
+   <!-- This is used by the example to send the management operations, it's 
not central to the example -->
+   <connection-factory name="ConnectionFactory2">
+      <connectors>
+         <connector-ref connector-name="netty-connector2"/>
+      </connectors>
+      <entries>
+         <entry name="ConnectionFactory2"/>                     
+      </entries>
+   </connection-factory>
+
+   <!--the queue used by the example-->
+   <queue name="exampleQueue">
+      <entry name="/queue/exampleQueue"/>
+   </queue>
+
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/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
new file mode 100644
index 0000000..4c0646b
--- /dev/null
+++ 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
@@ -0,0 +1,11 @@
+<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /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/aeaba392/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index c4b0d47..0000000
--- 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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.hornetq.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/aeaba392/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index bf79c33..0000000
--- 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-            
-   <!--the connection factories used by the example-->
-   
-   <connection-factory name="ConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty-connector"/>
-      </connectors>
-      <entries>
-         <entry name="ConnectionFactory"/>
-      </entries>
-               
-      <!-- Pause 1 second between connect attempts -->
-      <retry-interval>1000</retry-interval>
-      
-      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to 
-      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
-      pause is the same length -->
-      <retry-interval-multiplier>1.0</retry-interval-multiplier>
-      
-      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
-      <reconnect-attempts>-1</reconnect-attempts>
-      
-      <!-- When the server is cleanly shutdown we don't want to give up, we 
want to continue
-      to try to reconnect -->
-      <failover-on-server-shutdown>true</failover-on-server-shutdown>
-      
-      <!-- We need to specify a confirmation-window-size to enable 
re-attachment, default is -1 which
-      means no re-attachment -->
-      <confirmation-window-size>1048576</confirmation-window-size>
-      
-   </connection-factory>
-   
-   <!-- This is used by the example to send the management operations, it's 
not central to the example -->
-   <connection-factory name="ConnectionFactory2">
-      <connectors>
-         <connector-ref connector-name="netty-connector2"/>
-      </connectors>
-      <entries>
-         <entry name="ConnectionFactory2"/>                     
-      </entries>
-   </connection-factory>
-
-   <!--the queue used by the example-->
-   <queue name="exampleQueue">
-      <entry name="/queue/exampleQueue"/>
-   </queue>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index 4b83075..0000000
--- 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/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
new file mode 100644
index 0000000..98c78df
--- /dev/null
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,69 @@
+<configuration xmlns="urn:activemq"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/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/aeaba392/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
new file mode 100644
index 0000000..13222eb
--- /dev/null
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -0,0 +1,33 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+   <!--the connection factory used by the example-->
+   <connection-factory name="ConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty-connector"/>
+      </connectors>
+
+      <entries>
+         <entry name="ConnectionFactory"/>
+      </entries>
+       
+       <ha>true</ha>
+      <!-- Pause 1 second between connect attempts -->
+      <retry-interval>1000</retry-interval>
+
+      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to
+      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
+      pause is the same length -->
+      <retry-interval-multiplier>1.0</retry-interval-multiplier>
+
+      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
+      <reconnect-attempts>-1</reconnect-attempts>
+       
+   </connection-factory>
+
+   <!--the queue used by the example-->
+   <queue name="exampleQueue">
+      <entry name="/queue/exampleQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/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
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /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/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 4694b4b..0000000
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<configuration xmlns="urn:activemq"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-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/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index feff6bf..0000000
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-   <!--the connection factory used by the example-->
-   <connection-factory name="ConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty-connector"/>
-      </connectors>
-
-      <entries>
-         <entry name="ConnectionFactory"/>
-      </entries>
-       
-       <ha>true</ha>
-      <!-- Pause 1 second between connect attempts -->
-      <retry-interval>1000</retry-interval>
-
-      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to
-      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
-      pause is the same length -->
-      <retry-interval-multiplier>1.0</retry-interval-multiplier>
-
-      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
-      <reconnect-attempts>-1</reconnect-attempts>
-       
-   </connection-factory>
-
-   <!--the queue used by the example-->
-   <queue name="exampleQueue">
-      <entry name="/queue/exampleQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..cb462cf
--- /dev/null
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -0,0 +1,70 @@
+<configuration xmlns="urn:activemq"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/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/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml
new file mode 100644
index 0000000..e9e4f9d
--- /dev/null
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml
@@ -0,0 +1,32 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+   <!--the connection factory used by the example-->
+   <connection-factory name="ConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty-connector"/>
+      </connectors>
+
+      <entries>
+         <entry name="ConnectionFactory"/>
+      </entries>
+       
+       <ha>true</ha>
+      <!-- Pause 1 second between connect attempts -->
+      <retry-interval>1000</retry-interval>
+
+      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to
+      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
+      pause is the same length -->
+      <retry-interval-multiplier>1.0</retry-interval-multiplier>
+
+      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
+      <reconnect-attempts>-1</reconnect-attempts>
+   </connection-factory>
+
+   <!--the queue used by the example-->
+   <queue name="exampleQueue">
+      <entry name="/queue/exampleQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-users.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /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/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
deleted file mode 100644
index 2a1028a..0000000
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<configuration xmlns="urn:activemq"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-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/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml
deleted file mode 100644
index b10c99e..0000000
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-   <!--the connection factory used by the example-->
-   <connection-factory name="ConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty-connector"/>
-      </connectors>
-
-      <entries>
-         <entry name="ConnectionFactory"/>
-      </entries>
-       
-       <ha>true</ha>
-      <!-- Pause 1 second between connect attempts -->
-      <retry-interval>1000</retry-interval>
-
-      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to
-      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
-      pause is the same length -->
-      <retry-interval-multiplier>1.0</retry-interval-multiplier>
-
-      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
-      <reconnect-attempts>-1</reconnect-attempts>
-   </connection-factory>
-
-   <!--the queue used by the example-->
-   <queue name="exampleQueue">
-      <entry name="/queue/exampleQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..15b539f
--- /dev/null
+++ 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,80 @@
+<configuration xmlns="urn:activemq"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/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>
+   </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>
+   <!-- 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/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..13222eb
--- /dev/null
+++ 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -0,0 +1,33 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+   <!--the connection factory used by the example-->
+   <connection-factory name="ConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty-connector"/>
+      </connectors>
+
+      <entries>
+         <entry name="ConnectionFactory"/>
+      </entries>
+       
+       <ha>true</ha>
+      <!-- Pause 1 second between connect attempts -->
+      <retry-interval>1000</retry-interval>
+
+      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to
+      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
+      pause is the same length -->
+      <retry-interval-multiplier>1.0</retry-interval-multiplier>
+
+      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
+      <reconnect-attempts>-1</reconnect-attempts>
+       
+   </connection-factory>
+
+   <!--the queue used by the example-->
+   <queue name="exampleQueue">
+      <entry name="/queue/exampleQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /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/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 9c36da3..0000000
--- 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<configuration xmlns="urn:activemq"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-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>
-   </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>
-   <!-- 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/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index feff6bf..0000000
--- 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-   <!--the connection factory used by the example-->
-   <connection-factory name="ConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty-connector"/>
-      </connectors>
-
-      <entries>
-         <entry name="ConnectionFactory"/>
-      </entries>
-       
-       <ha>true</ha>
-      <!-- Pause 1 second between connect attempts -->
-      <retry-interval>1000</retry-interval>
-
-      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to
-      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
-      pause is the same length -->
-      <retry-interval-multiplier>1.0</retry-interval-multiplier>
-
-      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
-      <reconnect-attempts>-1</reconnect-attempts>
-       
-   </connection-factory>
-
-   <!--the queue used by the example-->
-   <queue name="exampleQueue">
-      <entry name="/queue/exampleQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..5c8bf43
--- /dev/null
+++ 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -0,0 +1,83 @@
+<configuration xmlns="urn:activemq"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/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>
+         </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>
+
+    <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>
+   <!-- 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/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml
new file mode 100644
index 0000000..e9e4f9d
--- /dev/null
+++ 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml
@@ -0,0 +1,32 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+   <!--the connection factory used by the example-->
+   <connection-factory name="ConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty-connector"/>
+      </connectors>
+
+      <entries>
+         <entry name="ConnectionFactory"/>
+      </entries>
+       
+       <ha>true</ha>
+      <!-- Pause 1 second between connect attempts -->
+      <retry-interval>1000</retry-interval>
+
+      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to
+      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
+      pause is the same length -->
+      <retry-interval-multiplier>1.0</retry-interval-multiplier>
+
+      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
+      <reconnect-attempts>-1</reconnect-attempts>
+   </connection-factory>
+
+   <!--the queue used by the example-->
+   <queue name="exampleQueue">
+      <entry name="/queue/exampleQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-users.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-users.xml
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /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/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
deleted file mode 100644
index 0c115fd..0000000
--- 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<configuration xmlns="urn:activemq"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/schema/hornetq-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>
-         </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>
-
-    <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>
-   <!-- 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/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
deleted file mode 100644
index b10c99e..0000000
--- 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-   <!--the connection factory used by the example-->
-   <connection-factory name="ConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty-connector"/>
-      </connectors>
-
-      <entries>
-         <entry name="ConnectionFactory"/>
-      </entries>
-       
-       <ha>true</ha>
-      <!-- Pause 1 second between connect attempts -->
-      <retry-interval>1000</retry-interval>
-
-      <!-- Multiply subsequent reconnect pauses by this multiplier. This can 
be used to
-      implement an exponential back-off. For our purposes we just set to 1.0 
so each reconnect
-      pause is the same length -->
-      <retry-interval-multiplier>1.0</retry-interval-multiplier>
-
-      <!-- Try reconnecting an unlimited number of times (-1 means 
"unlimited") -->
-      <reconnect-attempts>-1</reconnect-attempts>
-   </connection-factory>
-
-   <!--the queue used by the example-->
-   <queue name="exampleQueue">
-      <entry name="/queue/exampleQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml
 
b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-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/aeaba392/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..8657964
--- /dev/null
+++ 
b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,73 @@
+<configuration xmlns="urn:activemq"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="urn:hornetq 
../../../../../../../../hornetq-server/src/main/resources/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>
+      <replication>
+         <master/>
+      </replication>
+   </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>
+   <!-- 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>

Reply via email to