activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [18/20] activemq-6 git commit: ACTIVEMQ6-4 - rename all config files
Date Tue, 18 Nov 2014 16:12:31 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
index 8e58f95..dded78e 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy/>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
index e70a938..8619256 100644
--- a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
+++ b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml
@@ -1,6 +1,6 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/replica-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml
index 814116f..71967ff 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/replica-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml
index bd625fa..cb515b3 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config2.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/replica-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml
index 8908956..4455163 100644
--- a/activemq-server/src/test/resources/replica-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/replica-hapolicy-config3.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/replicated-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml
index eecfd68..708f368 100644
--- a/activemq-server/src/test/resources/replicated-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/replicated-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <replication>
          <master>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
index 6ac07f1..c83444d 100644
--- a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <shared-store>
          <master>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
index 4a2f5dd..fea2f07 100644
--- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
+++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <shared-store>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
index afdb8ed..32c5bfa 100644
--- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
+++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <shared-store>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
index 12b01ed..1199402 100644
--- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
+++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
@@ -1,7 +1,7 @@
 <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">
+      xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
    <ha-policy>
       <shared-store>
          <slave>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
index 41bf59c..2d5c80d 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
    
    <paging-directory>${data.dir:../data}/paging</paging-directory>
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
index d2d1359..c5b19ec 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
 
    <connection-factory name="NettyXAConnectionFactory">
       <xa>true</xa>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
index dcaf980..8187c91 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-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/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
index 2c4246d..b1abb74 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 
    <paging-directory>${data.dir:../data}/paging</paging-directory>
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
index d2d1359..c5b19ec 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
 
    <connection-factory name="NettyXAConnectionFactory">
       <xa>true</xa>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
index dcaf980..8187c91 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-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/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
index 5071c04..448d9a4 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
    <!--
    if you want to run this as a backup on different ports you would need to set the following variable
    export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
index d2d1359..c5b19ec 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
 
    <connection-factory name="NettyXAConnectionFactory">
       <xa>true</xa>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
index dcaf980..8187c91 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-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/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
index c43c5e3..81a1ac6 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
    <!--
    if you want to run this as a backup on different ports you would need to set the following variable
    export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
index d2d1359..c5b19ec 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
 
    <connection-factory name="NettyXAConnectionFactory">
       <xa>true</xa>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml
index dcaf980..8187c91 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-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/docs/eap-manual/en/clusters.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml
index 4b082fe..b5eaa4e 100644
--- a/docs/eap-manual/en/clusters.xml
+++ b/docs/eap-manual/en/clusters.xml
@@ -286,7 +286,7 @@
                <programlisting>
    &lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 
       &lt;jmx-domain>org.apache.activemq.backup1&lt;/jmx-domain>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/en/large-messages.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/large-messages.xml b/docs/user-manual/en/large-messages.xml
index 8c2623d..8c11c84 100644
--- a/docs/user-manual/en/large-messages.xml
+++ b/docs/user-manual/en/large-messages.xml
@@ -47,7 +47,7 @@
         <programlisting>
 &lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 ...
 &lt;large-messages-directory>/data/large-messages&lt;/large-messages-directory>
 ...

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/en/paging.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/paging.xml b/docs/user-manual/en/paging.xml
index b152a01..ba82cb0 100644
--- a/docs/user-manual/en/paging.xml
+++ b/docs/user-manual/en/paging.xml
@@ -50,7 +50,7 @@
         <programlisting>
 &lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+   xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 ...
 &lt;paging-directory>/somewhere/paging-directory&lt;/paging-directory>
 ...</programlisting>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/en/security.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.xml b/docs/user-manual/en/security.xml
index b6c1ab5..e9cd187 100644
--- a/docs/user-manual/en/security.xml
+++ b/docs/user-manual/en/security.xml
@@ -151,7 +151,7 @@
         <programlisting>
 &lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../schemas/hornetq-users.xsd ">
