[1/2] activemq-artemis git commit: This closes #1400

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/2] activemq-artemis git commit: This closes #1400

martyntaylor
Repository: activemq-artemis
Updated Branches:
  refs/heads/master f18b4ee0c -> 5b8e781e3


This closes #1400


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5b8e781e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5b8e781e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5b8e781e

Branch: refs/heads/master
Commit: 5b8e781e365376a5aa62e2b881fb2be7db9a0629
Parents: f18b4ee 2cbee11
Author: Martyn Taylor <[hidden email]>
Authored: Mon Jul 17 10:41:02 2017 +0100
Committer: Martyn Taylor <[hidden email]>
Committed: Mon Jul 17 10:41:02 2017 +0100

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


Reply | Threaded
Open this post in threaded view
|

[2/2] activemq-artemis git commit: ARTEMIS-1289 Fix: Unable to configure queues containing "/" in broker.xml

martyntaylor
ARTEMIS-1289 Fix: Unable to configure queues containing "/" in broker.xml



Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2cbee112
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2cbee112
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2cbee112

Branch: refs/heads/master
Commit: 2cbee11230b77a8936e3adc6174fb3f51afc510d
Parents: f18b4ee
Author: Michael Andre Pearce <[hidden email]>
Authored: Fri Jul 14 08:03:20 2017 +0100
Committer: Martyn Taylor <[hidden email]>
Committed: Mon Jul 17 10:41:02 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2cbee112/artemis-server/src/main/resources/schema/artemis-configuration.xsd
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
index 255fe17..fb1d147 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>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2cbee112/artemis-tools/src/test/resources/artemis-configuration.xsd
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/resources/artemis-configuration.xsd b/artemis-tools/src/test/resources/artemis-configuration.xsd
index 3fb01e3..cc5f60e 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>