http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..ed38809
--- /dev/null
+++ 
b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,47 @@
+<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>
+
+
+   <remoting-incoming-interceptors>
+      
<class-name>org.apache.activemq.jms.example.SimpleInterceptor</class-name>
+   </remoting-incoming-interceptors>
+
+   <!-- 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/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..9a03836
--- /dev/null
+++ 
b/examples/jms/interceptor/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/interceptor/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/interceptor/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/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 0c1cc53..0000000
--- 
a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,47 +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>
-
-
-   <remoting-incoming-interceptors>
-      
<class-name>org.apache.activemq.jms.example.SimpleInterceptor</class-name>
-   </remoting-incoming-interceptors>
-
-   <!-- 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/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index c2e9a5c..0000000
--- 
a/examples/jms/interceptor/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/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml 
b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/interceptor/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/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..c2dc300
--- /dev/null
+++ 
b/examples/jms/jaas/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/jaas/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..9a03836
--- /dev/null
+++ b/examples/jms/jaas/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/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 62eedeb..0000000
--- 
a/examples/jms/jaas/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/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index c2e9a5c..0000000
--- a/examples/jms/jaas/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/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..8d25acc
--- /dev/null
+++ 
b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,42 @@
+<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, note we have removed send privs-->
+      <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"/>
+      </security-setting>
+   </security-settings>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..9a03836
--- /dev/null
+++ 
b/examples/jms/jms-auto-closeable/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/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/jms-auto-closeable/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/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 0f5789d..0000000
--- 
a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,42 +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, note we have removed send privs-->
-      <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"/>
-      </security-setting>
-   </security-settings>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml
 
b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index c2e9a5c..0000000
--- 
a/examples/jms/jms-auto-closeable/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/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/jms-auto-closeable/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/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7d21ca7
--- /dev/null
+++ 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,35 @@
+ <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>
+      <connector name="netty">
+         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="host" value="localhost"/>
+      </connector>
+   </connectors>
+
+   <acceptors>
+      <acceptor name="netty">
+         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+      </acceptor>
+   </acceptors>
+
+   <security-settings>
+         <security-setting match="jms.#">
+            <permission type="consume" roles="guest"/>
+            <permission type="send" roles="guest"/>
+            <permission type="createNonDurableQueue" roles="guest"/>
+            <permission type="deleteNonDurableQueue" roles="guest"/>
+         </security-setting>
+    </security-settings>
+</configuration>
+ 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..2601dfc
--- /dev/null
+++ 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -0,0 +1,27 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+
+   <connection-factory name="ConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/source/ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="ClientConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/client/ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <topic name="topic">
+      <entry name="/source/topic"/>
+   </topic>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index ef2174f..0000000
--- 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,35 +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>
-      <connector name="netty">
-         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="host" value="localhost"/>
-      </connector>
-   </connectors>
-
-   <acceptors>
-      <acceptor name="netty">
-         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-      </acceptor>
-   </acceptors>
-
-   <security-settings>
-         <security-setting match="jms.#">
-            <permission type="consume" roles="guest"/>
-            <permission type="send" roles="guest"/>
-            <permission type="createNonDurableQueue" roles="guest"/>
-            <permission type="deleteNonDurableQueue" roles="guest"/>
-         </security-setting>
-    </security-settings>
-</configuration>
- 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index a2629c9..0000000
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-
-   <connection-factory name="ConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/source/ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="ClientConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/client/ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <topic name="topic">
-      <entry name="/source/topic"/>
-   </topic>
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
index dcaf980..8187c91 100644
--- 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
+++ 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd">
+            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"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..72b251e
--- /dev/null
+++ 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -0,0 +1,42 @@
+ <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}/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>
+      <connector name="netty">
+         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <!-- **************************************** -->
+         <!-- Replace with the *target* server address -->
+         <!-- **************************************** -->
+         <param key="host" value="localhost"/>
+         <param key="port" value="5455"/>
+      </connector>
+   </connectors>
+
+   <acceptors>
+      <acceptor name="netty">
+         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <!-- the server accepts connections on all the server addresses -->
+         <param key="host" value="localhost"/>
+         <param key="port" value="5455"/>
+      </acceptor>
+   </acceptors>
+
+   <security-settings>
+         <security-setting match="jms.#">
+            <permission type="consume" roles="guest"/>
+            <permission type="send" roles="guest"/>
+            <permission type="createNonDurableQueue" roles="guest"/>
+            <permission type="deleteNonDurableQueue" roles="guest"/>
+         </security-setting>
+    </security-settings>
+</configuration>
+ 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml
new file mode 100644
index 0000000..585cd92
--- /dev/null
+++ 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml
@@ -0,0 +1,27 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+
+   <connection-factory name="ConnectionFactory">
+      <xa>true</xa>
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/target/ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="ClientConnectionFactory">
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="/client/ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <queue name="target">
+      <entry name="/target/queue"/>
+   </queue>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-users.xml 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/jms-bridge/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/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
deleted file mode 100644
index 7b68744..0000000
--- 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml
+++ /dev/null
@@ -1,42 +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}/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>
-      <connector name="netty">
-         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <!-- **************************************** -->
-         <!-- Replace with the *target* server address -->
-         <!-- **************************************** -->
-         <param key="host" value="localhost"/>
-         <param key="port" value="5455"/>
-      </connector>
-   </connectors>
-
-   <acceptors>
-      <acceptor name="netty">
-         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <!-- the server accepts connections on all the server addresses -->
-         <param key="host" value="localhost"/>
-         <param key="port" value="5455"/>
-      </acceptor>
-   </acceptors>
-
-   <security-settings>
-         <security-setting match="jms.#">
-            <permission type="consume" roles="guest"/>
-            <permission type="send" roles="guest"/>
-            <permission type="createNonDurableQueue" roles="guest"/>
-            <permission type="deleteNonDurableQueue" roles="guest"/>
-         </security-setting>
-    </security-settings>
-</configuration>
- 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
deleted file mode 100644
index e46b4c2..0000000
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<configuration xmlns="urn:activemq"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
-
-   <connection-factory name="ConnectionFactory">
-      <xa>true</xa>
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/target/ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <connection-factory name="ClientConnectionFactory">
-      <connectors>
-         <connector-ref connector-name="netty"/>
-      </connectors>
-      <entries>
-         <entry name="/client/ConnectionFactory"/>
-      </entries>
-   </connection-factory>
-
-   <queue name="target">
-      <entry name="/target/queue"/>
-   </queue>
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml 
b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/jms-bridge/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/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..c2dc300
--- /dev/null
+++ 
b/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..9a03836
--- /dev/null
+++ 
b/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 62eedeb..0000000
--- 
a/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml
 