+   xsi:schemaLocation="urn:hornetq ../schemas/activemq-users.xsd ">
 
    &lt;defaultuser name="guest" password="guest">
       &lt;role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/en/spring-integration.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/spring-integration.xml b/docs/user-manual/en/spring-integration.xml
index 97e72e1..2c02972 100644
--- a/docs/user-manual/en/spring-integration.xml
+++ b/docs/user-manual/en/spring-integration.xml
@@ -40,7 +40,7 @@
     <programlisting>
 &lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+   xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
    &lt;!--the connection factory used by the example-->
    &lt;connection-factory name="ConnectionFactory">
       &lt;connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/en/using-jms.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-jms.xml b/docs/user-manual/en/using-jms.xml
index 05ce1c3..6845db4 100644
--- a/docs/user-manual/en/using-jms.xml
+++ b/docs/user-manual/en/using-jms.xml
@@ -65,7 +65,7 @@
         <programlisting>
 &lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd ">
+   xsi:schemaLocation="urn:hornetq ../schemas/activemq-jms.xsd ">
     
    &lt;connection-factory name="ConnectionFactory">
       &lt;connectors>
@@ -151,7 +151,7 @@
         <programlisting>
 &lt;configuration xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd ">
+   xsi:schemaLocation="urn:hornetq ../schemas/activemq-jms.xsd ">
 
    &lt;connection-factory name="ConnectionFactory" signature="queue">
       &lt;xa>true&lt;/xa>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/zh/large-messages.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/large-messages.xml b/docs/user-manual/zh/large-messages.xml
index f6d52b5..fdba0ca 100644
--- a/docs/user-manual/zh/large-messages.xml
+++ b/docs/user-manual/zh/large-messages.xml
@@ -33,7 +33,7 @@
         <para>这个参数的名字是<literal>large-messages-directory</literal>:</para>
         <programlisting>&lt;configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 
 ...
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/zh/paging.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/paging.xml b/docs/user-manual/zh/paging.xml
index 436f35b..fbe4a1f 100644
--- a/docs/user-manual/zh/paging.xml
+++ b/docs/user-manual/zh/paging.xml
@@ -38,7 +38,7 @@
             可以定义全局的分页转发参数。</para>
         <programlisting>&lt;configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
             
             ...
             

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/zh/security.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/security.xml b/docs/user-manual/zh/security.xml
index 3dc17a7..db4ded5 100644
--- a/docs/user-manual/zh/security.xml
+++ b/docs/user-manual/zh/security.xml
@@ -114,7 +114,7 @@
         <programlisting>
 &lt;configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:hornetq ../schemas/hornetq-users.xsd "&gt;
+    xsi:schemaLocation="urn:hornetq ../schemas/activemq-users.xsd "&gt;
     
     &lt;defaultuser name="guest" password="guest"&gt;
         &lt;role name="guest"/&gt;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/docs/user-manual/zh/using-jms.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/using-jms.xml b/docs/user-manual/zh/using-jms.xml
index 7b4c3bb..2de7b50 100644
--- a/docs/user-manual/zh/using-jms.xml
+++ b/docs/user-manual/zh/using-jms.xml
@@ -46,7 +46,7 @@
         <programlisting>
 &lt;configuration xmlns="urn:activemq"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd "&gt;
+    xsi:schemaLocation="urn:hornetq ../schemas/activemq-jms.xsd "&gt;
     
     &lt;connection-factory name="ConnectionFactory"&gt;
         &lt;connectors>
@@ -129,7 +129,7 @@
         <programlisting>
 &lt;configuration xmlns="urn:activemq"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd "&gt;
+    xsi:schemaLocation="urn:hornetq ../schemas/activemq-jms.xsd "&gt;
     
     &lt;connection-factory name="ConnectionFactory" signature="queue"&gt;
         &lt;xa>true&lt;/xa>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/activemq-configuration.xml b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
