http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/main/resources/schema/artemis-server.xsd
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/resources/schema/artemis-server.xsd 
b/artemis-server/src/main/resources/schema/artemis-server.xsd
new file mode 100644
index 0000000..552ce5f
--- /dev/null
+++ b/artemis-server/src/main/resources/schema/artemis-server.xsd
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<xsd:schema xmlns="urn:activemq"
+            targetNamespace="urn:activemq"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+            attributeFormDefault="unqualified"
+            elementFormDefault="qualified"
+            version="1.0">
+   <xsd:element name="configuration">
+      <xsd:annotation>
+         <xsd:documentation>
+            Root element for a document specifying the configuration
+            of a single "standalone" server that does not operate
+            as part of a domain.
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexType>
+         <xsd:sequence>
+                <xsd:choice minOccurs="1" maxOccurs="unbounded">
+                   <xsd:any namespace="##other">
+                      <xsd:annotation>
+                         <xsd:documentation>A profile declaration may include 
configuration
+                            elements from other namespaces for the subsystems 
that make up the profile.
+                         </xsd:documentation>
+                      </xsd:annotation>
+                   </xsd:any>
+                </xsd:choice>
+             </xsd:sequence>
+      </xsd:complexType>
+   </xsd:element>
+</xsd:schema>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
index 065e17a..9ec1bc3 100644
--- 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -64,7 +64,7 @@ public class WrongRoleFileConfigurationParserTest extends 
UnitTestCase
    private static final String configuration =
       "<configuration xmlns=\"urn:activemq\"\n" +
          "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; +
-         "xsi:schemaLocation=\"urn:activemq 
/schema/activemq-configuration.xsd\">\n" +
+         "xsi:schemaLocation=\"urn:activemq 
/schema/artemis-configuration.xsd\">\n" +
          "<name>ActiveMQ.main.config</name>" + "\n" +
          
"<log-delegate-factory-class-name>org.apache.activemq.artemis.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>"
 + "\n" +
          
"<bindings-directory>${jboss.server.data.dir}/activemq/bindings</bindings-directory>"
 + "\n" +

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/ConfigurationTest-defaults.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/ConfigurationTest-defaults.xml 
b/artemis-server/src/test/resources/ConfigurationTest-defaults.xml
index 6c6afb0..cb97112 100644
--- a/artemis-server/src/test/resources/ConfigurationTest-defaults.xml
+++ b/artemis-server/src/test/resources/ConfigurationTest-defaults.xml
@@ -17,7 +17,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 ">
    <!-- just use the defaults -->
    <core xmlns="urn:activemq:core"/>
 </configuration>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml 
b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
index 72b89e8..06c9d95 100644
--- a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <resolve-protocols>false</resolve-protocols>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/InvalidConfigurationTest0.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest0.xml 
b/artemis-server/src/test/resources/InvalidConfigurationTest0.xml
index 0efb6b3..e92eb56 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest0.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest0.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/InvalidConfigurationTest1.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest1.xml 
b/artemis-server/src/test/resources/InvalidConfigurationTest1.xml
index 86ab746..debdc10 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest1.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest1.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/InvalidConfigurationTest2.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest2.xml 
b/artemis-server/src/test/resources/InvalidConfigurationTest2.xml
index 300f601..26484d2 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest2.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest2.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/InvalidConfigurationTest3.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest3.xml 
b/artemis-server/src/test/resources/InvalidConfigurationTest3.xml
index 00df30e..49f6d44 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest3.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest3.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/InvalidConfigurationTest4.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest4.xml 
b/artemis-server/src/test/resources/InvalidConfigurationTest4.xml
index 40e9af8..032fd7e 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest4.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest4.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/InvalidConfigurationTest5.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/InvalidConfigurationTest5.xml 
b/artemis-server/src/test/resources/InvalidConfigurationTest5.xml
index ce7c56f..3d32ac4 100644
--- a/artemis-server/src/test/resources/InvalidConfigurationTest5.xml
+++ b/artemis-server/src/test/resources/InvalidConfigurationTest5.xml
@@ -17,7 +17,7 @@
 <configuration
    xmlns="urn:activemq"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/activemq-server.xsd">
+   xsi:schemaLocation="urn:activemq 
../../src/config/common/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <name>SomeNameForUseOnTheApplicationServer</name>
       <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/colocated-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/colocated-hapolicy-config.xml 
b/artemis-server/src/test/resources/colocated-hapolicy-config.xml
index f1bd784..f7872d4 100644
--- a/artemis-server/src/test/resources/colocated-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/colocated-hapolicy-config.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <discovery-groups>
          <discovery-group name="wahey"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/colocated-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/colocated-hapolicy-config2.xml 
