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

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 #1685

jbertram
Repository: activemq-artemis
Updated Branches:
  refs/heads/master a5cef3a4c -> 3124a503c


This closes #1685


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

Branch: refs/heads/master
Commit: 3124a503cacba72c52f47f42d517aa9049292c28
Parents: a5cef3a 6aac6d6
Author: Justin Bertram <[hidden email]>
Authored: Tue Dec 5 09:23:17 2017 -0600
Committer: Justin Bertram <[hidden email]>
Committed: Tue Dec 5 09:23:17 2017 -0600

----------------------------------------------------------------------
 artemis-server/src/main/resources/schema/artemis-server.xsd | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|

[2/2] activemq-artemis git commit: ARTEMIS-1533 Import subschema's so XMLLINT validates broker.xml

jbertram
ARTEMIS-1533 Import subschema's so XMLLINT validates 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/6aac6d6f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6aac6d6f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6aac6d6f

Branch: refs/heads/master
Commit: 6aac6d6f4fa50b23eae12575b8ba7202ca6905a1
Parents: a5cef3a
Author: Michael André Pearce <[hidden email]>
Authored: Mon Dec 4 11:38:37 2017 +0000
Committer: Justin Bertram <[hidden email]>
Committed: Tue Dec 5 09:23:17 2017 -0600

----------------------------------------------------------------------
 artemis-server/src/main/resources/schema/artemis-server.xsd | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6aac6d6f/artemis-server/src/main/resources/schema/artemis-server.xsd
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/resources/schema/artemis-server.xsd b/artemis-server/src/main/resources/schema/artemis-server.xsd
index 1e2e816..2f1cdc1 100644
--- a/artemis-server/src/main/resources/schema/artemis-server.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-server.xsd
@@ -21,6 +21,10 @@
             attributeFormDefault="unqualified"
             elementFormDefault="qualified"
             version="1.0">
+
+   <xsd:import namespace="urn:activemq:core" schemaLocation="artemis-configuration.xsd"/>
+   <xsd:import namespace="urn:activemq:jms" schemaLocation="artemis-jms.xsd"/>
+
    <xsd:element name="configuration">
       <xsd:annotation>
          <xsd:documentation>