http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
index 39fc734..7950ec3 100644
--- 
a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/management-notifications/src/main/resources/hornetq/server0/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-security.xsd">
+            xsi:schemaLocation="urn:activemq ../schema/hornetq-security.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/e91ef714/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
index 5752742..ee472b2 100644
--- 
a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/management/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml
index 6b575ad..0a8701d 100644
--- 
a/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/management/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory" signature="queue">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/management/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/management/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/management/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/management/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/management/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml
index 0e66fc4..14ddbcb 100644
--- 
a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
../../../../src/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
../../../../src/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
index a42e643..5814b76 100644
--- 
a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/message-counters/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory" signature="queue">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/message-counters/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-configuration.xml
index 1d2d05c..9fa4061 100644
--- 
a/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/message-group/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/message-group/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml 
b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
index 112fefc..452b958 100644
--- 
a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
+++ 
b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-configuration.xml
index 1d2d05c..9fa4061 100644
--- 
a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/message-group2/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
index 671d601..ec6c3d9 100644
--- 
a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/message-group2/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/message-group2/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-configuration.xml
index 1d2d05c..9fa4061 100644
--- 
a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/message-priority/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml
index 112fefc..452b958 100644
--- 
a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/message-priority/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/message-priority/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
index 6bc1876..3a086ee 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
index 13222eb..889b59d 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
index 48e22ad..55f0ffc 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
index e9e4f9d..c3b0393 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-users.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-users.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
index 7cd662e..328ade9 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
index 4f2ea0f..41d711b 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-users.xml
 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-users.xml
+++ 
b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index b2eb971..f4004c4 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
index 13222eb..889b59d 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index b309bbb..8c6b49f 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
index e9e4f9d..c3b0393 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
index ef8090e..99413b1 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
index 4f2ea0f..41d711b 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml
 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml
+++ 
b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml
index c2dc300..e0acd1d 100644
--- 
a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
index b42254f..a679ccc 100644
--- 
a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index a147f10..461bff8 100644
--- 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <ha-policy>
       <shared-store>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
index e9e4f9d..c3b0393 100644
--- 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index f9d8ccd..4419628 100644
--- 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    <ha-policy>
       <shared-store>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
index 8dc8b2a..a5ea085 100644
--- 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
+++ 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
+++ 
b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml
index 3d2a708..8932ff8 100644
--- 
a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/openwire/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml
index 9a03836..3058fc8 100644
--- a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/openwire/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/openwire/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml
index b4046d2..5772b45 100644
--- 
a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/paging/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml
index 2c0f192..16a1074 100644
--- a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/paging/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/paging/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
index 64396b6..4eb3215 100644
--- 
a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml
index 3e609e9..0fe8db1 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
 
b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
index f377ba1..9b77211 100644
--- 
a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
+++ 
b/examples/jms/perf/src/main/resources/hornetq/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
    <!-- Acceptors -->

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
index 20b9ea9..23fb7ea 100644
--- 
a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml
index 9a03836..3058fc8 100644
--- 
a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml
index 570843b..679a17a 100644
--- 
a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
index 2b1bd73..c68b505 100644
--- 
a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml
index 1807a20..5f1bf17 100644
--- 
a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+               xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml
index 74485ee..b96601e 100644
--- 
a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+               xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
 
    <!--the queue used by the example-->
    <queue name="exampleQueue">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml
index 2d66dba..846d0af 100644
--- 
a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/proton-j/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml
index fe421b3..0fe7509 100644
--- a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/proton-j/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
 
    <!--the queue used by the example-->
    <queue name="exampleQueue">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/proton-j/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml
index b9e679e..c05d92c 100644
--- 
a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml
index 8b1838c..d97607a 100644
--- 
a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the queue used by the example-->
    <queue name="exampleQueue">
       <entry name="/queue/exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml
index 07b7455..3d0ec8c 100644
--- 
a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
index 7ed345e..5884905 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
index 112fefc..452b958 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
index 9c10f9a..70b8a58 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
index 112fefc..452b958 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
+++ 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml
 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml
+++ 
b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
index aa51e9b..e1af71e 100644
--- 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
index e28ae3d..f38ed2d 100644
--- 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory" signature="queue">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
index 172e6e5..676ebfc 100644
--- 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq"            
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
index 112fefc..452b958 100644
--- 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
index c2dc300..e0acd1d 100644
--- 
a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/queue/src/main/resources/hornetq/server0/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/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml 
b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml
index 9a03836..3058fc8 100644
--- a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml
+++ b/examples/jms/queue/src/main/resources/hornetq/server0/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/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml 
b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/queue/src/main/resources/hornetq/server0/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/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
index 285bc1d..0dad558 100644
--- 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq 
/schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq 
/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
index 0db03be..c24e03b 100644
--- 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
             
    <!--the connection factories used by the example-->
    

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
index 4c0646b..58ecc13 100644
--- 
a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
index 98c78df..be10b3d 100644
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -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/activemq-configuration.xsd">
+         xsi:schemaLocation="urn:activemq 
../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
index 13222eb..889b59d 100644
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
@@ -1,6 +1,6 @@
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
    <!--the connection factory used by the example-->
    <connection-factory name="ConnectionFactory">
       <connectors>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e91ef714/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
index 8187c91..ae30546 100644
--- 
a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
+++ 
b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 <configuration xmlns="urn:activemq" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-            xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd">
+            xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
    <!-- the default user.  this is used where username is null-->
    <defaultuser name="guest" password="guest">
       <role name="guest"/>

Reply via email to