b/artemis-server/src/test/resources/colocated-hapolicy-config2.xml
index 415b50a..ff65b54 100644
--- a/artemis-server/src/test/resources/colocated-hapolicy-config2.xml
+++ b/artemis-server/src/test/resources/colocated-hapolicy-config2.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <shared-store>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml 
b/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml
index 230021b..924c22e 100644
--- a/artemis-server/src/test/resources/divertRoutingNameNotRequired.xml
+++ b/artemis-server/src/test/resources/divertRoutingNameNotRequired.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">
 
    <core xmlns="urn:activemq:core">
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/live-only-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config.xml 
b/artemis-server/src/test/resources/live-only-hapolicy-config.xml
index e27924e..356b486 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config.xml
@@ -17,7 +17,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">
       <discovery-groups>
          <discovery-group name="wahey"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/live-only-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config2.xml 
b/artemis-server/src/test/resources/live-only-hapolicy-config2.xml
index 0541783..b1de311 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config2.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config2.xml
@@ -17,7 +17,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">
       <ha-policy>
          <!--only one of the following-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/live-only-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config3.xml 
b/artemis-server/src/test/resources/live-only-hapolicy-config3.xml
index 1f79134..6cd2554 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config3.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config3.xml
@@ -17,7 +17,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">
       <ha-policy>
          <!--only one of the following-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/live-only-hapolicy-config4.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config4.xml 
b/artemis-server/src/test/resources/live-only-hapolicy-config4.xml
index cd05bf4..19def04 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config4.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config4.xml
@@ -17,7 +17,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">
       <ha-policy/>
    </core>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/live-only-hapolicy-config5.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/live-only-hapolicy-config5.xml 
b/artemis-server/src/test/resources/live-only-hapolicy-config5.xml
index b244b9e..6fa80ff 100644
--- a/artemis-server/src/test/resources/live-only-hapolicy-config5.xml
+++ b/artemis-server/src/test/resources/live-only-hapolicy-config5.xml
@@ -17,7 +17,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/artemis-server/src/test/resources/replica-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/replica-hapolicy-config.xml 
b/artemis-server/src/test/resources/replica-hapolicy-config.xml
index e6946a9..7183673 100644
--- a/artemis-server/src/test/resources/replica-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/replica-hapolicy-config.xml
@@ -17,7 +17,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">
       <discovery-groups>
          <discovery-group name="wahey"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/replica-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/replica-hapolicy-config2.xml 
b/artemis-server/src/test/resources/replica-hapolicy-config2.xml
index 15e85c5..95df78b 100644
--- a/artemis-server/src/test/resources/replica-hapolicy-config2.xml
+++ b/artemis-server/src/test/resources/replica-hapolicy-config2.xml
@@ -17,7 +17,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">
       <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/replica-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/replica-hapolicy-config3.xml 
b/artemis-server/src/test/resources/replica-hapolicy-config3.xml
index 71b86b3..369eca6 100644
--- a/artemis-server/src/test/resources/replica-hapolicy-config3.xml
+++ b/artemis-server/src/test/resources/replica-hapolicy-config3.xml
@@ -17,7 +17,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">
       <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/replicated-hapolicy-config.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/replicated-hapolicy-config.xml 
b/artemis-server/src/test/resources/replicated-hapolicy-config.xml
index 1225208..d419314 100644
--- a/artemis-server/src/test/resources/replicated-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/replicated-hapolicy-config.xml
@@ -17,7 +17,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">
       <ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml 
b/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml
index a79589a..cb55b42 100644
--- a/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/shared-store-master-hapolicy-config.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <shared-store>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml 
b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml
index 05b6817..57dff39 100644
--- a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml
+++ b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <discovery-groups>
          <discovery-group name="wahey"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml 
b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
index 3f5a9ed..3c1c19b 100644
--- a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
+++ b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <shared-store>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml 
b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
index 06b0fbb..1c62ae3 100644
--- a/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
+++ b/artemis-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
@@ -17,7 +17,7 @@
 <configuration
       xmlns="urn:activemq"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
+      xsi:schemaLocation="urn:activemq 
../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
    <core xmlns="urn:activemq:core">
       <ha-policy>
          <shared-store>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/docs/user-manual/en/large-messages.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/large-messages.md 
