Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Michael Andre Pearce 2017-07-14 08:03:20 +01:00 committed by Martyn Taylor
parent f18b4ee0c9
commit 2cbee11230
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artemis-server/src/main/resources/schema/artemis-configuration.xsd
View File

@ -486,13 +486,15 @@
</xsd:annotation> </xsd:annotation>
</xsd:element> </xsd:element>
</xsd:all> </xsd:all>
<xsd:attribute name="name" type="xsd:ID" use="required"> <xsd:attribute name="name" type="xsd:string" use="required">
<xsd:annotation> <xsd:annotation>
<xsd:documentation> <xsd:documentation>
unique name of this queue unique name of this queue
</xsd:documentation> </xsd:documentation>
</xsd:annotation> </xsd:annotation>
</xsd:attribute> </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:complexType>
</xsd:element> </xsd:element>
</xsd:sequence> </xsd:sequence>
@ -1187,7 +1189,7 @@
<!-- BRIDGE CONFIGURATION --> <!-- BRIDGE CONFIGURATION -->
<xsd:complexType name="bridgeType"> <xsd:complexType name="bridgeType">
<xsd:sequence> <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:annotation>
<xsd:documentation> <xsd:documentation>
name of queue that this bridge consumes from name of queue that this bridge consumes from
@ -2842,7 +2844,7 @@
<xsd:element ref="filter" maxOccurs="1" minOccurs="0"/> <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
<xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0" /> <xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0" />
</xsd:all> </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="max-consumers" type="xsd:integer" use="optional"/>
<xsd:attribute name="purge-on-no-consumers" type="xsd:boolean" use="optional"/> <xsd:attribute name="purge-on-no-consumers" type="xsd:boolean" use="optional"/>
</xsd:complexType> </xsd:complexType>

8
artemis-tools/src/test/resources/artemis-configuration.xsd
View File

@ -468,13 +468,15 @@
</xsd:annotation> </xsd:annotation>
</xsd:element> </xsd:element>
</xsd:all> </xsd:all>
<xsd:attribute name="name" type="xsd:ID" use="required"> <xsd:attribute name="name" type="xsd:string" use="required">
<xsd:annotation> <xsd:annotation>
<xsd:documentation> <xsd:documentation>
unique name of this queue unique name of this queue
</xsd:documentation> </xsd:documentation>
</xsd:annotation> </xsd:annotation>
</xsd:attribute> </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:complexType>
</xsd:element> </xsd:element>
</xsd:sequence> </xsd:sequence>
@ -1047,7 +1049,7 @@
<!-- BRIDGE CONFIGURATION --> <!-- BRIDGE CONFIGURATION -->
<xsd:complexType name="bridgeType"> <xsd:complexType name="bridgeType">
<xsd:sequence> <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:annotation>
<xsd:documentation> <xsd:documentation>
name of queue that this bridge consumes from name of queue that this bridge consumes from
@ -2615,7 +2617,7 @@
<xsd:element ref="filter" maxOccurs="1" minOccurs="0"/> <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
<xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0" /> <xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0" />
</xsd:all> </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="max-consumers" type="xsd:integer" use="optional"/>
<xsd:attribute name="purge-on-no-consumers" type="xsd:boolean" use="optional"/> <xsd:attribute name="purge-on-no-consumers" type="xsd:boolean" use="optional"/>
</xsd:complexType> </xsd:complexType>