b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index c2e9a5c..0000000
--- 
a/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/jms-completion-listener/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/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..c2dc300
--- /dev/null
+++ 
b/examples/jms/jms-context/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/jms-context/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/jms-context/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/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 62eedeb..0000000
--- 
a/examples/jms/jms-context/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/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index c2e9a5c..0000000
--- 
a/examples/jms/jms-context/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/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml 
b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/jms-context/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/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..f6cbf6b
--- /dev/null
+++ 
b/examples/jms/jms-shared-consumer/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.topic.exampleTopic">
+         <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/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..e0173b6
--- /dev/null
+++ 
b/examples/jms/jms-shared-consumer/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 topic used by the example-->
+    <topic name="exampleTopic">
+        <entry name="/topic/exampleTopic"/>
+    </topic>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/jms-shared-consumer/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/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 0e75771..0000000
--- 
a/examples/jms/jms-shared-consumer/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.topic.exampleTopic">
-         <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/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml
 
b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index 17cc336..0000000
--- 
a/examples/jms/jms-shared-consumer/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 topic used by the example-->
-    <topic name="exampleTopic">
-        <entry name="/topic/exampleTopic"/>
-    </topic>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/jms-shared-consumer/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/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..05c41c1
--- /dev/null
+++ 
b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,45 @@
+<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>
+
+
+    <!-- true to expose HornetQ resources through JMX -->
+    <jmx-management-enabled>true</jmx-management-enabled>
+
+   <!-- Connectors -->
+   <connectors>
+      <connector name="netty">
+         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+      </connector>
+   </connectors>
+   
+   <!-- Acceptors -->
+   <acceptors>
+      <acceptor name="netty">
+         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+      </acceptor>
+   </acceptors>
+
+   <!-- 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/jmx/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0f3158e
--- /dev/null
+++ b/examples/jms/jmx/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" signature="queue">
+      <connectors>
+         <connector-ref connector-name="netty"/>
+      </connectors>
+      <entries>
+         <entry name="ConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <!--the queue used by the example-->
+   <queue name="exampleQueue">
+      <entry name="/queue/exampleQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ b/examples/jms/jmx/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/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml 
b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index d98fc4d..0000000
--- 
a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,45 +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>
-
-
-    <!-- true to expose HornetQ resources through JMX -->
-    <jmx-management-enabled>true</jmx-management-enabled>
-
-   <!-- Connectors -->
-   <connectors>
-      <connector name="netty">
-         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-      </connector>
-   </connectors>
-   
-   <!-- Acceptors -->
-   <acceptors>
-      <acceptor name="netty">
-         
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-      </acceptor>
-   </acceptors>
-
-   <!-- 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/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index 8d0d6d7..0000000
--- a/examples/jms/jmx/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"/>
-      </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/jmx/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml 
b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- a/examples/jms/jmx/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/large-message/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..1d2d05c
--- /dev/null
+++ 
b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,42 @@
+<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/large-message/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..48880d6
--- /dev/null
+++ 
b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -0,0 +1,20 @@
+<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>
+      <min-large-message-size>10240</min-large-message-size>
+      <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/large-message/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/large-message/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/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
 
b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 1031cd8..0000000
--- 
a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,42 +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/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index 8bf378d..0000000
--- 
a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ /dev/null
@@ -1,20 +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>
-      <min-large-message-size>10240</min-large-message-size>
-      <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/large-message/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml
 
b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- 
a/examples/jms/large-message/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/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..695c699
--- /dev/null
+++ 
b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,50 @@
+<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.lastValueQueue">
+         <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>
+      <!--override the expiry address for the example-->
+      <address-setting match="jms.queue.lastValueQueue">
+         <last-value-queue>true</last-value-queue>
+      </address-setting>
+   </address-settings>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..e58f7c7
--- /dev/null
+++ 
b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -0,0 +1,18 @@
+<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="lastValueQueue">
+      <entry name="/queue/lastValueQueue"/>
+   </queue>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ 
b/examples/jms/last-value-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

Reply via email to