You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2015/04/29 19:03:18 UTC

[14/32] activemq-artemis git commit: renamed schemas

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
index 451ea5a..2c97901 100644
--- a/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq ../../../../src/schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/management/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/activemq/server0/broker.xml b/examples/jms/management/src/main/resources/activemq/server0/broker.xml
index 37667b7..36eec30 100644
--- a/examples/jms/management/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/management/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
index 04a7647..8d4ed29 100644
--- a/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/message-counters/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq ../../../../src/schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/message-group/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/message-group2/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/message-priority/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
index c660fcb..52eb917 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
index 63413f6..eb70455 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
index a0c551c..dff08b3 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
index 26ec841..ca23965 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
index 63413f6..eb70455 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
index 866807e..482b4ce 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
index 3720459..1a5bc0b 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
index 3e9396e..ecb5cda 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
index db48b82..73823a6 100644
--- a/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/openwire/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/broker.xml b/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
index 4c17f40..a7a1969 100644
--- a/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/paging/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/activemq/server0/broker.xml b/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
index 38bed8c..a642ac5 100644
--- a/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/perf/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="perfQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
index 5151c36..f29acbc 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
index 2a5ac6f..eafc6c8 100644
--- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
index 53ad18c..c27781d 100644
--- a/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/proton-j/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
index 409118b..81e0b07 100644
--- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
index 8d1d189..e745c71 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
index c6cfa5d..7bb693f 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
index dda202b..6c344c2 100644
--- a/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/queue-requestor/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
index ddb9d67..78f96f3 100644
--- a/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/broker.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/broker.xml b/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
index 301581b..0edc66a 100644
--- a/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
index 81a7633..2bb3552 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
index f7ecac7..71e2e4e 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
index cd267dc..8a93350 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
index 6ed8c39..eec921f 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
index 29dcbb2..eb47eb2 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
index 25d85b0..344bfbf 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
index 6994070..804f63f 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
index 9e90b2c..597f828 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
index 8c7538d..cdefc88 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
index dda202b..6c344c2 100644
--- a/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/request-reply/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
index 1a20ecb..6fe4547 100644
--- a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
    </jms>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/rest/dup-send/src/main/resources/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/broker.xml b/examples/jms/rest/dup-send/src/main/resources/broker.xml
index 640bf6e..8cc0fa6 100644
--- a/examples/jms/rest/dup-send/src/main/resources/broker.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/broker.xml b/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
index 01bb590..e5e1364 100644
--- a/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
+++ b/examples/jms/rest/javascript-chat/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
index 1a20ecb..6fe4547 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
    </jms>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml b/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
index 640bf6e..8cc0fa6 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/rest/push/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/activemq-client.xml b/examples/jms/rest/push/src/main/resources/activemq-client.xml
index 1a20ecb..6fe4547 100644
--- a/examples/jms/rest/push/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/push/src/main/resources/activemq-client.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
    </jms>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/rest/push/src/main/resources/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/broker.xml b/examples/jms/rest/push/src/main/resources/broker.xml
index 19ab6b3..13f2f23 100644
--- a/examples/jms/rest/push/src/main/resources/broker.xml
+++ b/examples/jms/rest/push/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queues used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
index eded681..4a38a74 100644
--- a/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/scale-down/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
index e2959c2..57fa72d 100644
--- a/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/scale-down/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/scheduled-message/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/security/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/activemq/server0/broker.xml b/examples/jms/security/src/main/resources/activemq/server0/broker.xml
index 8b964a3..6a8b82b 100644
--- a/examples/jms/security/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/security/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <topic name="genericTopic"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/spring-integration/src/main/resources/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/resources/broker.xml b/examples/jms/spring-integration/src/main/resources/broker.xml
index fdc8811..2970329 100644
--- a/examples/jms/spring-integration/src/main/resources/broker.xml
+++ b/examples/jms/spring-integration/src/main/resources/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
index 3e28f69..f0de0fc 100644
--- a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
index 5563394..7442fac 100644
--- a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
index 64fa1d8..ca09b3b 100644
--- a/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/static-selector/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
index 59ad29b..ce256a9 100644
--- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml b/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
index 5d43ce4..b24f1da 100644
--- a/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stomp/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
index 5d43ce4..b24f1da 100644
--- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
index 5d43ce4..b24f1da 100644
--- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
index ef63e10..6ea24c1 100644
--- a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
index 0e3c7d8..da69fce 100644
--- a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
index 0f39cab..312d7a2 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
index 10bd5a2..f7c2569 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
index 9f0ed5a..b87a19e 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
index 2781eac..0374876 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
index 1c1fa81..25b099c 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
index e51abd2..8efb4aa 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
index e269320..d595086 100644
--- a/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
index 5e89f3e..1f94195 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topics used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
index 212a144..e7c1a14 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
index 212a144..e7c1a14 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/broker.xml b/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
index 212a144..e7c1a14 100644
--- a/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/topic/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
index 00a6a75..1041aca 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
index f7cb5ae..27f33f6 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml b/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/transactional/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/xa-receive/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/xa-send/src/main/resources/activemq/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns="urn:activemq"
-               xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/soak/normal/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/server0/broker.xml b/examples/soak/normal/server0/broker.xml
index 8a168b3..7f1f435 100644
--- a/examples/soak/normal/server0/broker.xml
+++ b/examples/soak/normal/server0/broker.xml
@@ -20,7 +20,7 @@ under the License.
 
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <queue name="soakQueue"/>
    </jms>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/config/server-start-stop-backup-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml
index 7996fdb..47c1145 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+         xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    
    <core xmlns="urn:activemq:core">
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/config/server-start-stop-backup-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-backup-jms-config1.xml b/tests/config/server-start-stop-backup-jms-config1.xml
index b9044a8..4dc3b12 100644
--- a/tests/config/server-start-stop-backup-jms-config1.xml
+++ b/tests/config/server-start-stop-backup-jms-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
    
    <queue name="myJMSQueue/>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/config/server-start-stop-live-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml
index 749d902..98cce9e 100644
--- a/tests/config/server-start-stop-live-config1.xml
+++ b/tests/config/server-start-stop-live-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+         xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
 
    <core xmlns="urn:activemq:core">
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/config/server-start-stop-live-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-live-jms-config1.xml b/tests/config/server-start-stop-live-jms-config1.xml
index 7c84896..055833c 100644
--- a/tests/config/server-start-stop-live-jms-config1.xml
+++ b/tests/config/server-start-stop-live-jms-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
    
    <queue name="myJMSQueue"/>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
index cff7331..1990d93 100644
--- a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
+++ b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq ../../src/schemas/activemq-server.xsd ">
+            xsi:schemaLocation="urn:activemq ../../src/schemas/artemis-server.xsd ">
    <jms xmlns="urn:activemq:jms">
       <queue name="fullConfigurationQueue"/>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
index c04de3d..f3380d0 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">tcp://localhost:61616</connector>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
index 1e0b266..1cf81e5 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq schema/activemq-configuration.xsd">
+            xsi:schemaLocation="urn:activemq schema/artemis-configuration.xsd">
 
    <connectors>
       <connector name="netty-connector">tcp://localhost:5645</connector>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
index 4025851..5e1d9a2 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
    
    <queue name="myJMSQueue"/>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
index 4025851..5e1d9a2 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
    
    <queue name="myJMSQueue"/>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
index 46142dd..b85e581 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
       <queue name="myJMSQueue"/>
    </jms>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/integration-tests/src/test/resources/spring-activemq-config.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/spring-activemq-config.xml b/tests/integration-tests/src/test/resources/spring-activemq-config.xml
index e7dd1cc..1e0d2c2 100644
--- a/tests/integration-tests/src/test/resources/spring-activemq-config.xml
+++ b/tests/integration-tests/src/test/resources/spring-activemq-config.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+               xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
 
    <jms xmlns="urn:activemq:jms">
       <!--the queue used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/jms-tests/src/test/resources/broker.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/broker.xml b/tests/jms-tests/src/test/resources/broker.xml
index 10f6a8d..4a06012 100644
--- a/tests/jms-tests/src/test/resources/broker.xml
+++ b/tests/jms-tests/src/test/resources/broker.xml
@@ -16,7 +16,7 @@
 -->
 <configuration xmlns="urn:activemq"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:activemq ../../../src/schema/activemq-server.xsd">
+            xsi:schemaLocation="urn:activemq ../../../src/schema/artemis-server.xsd">
    <jms xmlns="urn:activemq:jms">
 
    </jms>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
index 48f3f9d..5972d3d 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConfigurationValidationTest.java
@@ -40,7 +40,7 @@ public class ConfigurationValidationTest extends UnitTestCase
    // Public --------------------------------------------------------
 
    /**
-    * test does not pass in eclipse (because it can not find activemq-configuration.xsd).
+    * test does not pass in eclipse (because it can not find artemis-configuration.xsd).
     * It runs fine on the CLI with the proper env setting.
     */
    @Test
@@ -49,7 +49,7 @@ public class ConfigurationValidationTest extends UnitTestCase
       String xml = "<core xmlns='urn:activemq:core'>" + "</core>";
       Element element = XMLUtil.stringToElement(xml);
       Assert.assertNotNull(element);
-      XMLUtil.validate(element, "schema/activemq-configuration.xsd");
+      XMLUtil.validate(element, "schema/artemis-configuration.xsd");
    }
 
    @Test