new file mode 100644
index 0000000..bba7586
--- /dev/null
+++ b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
@@ -0,0 +1,53 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
+
+
+
+   <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+   <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+   <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+   <paging-directory>target/server0/data/messaging/paging</paging-directory>
+   <!-- Acceptors -->
+   <acceptors>
+      <acceptor name="netty-acceptor">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="tcp-no-delay" value="false"/>
+         <param key="tcp-send-buffer-size" value="1048576"/>
+         <param key="tcp-receive-buffer-size" value="1048576"/>
+      </acceptor>
+   </acceptors>
+   
+   <security-enabled>false</security-enabled>
+   
+   <persistence-enabled>true</persistence-enabled>
+
+   <journal-sync-non-transactional>true</journal-sync-non-transactional>
+   <journal-sync-transactional>true</journal-sync-transactional>
+   <journal-type>ASYNCIO</journal-type>
+   <journal-min-files>20</journal-min-files>
+   <journal-buffer-timeout>20000</journal-buffer-timeout>
+   <log-journal-write-rate>false</log-journal-write-rate>
+   <run-sync-speed-test>false</run-sync-speed-test>
+
+   <!-- <perf-blast-pages>5000</perf-blast-pages> -->
+  
+   <queues>
+	   <queue name="perfQueue">
+	   	<address>perfAddress</address>
+	   </queue>
+   </queues>
+
+<!--
+   <address-settings>      
+      <address-setting match="perfAddress">
+         <max-size-bytes>10485760</max-size-bytes>
+         <address-full-policy>BLOCK</address-full-policy>
+      </address-setting>
+   </address-settings>
+-->
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
index 7fc797f..a2b63e0 100644
--- a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+            xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
deleted file mode 100644
index b8addc4..0000000
--- a/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,53 +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>target/server0/data/messaging/bindings</bindings-directory>
-
-   <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
-   <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
-   <paging-directory>target/server0/data/messaging/paging</paging-directory>
-   <!-- Acceptors -->
-   <acceptors>
-      <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="tcp-no-delay" value="false"/>
-         <param key="tcp-send-buffer-size" value="1048576"/>
-         <param key="tcp-receive-buffer-size" value="1048576"/>
-      </acceptor>
-   </acceptors>
-   
-   <security-enabled>false</security-enabled>
-   
-   <persistence-enabled>true</persistence-enabled>
-
-   <journal-sync-non-transactional>true</journal-sync-non-transactional>
-   <journal-sync-transactional>true</journal-sync-transactional>
-   <journal-type>ASYNCIO</journal-type>
-   <journal-min-files>20</journal-min-files>
-   <journal-buffer-timeout>20000</journal-buffer-timeout>
-   <log-journal-write-rate>false</log-journal-write-rate>
-   <run-sync-speed-test>false</run-sync-speed-test>
-
-   <!-- <perf-blast-pages>5000</perf-blast-pages> -->
-  
-   <queues>
-	   <queue name="perfQueue">
-	   	<address>perfAddress</address>
-	   </queue>
-   </queues>
-
-<!--
-   <address-settings>      
-      <address-setting match="perfAddress">
-         <max-size-bytes>10485760</max-size-bytes>
-         <address-full-policy>BLOCK</address-full-policy>
-      </address-setting>
-   </address-settings>
--->
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/core/twitter-connector/src/main/resources/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/activemq-configuration.xml b/examples/core/twitter-connector/src/main/resources/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7cc1183
--- /dev/null
+++ b/examples/core/twitter-connector/src/main/resources/server0/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
+
+
+   <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+   <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+   <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+   <paging-directory>target/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="queue.incomingQueue">
+         <permission type="consume" roles="guest"/>
+         <permission type="send" roles="guest"/>
+      </security-setting>
+      <security-setting match="queue.outgoingQueue">
+         <permission type="consume" roles="guest"/>
+         <permission type="send" roles="guest"/>
+      </security-setting>
+   </security-settings>
+
+   <queues>
+      <queue name="queue.incomingQueue">
+         <address>queue.incomingQueue</address>
+      </queue>
+      <queue name="queue.outgoingQueue">
+         <address>queue.outgoingQueue</address>
+      </queue>
+   </queues>
+
+   <connector-services>
+      <connector-service name="my-incoming-tweets">
+         <factory-class>org.apache.activemq.integration.twitter.TwitterIncomingConnectorServiceFactory</factory-class>
+         <param key="queue" value="queue.incomingQueue"/>
+         <param key="consumerKey" value="${twitter.consumerKey}"/>
+         <param key="consumerSecret" value="${twitter.consumerSecret}"/>
+         <param key="accessToken" value="${twitter.accessToken}"/>
+         <param key="accessTokenSecret" value="${twitter.accessTokenSecret}"/>
+         <param key="interval" value="60"/>
+      </connector-service>
+       <connector-service name="my-outgoing-tweets">
+         <factory-class>org.apache.activemq.integration.twitter.TwitterOutgoingConnectorServiceFactory</factory-class>
+         <param key="queue" value="queue.outgoingQueue"/>
+         <param key="consumerKey" value="${twitter.consumerKey}"/>
+         <param key="consumerSecret" value="${twitter.consumerSecret}"/>
+         <param key="accessToken" value="${twitter.accessToken}"/>
+         <param key="accessTokenSecret" value="${twitter.accessTokenSecret}"/>
+      </connector-service>
+   </connector-services>
+   
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/core/twitter-connector/src/main/resources/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/activemq-jms.xml b/examples/core/twitter-connector/src/main/resources/server0/activemq-jms.xml
new file mode 100644
index 0000000..112fefc
--- /dev/null
+++ b/examples/core/twitter-connector/src/main/resources/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/core/twitter-connector/src/main/resources/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/activemq-users.xml b/examples/core/twitter-connector/src/main/resources/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ b/examples/core/twitter-connector/src/main/resources/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/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml b/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
deleted file mode 100644
index 863c73f..0000000
--- a/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,71 +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>target/server0/data/messaging/bindings</bindings-directory>
-
-   <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
-   <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
-   <paging-directory>target/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="queue.incomingQueue">
-         <permission type="consume" roles="guest"/>
-         <permission type="send" roles="guest"/>
-      </security-setting>
-      <security-setting match="queue.outgoingQueue">
-         <permission type="consume" roles="guest"/>
-         <permission type="send" roles="guest"/>
-      </security-setting>
-   </security-settings>
-
-   <queues>
-      <queue name="queue.incomingQueue">
-         <address>queue.incomingQueue</address>
-      </queue>
-      <queue name="queue.outgoingQueue">
-         <address>queue.outgoingQueue</address>
-      </queue>
-   </queues>
-
-   <connector-services>
-      <connector-service name="my-incoming-tweets">
-         <factory-class>org.apache.activemq.integration.twitter.TwitterIncomingConnectorServiceFactory</factory-class>
-         <param key="queue" value="queue.incomingQueue"/>
-         <param key="consumerKey" value="${twitter.consumerKey}"/>
-         <param key="consumerSecret" value="${twitter.consumerSecret}"/>
-         <param key="accessToken" value="${twitter.accessToken}"/>
-         <param key="accessTokenSecret" value="${twitter.accessTokenSecret}"/>
-         <param key="interval" value="60"/>
-      </connector-service>
-       <connector-service name="my-outgoing-tweets">
-         <factory-class>org.apache.activemq.integration.twitter.TwitterOutgoingConnectorServiceFactory</factory-class>
-         <param key="queue" value="queue.outgoingQueue"/>
-         <param key="consumerKey" value="${twitter.consumerKey}"/>
-         <param key="consumerSecret" value="${twitter.consumerSecret}"/>
-         <param key="accessToken" value="${twitter.accessToken}"/>
-         <param key="accessTokenSecret" value="${twitter.accessTokenSecret}"/>
-      </connector-service>
-   </connector-services>
-   
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml b/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml
deleted file mode 100644
index 86a4c75..0000000
--- a/examples/core/twitter-connector/src/main/resources/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/core/twitter-connector/src/main/resources/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml b/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- a/examples/core/twitter-connector/src/main/resources/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/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
new file mode 100644
index 0000000..ef963cb
--- /dev/null
+++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
@@ -0,0 +1,61 @@
+<configuration xmlns="urn:activemq"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
+
+
+   <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+   <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+   <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+   <paging-directory>target/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="queue.vertxQueue">
+         <permission type="consume" roles="guest"/>
+         <permission type="send" roles="guest"/>
+      </security-setting>
+   </security-settings>
+
+   <queues>
+      <queue name="queue.vertxQueue">
+         <address>queue.vertxQueue</address>
+      </queue>
+   </queues>
+
+   <connector-services>
+      <connector-service name="my-incoming-vertx">
+         <factory-class>org.apache.activemq.integration.vertx.VertxIncomingConnectorServiceFactory</factory-class>
+         <param key="queue" value="queue.vertxQueue"/>
+         <param key="host" value="localhost"/>
+         <param key="port" value="0"/>
+         <param key="vertx-address" value="incoming.vertx.address"/>
+      </connector-service>
+      <connector-service name="my-outgoing-vertx">
+         <factory-class>org.apache.activemq.integration.vertx.VertxOutgoingConnectorServiceFactory</factory-class>
+         <param key="queue" value="queue.vertxQueue"/>
+         <param key="host" value="localhost"/>
+         <param key="port" value="0"/>
+         <param key="vertx-address" value="outgoing.vertx.address"/>
+      </connector-service>
+   </connector-services>
+   
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml
new file mode 100644
index 0000000..112fefc
--- /dev/null
+++ b/examples/core/vertx-connector/src/main/resources/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/core/vertx-connector/src/main/resources/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ b/examples/core/vertx-connector/src/main/resources/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/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml b/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
deleted file mode 100644
index ae4ed83..0000000
--- a/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,61 +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>target/server0/data/messaging/bindings</bindings-directory>
-
-   <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
-   <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
-   <paging-directory>target/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="queue.vertxQueue">
-         <permission type="consume" roles="guest"/>
-         <permission type="send" roles="guest"/>
-      </security-setting>
-   </security-settings>
-
-   <queues>
-      <queue name="queue.vertxQueue">
-         <address>queue.vertxQueue</address>
-      </queue>
-   </queues>
-
-   <connector-services>
-      <connector-service name="my-incoming-vertx">
-         <factory-class>org.apache.activemq.integration.vertx.VertxIncomingConnectorServiceFactory</factory-class>
-         <param key="queue" value="queue.vertxQueue"/>
-         <param key="host" value="localhost"/>
-         <param key="port" value="0"/>
-         <param key="vertx-address" value="incoming.vertx.address"/>
-      </connector-service>
-      <connector-service name="my-outgoing-vertx">
-         <factory-class>org.apache.activemq.integration.vertx.VertxOutgoingConnectorServiceFactory</factory-class>
-         <param key="queue" value="queue.vertxQueue"/>
-         <param key="host" value="localhost"/>
-         <param key="port" value="0"/>
-         <param key="vertx-address" value="outgoing.vertx.address"/>
-      </connector-service>
-   </connector-services>
-   
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml b/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml
deleted file mode 100644
index 86a4c75..0000000
--- a/examples/core/vertx-connector/src/main/resources/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/core/vertx-connector/src/main/resources/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml b/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- a/examples/core/vertx-connector/src/main/resources/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/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..10eaee9
--- /dev/null
+++ b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,61 @@
+<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>
+
+    <!-- We need to create a core queue for the JMS queue explicitly because the connector will be deployed
+     before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
+    <queues>
+        <queue name="jms.queue.aerogearQueue">
+            <address>jms.queue.aerogearQueue</address>
+        </queue>
+    </queues>
+
+    <connector-services>
+        <connector-service name="aerogear-connector">
+            <factory-class>org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory</factory-class>
+            <param key="endpoint" value="${endpoint}"/>
+            <param key="queue" value="jms.queue.aerogearQueue"/>
+            <param key="application-id" value="${applicationid}"/>
+            <param key="master-secret" value="${mastersecret}"/>
+        </connector-service>
+    </connector-services>
+
+   <!-- Other config -->
+
+   <security-settings>
+      <!--security for example queue-->
+      <security-setting match="jms.queue.aerogearQueue">
+         <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/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..6ceb6ed
--- /dev/null
+++ b/examples/jms/aerogear/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="aerogearQueue">
+      <entry name="/queue/aerogearQueue"/>
+   </queue>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ b/examples/jms/aerogear/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/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 2e5ee6c..0000000
--- a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,61 +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>
-
-    <!-- We need to create a core queue for the JMS queue explicitly because the connector will be deployed
-     before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
-    <queues>
-        <queue name="jms.queue.aerogearQueue">
-            <address>jms.queue.aerogearQueue</address>
-        </queue>
-    </queues>
-
-    <connector-services>
-        <connector-service name="aerogear-connector">
-            <factory-class>org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory</factory-class>
-            <param key="endpoint" value="${endpoint}"/>
-            <param key="queue" value="jms.queue.aerogearQueue"/>
-            <param key="application-id" value="${applicationid}"/>
-            <param key="master-secret" value="${mastersecret}"/>
-        </connector-service>
-    </connector-services>
-
-   <!-- Other config -->
-
-   <security-settings>
-      <!--security for example queue-->
-      <security-setting match="jms.queue.aerogearQueue">
-         <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/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index aad3f72..0000000
--- a/examples/jms/aerogear/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="aerogearQueue">
-      <entry name="/queue/aerogearQueue"/>
-   </queue>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- a/examples/jms/aerogear/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/applet/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b225b59
--- /dev/null
+++ b/examples/jms/applet/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 topic-->
+      <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/applet/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..252edad
--- /dev/null
+++ b/examples/jms/applet/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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ b/examples/jms/applet/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/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index cf8faad..0000000
--- a/examples/jms/applet/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 topic-->
-      <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/applet/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index 0cf0008..0000000
--- a/examples/jms/applet/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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- a/examples/jms/applet/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/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..d2e153f
--- /dev/null
+++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -0,0 +1,39 @@
+<configuration xmlns="urn:activemq"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
+
+   <!-- 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>
+
+   <!-- 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>
+
+   <journal-directory>target/data/journal</journal-directory>
+   <bindings-directory>target/data/bindings</bindings-directory>
+   <large-messages-directory>target/data/large-messages</large-messages-directory>
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml
new file mode 100644
index 0000000..9a03836
--- /dev/null
+++ b/examples/jms/application-layer-failover/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/application-layer-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-users.xml
new file mode 100644
index 0000000..8187c91
--- /dev/null
+++ b/examples/jms/application-layer-failover/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/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
deleted file mode 100644
index 7f4388b..0000000
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<configuration xmlns="urn:activemq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
-
-   <!-- 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>
-
-   <!-- 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>
-
-   <journal-directory>target/data/journal</journal-directory>
-   <bindings-directory>target/data/bindings</bindings-directory>
-   <large-messages-directory>target/data/large-messages</large-messages-directory>
-</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/aeaba392/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml
deleted file mode 100644
index c2e9a5c..0000000
--- a/examples/jms/application-layer-failover/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/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml
deleted file mode 100644
index dcaf980..0000000
--- a/examples/jms/application-layer-failover/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/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..efb3de2
--- /dev/null
+++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration xmlns="urn:activemq"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd">
+
+   <!-- Connectors -->
+
+   <connectors>
+      <connector name="netty-connector">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+         <param key="port" value="5446"/>
+      </connector>
+   </connectors>
+
+   <!-- Acceptors -->
+   <acceptors>
+      <acceptor name="netty-acceptor">
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+         <param key="port" value="5446"/>
+      </acceptor>
+   </acceptors>
+
+   <!-- Other config -->
+
+   <security-settings>
+      <!--security for example queue-->
+      <security-setting match="jms.queue.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>
+
+   <journal-directory>target/data/journal</journal-directory>
+   <bindings-directory>target/data/bindings</bindings-directory>
+   <large-messages-directory>target/data/large-messages</large-messages-directory>
+</configuration>

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


Mime
View raw message