b/docs/user-manual/en/large-messages.md
index b2cbe8f..b9870a0 100644
--- a/docs/user-manual/en/large-messages.md
+++ b/docs/user-manual/en/large-messages.md
@@ -32,7 +32,7 @@ large messages are stored.
 
     <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">
     ...
     <large-messages-directory>/data/large-messages</large-messages-directory>
     ...

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/docs/user-manual/en/paging.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/paging.md b/docs/user-manual/en/paging.md
index f6b92cf..a7252e2 100644
--- a/docs/user-manual/en/paging.md
+++ b/docs/user-manual/en/paging.md
@@ -45,7 +45,7 @@ Global paging parameters are specified on the main 
configuration file
 
     <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">
     ...
     <paging-directory>/somewhere/paging-directory</paging-directory>
     ...

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/docs/user-manual/en/spring-integration.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/spring-integration.md 
b/docs/user-manual/en/spring-integration.md
index 6806912..34c7545 100644
--- a/docs/user-manual/en/spring-integration.md
+++ b/docs/user-manual/en/spring-integration.md
@@ -12,7 +12,7 @@ Let's take this `activemq-jms.xml` file for instance:
 
     <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">
 
        <!--the queue used by the example-->
        <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/core/perf/src/main/resources/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/broker.xml 
b/examples/core/perf/src/main/resources/server0/broker.xml
index 842ef3f..6896640 100644
--- a/examples/core/perf/src/main/resources/server0/broker.xml
+++ b/examples/core/perf/src/main/resources/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">
    <core xmlns="urn:activemq:core">
       
<bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
----------------------------------------------------------------------
diff --git 
a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
 
b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
index ce83e85..74b120e 100644
--- 
a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
+++ 
b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
@@ -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">
    <core xmlns="urn:activemq:core">
       
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/core/vertx-connector/src/main/resources/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/core/vertx-connector/src/main/resources/server0/broker.xml 
b/examples/core/vertx-connector/src/main/resources/server0/broker.xml
index bef7764..1012860 100644
--- a/examples/core/vertx-connector/src/main/resources/server0/broker.xml
+++ b/examples/core/vertx-connector/src/main/resources/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">
       <!--the queue used by the example-->
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
index a48e675..8645df4 100644
--- a/examples/jms/aerogear/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/aerogear/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/application-layer-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml
index 2b2b61f..74270c7 100644
--- 
a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/application-layer-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">
    </jms>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
index 4230f2d..bc5ad71 100644
--- 
a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/broker.xml
@@ -21,7 +21,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/bridge/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
index 248d875..cc79ef0 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/bridge/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-->
       <queue name="sausage-factory"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml 
b/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
index ae4375d..516f179 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/bridge/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/browser/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/browser/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/browser/src/main/resources/activemq/server0/broker.xml
index a92fa6c..5003991 100644
--- a/examples/jms/browser/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/browser/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/client-kickoff/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
index 337e434..df642d1 100644
--- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/client-kickoff/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">
 
    </jms>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
index ace0831..18550ef 100644
--- 
a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/client-side-failoverlistener/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-->
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
index 63413f6..eb70455 100644
--- 
a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/client-side-failoverlistener/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/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
index b21b2f5..7d54128 100644
--- 
a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/client-side-load-balancing/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-->
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
index a3ed424..3d6efdd 100644
--- 
a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/client-side-load-balancing/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-->
       <queue name="exampleQueue"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
 
b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
index b704957..e4bcf5e 100644
--- 
a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/broker.xml
+++ 
b/examples/jms/client-side-load-balancing/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">
    </jms>
    <core xmlns="urn:activemq:core">

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
index d94b55a..e32c8cb 100644
--- 
a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/clustered-durable-subscription/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/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
index a27d74c..b863f56 100644
--- 
a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/clustered-durable-subscription/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 topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
index e363263..8c14b20 100644
--- 
a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/clustered-grouping/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/clustered-grouping/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
index 5c4bb4f..06fefc6 100644
--- 
a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/clustered-grouping/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/clustered-grouping/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
 
b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
index 0e98c4a..7ad49e4 100644
--- 
a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/broker.xml
+++ 
b/examples/jms/clustered-grouping/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/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
index cb6abfd..3edefd0 100644
--- 
a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/clustered-jgroups/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/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml 
b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
index 6a6b1da..aacaecb 100644
--- 
a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/clustered-jgroups/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/clustered-queue/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
index cd5ec4d..ebdbd53 100644
--- 
a/examples/jms/clustered-queue/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/clustered-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/clustered-queue/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml 
b/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
index 25f49d2..7e6426d 100644
--- 
a/examples/jms/clustered-queue/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/clustered-queue/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/clustered-standalone/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
index d13506a..f9db9bc 100644
--- 
a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/clustered-standalone/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/clustered-standalone/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
index b7fc5e5..6cb750e 100644
--- 
a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/clustered-standalone/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 topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
 
