From 2cbee11230b77a8936e3adc6174fb3f51afc510d Mon Sep 17 00:00:00 2001
From: Michael Andre Pearce <Michael.Andre.Pearce@me.com>
Date: Fri, 14 Jul 2017 08:03:20 +0100
Subject: [PATCH] ARTEMIS-1289 Fix: Unable to configure queues containing "/"
 in broker.xml

---
 .../src/main/resources/schema/artemis-configuration.xsd   | 8 +++++---
 .../src/test/resources/artemis-configuration.xsd          | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
index 255fe172a9..fb1d147403 100644
--- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
@@ -486,13 +486,15 @@
                               </xsd:annotation>
                            </xsd:element>
                         </xsd:all>
-                        <xsd:attribute name="name" type="xsd:ID" use="required">
+                        <xsd:attribute name="name" type="xsd:string" use="required">
                            <xsd:annotation>
                               <xsd:documentation>
                                  unique name of this queue
                               </xsd:documentation>
                            </xsd:annotation>
                         </xsd:attribute>
+                        <xsd:attribute name="max-consumers" type="xsd:integer" use="optional"/>
+                        <xsd:attribute name="purge-on-no-consumers" type="xsd:boolean" use="optional"/>
                      </xsd:complexType>
                   </xsd:element>
                </xsd:sequence>
@@ -1187,7 +1189,7 @@
    <!-- BRIDGE CONFIGURATION -->
    <xsd:complexType name="bridgeType">
       <xsd:sequence>
-         <xsd:element name="queue-name" type="xsd:IDREF" maxOccurs="1" minOccurs="1">
+         <xsd:element name="queue-name" type="xsd:string" maxOccurs="1" minOccurs="1">
             <xsd:annotation>
                <xsd:documentation>
                   name of queue that this bridge consumes from
@@ -2842,7 +2844,7 @@
          <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
          <xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0" />
       </xsd:all>
-      <xsd:attribute name="name" type="xsd:ID" use="required"/>
+      <xsd:attribute name="name" type="xsd:string" use="required"/>
       <xsd:attribute name="max-consumers" type="xsd:integer" use="optional"/>
       <xsd:attribute name="purge-on-no-consumers" type="xsd:boolean" use="optional"/>
    </xsd:complexType>
diff --git a/artemis-tools/src/test/resources/artemis-configuration.xsd b/artemis-tools/src/test/resources/artemis-configuration.xsd
index 3fb01e3619..cc5f60e157 100644
--- a/artemis-tools/src/test/resources/artemis-configuration.xsd
+++ b/artemis-tools/src/test/resources/artemis-configuration.xsd
@@ -468,13 +468,15 @@
                               </xsd:annotation>
                            </xsd:element>
                         </xsd:all>
-                        <xsd:attribute name="name" type="xsd:ID" use="required">
+                        <xsd:attribute name="name" type="xsd:string" use="required">
                            <xsd:annotation>
                               <xsd:documentation>
                                  unique name of this queue
                               </xsd:documentation>
                            </xsd:annotation>
                         </xsd:attribute>
+                        <xsd:attribute name="max-consumers" type="xsd:integer" use="optional"/>
+                        <xsd:attribute name="purge-on-no-consumers" type="xsd:boolean" use="optional"/>
                      </xsd:complexType>
                   </xsd:element>
                </xsd:sequence>
@@ -1047,7 +1049,7 @@
    <!-- BRIDGE CONFIGURATION -->
    <xsd:complexType name="bridgeType">
       <xsd:sequence>
-         <xsd:element name="queue-name" type="xsd:IDREF" maxOccurs="1" minOccurs="1">
+         <xsd:element name="queue-name" type="xsd:string" maxOccurs="1" minOccurs="1">
             <xsd:annotation>
                <xsd:documentation>
                   name of queue that this bridge consumes from
@@ -2615,7 +2617,7 @@
          <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
          <xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0" />
       </xsd:all>
-      <xsd:attribute name="name" type="xsd:ID" use="required"/>
+      <xsd:attribute name="name" type="xsd:string" use="required"/>
       <xsd:attribute name="max-consumers" type="xsd:integer" use="optional"/>
       <xsd:attribute name="purge-on-no-consumers" type="xsd:boolean" use="optional"/>
    </xsd:complexType>