Return-Path: <commits-return-48006-archive-asf-public=cust-asf.ponee.io@activemq.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 86CEC200CC9
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 17 Jul 2017 11:41:17 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 853C3164A1B; Mon, 17 Jul 2017 09:41:17 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id CB42D164A0E
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 17 Jul 2017 11:41:16 +0200 (CEST)
Received: (qmail 70505 invoked by uid 500); 17 Jul 2017 09:41:16 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 70496 invoked by uid 99); 17 Jul 2017 09:41:16 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jul 2017 09:41:16 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 0F5F7E96A6; Mon, 17 Jul 2017 09:41:15 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: martyntaylor@apache.org
To: commits@activemq.apache.org
Date: Mon, 17 Jul 2017 09:41:16 -0000
Message-Id: <3b5a2fbe01194232946bfea9d8387203@git.apache.org>
In-Reply-To: <095df64224a247098687d7ae0241384f@git.apache.org>
References: <095df64224a247098687d7ae0241384f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] activemq-artemis git commit: ARTEMIS-1289 Fix: Unable to
 configure queues containing "/" in broker.xml
archived-at: Mon, 17 Jul 2017 09:41:17 -0000

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 <Michael.Andre.Pearce@me.com>
Authored: Fri Jul 14 08:03:20 2017 +0100
Committer: Martyn Taylor <mtaylor@redhat.com>
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>