b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
index 3f0bdd1..6ea8a26 100644
--- 
a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/broker.xml
+++ 
b/examples/jms/clustered-standalone/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 topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
index b37f4d8..a655fa1 100644
--- 
a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/clustered-static-discovery/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/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
index 8816fb7..7925ff9 100644
--- 
a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/clustered-static-discovery/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/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
 
b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
index a90c7b9..0888816 100644
--- 
a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
+++ 
b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml
@@ -17,7 +17,7 @@
 
 <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/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
 
b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
index b38eae0..60fb6ce 100644
--- 
a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
+++ 
b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml
@@ -17,7 +17,7 @@
 
 <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/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
index 403d6a0..4da5fa9 100644
--- 
a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml
@@ -17,7 +17,7 @@
 
 <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/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
index 9ba1943..f8662cf 100644
--- 
a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml
@@ -17,7 +17,7 @@
 
 <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/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
 
b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
index 63c70cd..a3a8a47 100644
--- 
a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
+++ 
b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml
@@ -17,7 +17,7 @@
 
 <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/clustered-topic/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
index 90e975d..4856aa8 100644
--- 
a/examples/jms/clustered-topic/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/clustered-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/clustered-topic/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml 
b/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
index bb60ecb..a9d16a8 100644
--- 
a/examples/jms/clustered-topic/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/clustered-topic/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 topic used by the example-->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
index 779f66f..c9dec4c 100644
--- 
a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/colocated-failover-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/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
index f8e1a17..20ceb15 100644
--- 
a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/colocated-failover-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/colocated-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
index f125585..5b3221d 100644
--- 
a/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/colocated-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/colocated-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
index f2c8d50..84f38f1 100644
--- 
a/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/colocated-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/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- 
a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/consumer-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/dead-letter/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
index a684f4e..3180b7e 100644
--- a/examples/jms/dead-letter/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/dead-letter/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/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
index fca483a..d23db3d 100644
--- 
a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/delayed-redelivery/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/divert/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
index 8c7fe63..295f882 100644
--- a/examples/jms/divert/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/divert/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">
       <!-- Destinations used by the example -->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/broker.xml 
b/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
index a90aee2..d624897 100644
--- a/examples/jms/divert/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/divert/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">
       <!-- Destinations used by the example -->

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
index 51d9a56..6b661e4 100644
--- 
a/examples/jms/durable-subscription/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/durable-subscription/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/embedded-simple/src/main/resources/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/resources/broker.xml 
b/examples/jms/embedded-simple/src/main/resources/broker.xml
index 68cca46..0448e3b 100644
--- a/examples/jms/embedded-simple/src/main/resources/broker.xml
+++ b/examples/jms/embedded-simple/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">
 
    <core xmlns="urn:activemq:core">
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
index e7ff821..3333732 100644
--- a/examples/jms/expiry/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/expiry/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/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
index 08ee255..8c38aea 100644
--- 
a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/ha-policy-autobackup/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/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
 
b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
index d40f743..ca0f811 100644
--- 
a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/jms/ha-policy-autobackup/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/http-transport/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
index 5bb2090..40cf947 100644
--- a/examples/jms/http-transport/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/http-transport/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/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
index 5b6b4b4..273b698 100644
--- 
a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/instantiate-connection-factory/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/interceptor/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
index 7fa4b1c..b9d2c3c 100644
--- a/examples/jms/interceptor/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/interceptor/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/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
index d398971..0f0eebc 100644
--- 
a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/jms-auto-closeable/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/jms-bridge/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
index 3b1b3a6..d1e96e7 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jms-bridge/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="topic"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml 
b/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
index 00d4d23..a8802d3 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/jms-bridge/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="target"/>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- 
a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/jms-completion-listener/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/jms-context/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/jms-context/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jms-context/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/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
 
b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
index d397c74..0ee3f9d 100644
--- 
a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/jms-shared-consumer/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/jmx/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
index c2c2c3a..b167295 100644
--- a/examples/jms/jmx/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/jmx/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/large-message/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
index e6fdb21..7690094 100644
--- a/examples/jms/large-message/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/large-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/last-value-queue/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git 
a/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml 
b/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
index 10bd7ac..470de98 100644
--- 
a/examples/jms/last-value-queue/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/jms/last-value-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-->

Reply via email to