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 2015/04/29 19:03:23 UTC
[19/32] activemq-artemis git commit: renamed schemas
renamed schemas
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/24a4c634
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/24a4c634
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/24a4c634
Branch: refs/heads/master
Commit: 24a4c63458e737169613df826fa3e6879e87b20b
Parents: ac5bb8f
Author: Andy Taylor <an...@apache.org>
Authored: Wed Apr 29 10:49:43 2015 +0100
Committer: Andy Taylor <an...@apache.org>
Committed: Wed Apr 29 10:49:43 2015 +0100
----------------------------------------------------------------------
.../artemis/cli/commands/etc/broker.xml | 2 +-
.../config/impl/FileJMSConfiguration.java | 2 +-
.../src/main/resources/schema/activemq-jms.xsd | 59 -
.../src/main/resources/schema/artemis-jms.xsd | 59 +
.../src/main/resources/schema/activemq-rest.xsd | 119 -
.../src/main/resources/schema/artemis-rest.xsd | 119 +
artemis-rest/src/test/resources/broker.xml | 2 +-
.../core/config/impl/FileConfiguration.java | 2 +-
.../deployers/impl/FileConfigurationParser.java | 2 +-
.../resources/schema/activemq-configuration.xsd | 2151 ------------------
.../main/resources/schema/activemq-server.xsd | 46 -
.../resources/schema/artemis-configuration.xsd | 2151 ++++++++++++++++++
.../main/resources/schema/artemis-server.xsd | 46 +
.../WrongRoleFileConfigurationParserTest.java | 2 +-
.../resources/ConfigurationTest-defaults.xml | 2 +-
.../resources/ConfigurationTest-full-config.xml | 2 +-
.../resources/InvalidConfigurationTest0.xml | 2 +-
.../resources/InvalidConfigurationTest1.xml | 2 +-
.../resources/InvalidConfigurationTest2.xml | 2 +-
.../resources/InvalidConfigurationTest3.xml | 2 +-
.../resources/InvalidConfigurationTest4.xml | 2 +-
.../resources/InvalidConfigurationTest5.xml | 2 +-
.../resources/colocated-hapolicy-config.xml | 2 +-
.../resources/colocated-hapolicy-config2.xml | 2 +-
.../resources/divertRoutingNameNotRequired.xml | 2 +-
.../resources/live-only-hapolicy-config.xml | 2 +-
.../resources/live-only-hapolicy-config2.xml | 2 +-
.../resources/live-only-hapolicy-config3.xml | 2 +-
.../resources/live-only-hapolicy-config4.xml | 2 +-
.../resources/live-only-hapolicy-config5.xml | 2 +-
.../test/resources/replica-hapolicy-config.xml | 2 +-
.../test/resources/replica-hapolicy-config2.xml | 2 +-
.../test/resources/replica-hapolicy-config3.xml | 2 +-
.../resources/replicated-hapolicy-config.xml | 2 +-
.../shared-store-master-hapolicy-config.xml | 2 +-
.../shared-store-slave-hapolicy-config.xml | 2 +-
.../shared-store-slave-hapolicy-config2.xml | 2 +-
.../shared-store-slave-hapolicy-config3.xml | 2 +-
docs/user-manual/en/large-messages.md | 2 +-
docs/user-manual/en/paging.md | 2 +-
docs/user-manual/en/spring-integration.md | 2 +-
.../perf/src/main/resources/server0/broker.xml | 2 +-
.../hornetq-configuration-messaging-lab.xml | 2 +-
.../src/main/resources/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server3/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../src/main/resources/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../src/main/resources/activemq-client.xml | 2 +-
.../rest/dup-send/src/main/resources/broker.xml | 2 +-
.../src/main/resources/broker.xml | 2 +-
.../src/main/resources/activemq-client.xml | 2 +-
.../jms-to-rest/src/main/resources/broker.xml | 2 +-
.../push/src/main/resources/activemq-client.xml | 2 +-
.../jms/rest/push/src/main/resources/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../src/main/resources/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server2/broker.xml | 2 +-
.../main/resources/activemq/server3/broker.xml | 2 +-
.../main/resources/activemq/server4/broker.xml | 2 +-
.../main/resources/activemq/server5/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server1/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
.../main/resources/activemq/server0/broker.xml | 2 +-
examples/soak/normal/server0/broker.xml | 2 +-
.../config/server-start-stop-backup-config1.xml | 2 +-
.../server-start-stop-backup-jms-config1.xml | 2 +-
tests/config/server-start-stop-live-config1.xml | 2 +-
.../server-start-stop-live-jms-config1.xml | 2 +-
.../activemq-jms-for-JMSServerDeployerTest.xml | 2 +-
.../colocated-server-start-stop-config1.xml | 2 +-
.../colocated-server-start-stop-config2.xml | 2 +-
.../colocated-server-start-stop-jms-config1.xml | 2 +-
.../colocated-server-start-stop-jms-config2.xml | 2 +-
.../resources/server-start-stop-config1.xml | 2 +-
.../test/resources/spring-activemq-config.xml | 2 +-
tests/jms-tests/src/test/resources/broker.xml | 2 +-
.../impl/ConfigurationValidationTest.java | 4 +-
195 files changed, 2563 insertions(+), 2563 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 9f9489a..35ca9c6 100644
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -20,7 +20,7 @@ under the License.
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+ xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<jms xmlns="urn:activemq:jms">
<queue name="DLQ"/>
<queue name="ExpiryQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
index c3610cd..68ac4bc 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/FileJMSConfiguration.java
@@ -38,7 +38,7 @@ import java.util.Map;
public class FileJMSConfiguration extends JMSConfigurationImpl implements Deployable
{
- private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-jms.xsd";
+ private static final String CONFIGURATION_SCHEMA_URL = "schema/artemis-jms.xsd";
private static final String CONFIGURATION_SCHEMA_ROOT_ELEMENT = "jms";
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-jms-server/src/main/resources/schema/activemq-jms.xsd
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/resources/schema/activemq-jms.xsd b/artemis-jms-server/src/main/resources/schema/activemq-jms.xsd
deleted file mode 100644
index 0a01c32..0000000
--- a/artemis-jms-server/src/main/resources/schema/activemq-jms.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="urn:activemq:jms"
- targetNamespace="urn:activemq:jms"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
-
- <xsd:element name="jms">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq"
- minOccurs="0" maxOccurs="1"/>
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element ref="queue" maxOccurs="1" minOccurs="1"/>
- <xsd:element ref="topic" maxOccurs="1" minOccurs="1"/>
- </xsd:choice>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="queue" type="queueType"></xsd:element>
-
- <xsd:element name="topic" type="topicType"></xsd:element>
-
- <xsd:complexType name="queueType">
- <xsd:sequence>
- <xsd:element name="selector" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="topicType">
- <xsd:sequence>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-jms-server/src/main/resources/schema/artemis-jms.xsd
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/resources/schema/artemis-jms.xsd b/artemis-jms-server/src/main/resources/schema/artemis-jms.xsd
new file mode 100644
index 0000000..0a01c32
--- /dev/null
+++ b/artemis-jms-server/src/main/resources/schema/artemis-jms.xsd
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns="urn:activemq:jms"
+ targetNamespace="urn:activemq:jms"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <xsd:element name="jms">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq"
+ minOccurs="0" maxOccurs="1"/>
+ <xsd:choice maxOccurs="unbounded" minOccurs="0">
+ <xsd:element ref="queue" maxOccurs="1" minOccurs="1"/>
+ <xsd:element ref="topic" maxOccurs="1" minOccurs="1"/>
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="queue" type="queueType"></xsd:element>
+
+ <xsd:element name="topic" type="topicType"></xsd:element>
+
+ <xsd:complexType name="queueType">
+ <xsd:sequence>
+ <xsd:element name="selector" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="topicType">
+ <xsd:sequence>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+</xsd:schema>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-rest/src/main/resources/schema/activemq-rest.xsd
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/resources/schema/activemq-rest.xsd b/artemis-rest/src/main/resources/schema/activemq-rest.xsd
deleted file mode 100644
index de52b74..0000000
--- a/artemis-rest/src/main/resources/schema/activemq-rest.xsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<xsd:schema xmlns="urn:activemq:rest" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:activemq:rest">
-
- <xsd:element name="rest-messaging">
- <xsd:complexType>
- <xsd:all>
- <xsd:element name="server-in-vm-id" type="xsd:string" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- The ActiveMQ REST implementation uses the IN-VM transport to communicate
- with ActiveMQ. It uses the default server id, which is "0".
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="use-link-headers" type="xsd:boolean" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- By default, all links (URLs) are published using custom headers.
- You can instead have the ActiveMQ REST implementation publish links
- using the Link Header specification instead if you desire.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="default-durable-send" type="xsd:boolean" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- Whether a posted message should be persisted by default if the user
- does not specify a durable query parameter.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="dups-ok" type="xsd:boolean" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- If this is true, no duplicate detection protocol will be enforced for
- message posting.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="topic-push-store-dir" type="xsd:string" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- This must be a relative or absolute file system path. This is a
- directory where push registrations for topics are stored.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="queue-push-store-dir" type="xsd:string" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- This must be a relative or absolute file system path. This is a
- directory where push registrations for queues are stored.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="producer-session-pool-size" type="xsd:int" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- The REST implementation pools ActiveMQ sessions for sending messages.
- This is the size of the pool. That number of sessions will be created
- at startup time.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="producer-time-to-live" type="xsd:long" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- Default time to live for posted messages. Default is no ttl.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="session-timeout-task-interval" type="xsd:int" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- Pull consumers and pull subscriptions can time out. This is the
- interval the thread that checks for timed-out sessions will run at. A
- value of 1 means it will run every 1 second.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="consumer-session-timeout-seconds" type="xsd:int" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- Timeout in seconds for pull consumers/subscriptions that remain idle
- for that amount of time.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="consumer-window-size" type="xsd:int" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>
- For consumers, this config option is the same as the ActiveMQ one of the
- same name. It will be used by sessions created by the ActiveMQ REST
- implementation.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:all>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
-
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-rest/src/main/resources/schema/artemis-rest.xsd
----------------------------------------------------------------------
diff --git a/artemis-rest/src/main/resources/schema/artemis-rest.xsd b/artemis-rest/src/main/resources/schema/artemis-rest.xsd
new file mode 100644
index 0000000..de52b74
--- /dev/null
+++ b/artemis-rest/src/main/resources/schema/artemis-rest.xsd
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsd:schema xmlns="urn:activemq:rest" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:activemq:rest">
+
+ <xsd:element name="rest-messaging">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element name="server-in-vm-id" type="xsd:string" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The ActiveMQ REST implementation uses the IN-VM transport to communicate
+ with ActiveMQ. It uses the default server id, which is "0".
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="use-link-headers" type="xsd:boolean" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ By default, all links (URLs) are published using custom headers.
+ You can instead have the ActiveMQ REST implementation publish links
+ using the Link Header specification instead if you desire.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="default-durable-send" type="xsd:boolean" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Whether a posted message should be persisted by default if the user
+ does not specify a durable query parameter.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="dups-ok" type="xsd:boolean" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ If this is true, no duplicate detection protocol will be enforced for
+ message posting.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="topic-push-store-dir" type="xsd:string" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ This must be a relative or absolute file system path. This is a
+ directory where push registrations for topics are stored.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="queue-push-store-dir" type="xsd:string" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ This must be a relative or absolute file system path. This is a
+ directory where push registrations for queues are stored.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="producer-session-pool-size" type="xsd:int" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The REST implementation pools ActiveMQ sessions for sending messages.
+ This is the size of the pool. That number of sessions will be created
+ at startup time.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="producer-time-to-live" type="xsd:long" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Default time to live for posted messages. Default is no ttl.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="session-timeout-task-interval" type="xsd:int" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Pull consumers and pull subscriptions can time out. This is the
+ interval the thread that checks for timed-out sessions will run at. A
+ value of 1 means it will run every 1 second.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="consumer-session-timeout-seconds" type="xsd:int" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Timeout in seconds for pull consumers/subscriptions that remain idle
+ for that amount of time.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="consumer-window-size" type="xsd:int" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ For consumers, this config option is the same as the ActiveMQ one of the
+ same name. It will be used by sessions created by the ActiveMQ REST
+ implementation.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
+
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-rest/src/test/resources/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/resources/broker.xml b/artemis-rest/src/test/resources/broker.xml
index 5986c24..2993d98 100644
--- a/artemis-rest/src/test/resources/broker.xml
+++ b/artemis-rest/src/test/resources/broker.xml
@@ -16,7 +16,7 @@
-->
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<jms xmlns="urn:activemq:jms">
<!--the queue used by the example-->
<queue name="exampleQueue"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java
index a3aa9ba..be9497b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/FileConfiguration.java
@@ -34,7 +34,7 @@ public final class FileConfiguration extends ConfigurationImpl implements Deploy
{
private static final long serialVersionUID = -4766689627675039596L;
- private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-configuration.xsd";
+ private static final String CONFIGURATION_SCHEMA_URL = "schema/artemis-configuration.xsd";
private static final String CONFIGURATION_SCHEMA_ROOT_ELEMENT = "core";
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24a4c634/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index c64bee2..8a2969b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -73,7 +73,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
- * Parses an XML document according to the {@literal activemq-configuration.xsd} schema.
+ * Parses an XML document according to the {@literal artemis-configuration.xsd} schema.
*/
public final class FileConfigurationParser extends XMLConfigurationUtil
{