You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/02/15 15:21:45 UTC

[1/2] activemq-artemis git commit: ARTEMIS-943 fix queueType in import-export schema

Repository: activemq-artemis
Updated Branches:
  refs/heads/master cdc974e71 -> 6474c41ce


ARTEMIS-943 fix queueType in import-export schema

https://issues.apache.org/jira/browse/ARTEMIS-943

queueType in the artemis-import-export schema needs to be marked with
min and max occurs attributes to specify that the element can occur more than one
time.  This is important so JAXB generates the correct bindings.


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

Branch: refs/heads/master
Commit: 637405a886acd272e8721a0bcc7ad39387f6eb2d
Parents: cdc974e
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Wed Feb 15 10:12:07 2017 -0500
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Wed Feb 15 10:15:39 2017 -0500

----------------------------------------------------------------------
 artemis-cli/src/main/resources/schema/artemis-import-export.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/637405a8/artemis-cli/src/main/resources/schema/artemis-import-export.xsd
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/schema/artemis-import-export.xsd b/artemis-cli/src/main/resources/schema/artemis-import-export.xsd
index f689056..e544a61 100644
--- a/artemis-cli/src/main/resources/schema/artemis-import-export.xsd
+++ b/artemis-cli/src/main/resources/schema/artemis-import-export.xsd
@@ -144,7 +144,7 @@
    </xsd:complexType>
    <xsd:complexType name="queuesType">
       <xsd:sequence>
-         <xsd:element type="queueType" name="queue"/>
+         <xsd:element type="queueType" name="queue" minOccurs="1" maxOccurs="unbounded"/>
       </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="bodyType">


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

Posted by jb...@apache.org.
This closes #1019


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

Branch: refs/heads/master
Commit: 6474c41ce662a7d0217841fcf53c0f74928051b3
Parents: cdc974e 637405a
Author: Justin Bertram <jb...@apache.org>
Authored: Wed Feb 15 09:21:31 2017 -0600
Committer: Justin Bertram <jb...@apache.org>
Committed: Wed Feb 15 09:21:31 2017 -0600

----------------------------------------------------------------------
 artemis-cli/src/main/resources/schema/artemis-import-export.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------