diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-10 15:28:41 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-10 15:28:41 +0000 |
commit | e19eab0957fcfd2aef865227836a413b85e528f8 (patch) | |
tree | b14682759f846cfb59ffbf698cf086c45a378b12 /sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources | |
parent | a894a235309ff3ea236a46d8d42a6389bf730d34 (diff) |
Update to the very latest OASIS JMS binding schema so we can verify whats being voted on tomorrow does actually work ok
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1033518 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources')
-rw-r--r-- | sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd | 2 | ||||
-rw-r--r-- | sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev2.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev1.xsd) | 38 | ||||
-rw-r--r-- | sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd | 2 |
3 files changed, 34 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd index 1e38d384ca..d85a905c3e 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05-rev1.xsd @@ -21,7 +21,7 @@ <include schemaLocation="sca-binding-ws-1.1-cd04-rev1.xsd"/> <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/> - <include schemaLocation="sca-binding-jms-1.1-cd04-rev1.xsd"/> + <include schemaLocation="sca-binding-jms-1.1-cd04-rev2.xsd"/> <include schemaLocation="sca-binding-jca-1.1-cd04-rev1.xsd"/> <include schemaLocation="sca-binding-sca-1.1-cd05-rev1.xsd"/> <include schemaLocation="sca-binding-ejb-1.1-cd02-rev1.xsd"/> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev2.xsd index 35b706a90f..8e303f3a3f 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev1.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04-rev2.xsd @@ -6,7 +6,7 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd05-rev1.xsd"/> + <include schemaLocation="sca-core-1.1-cd06.xsd"/> <complexType name="JMSBinding"> <complexContent> @@ -96,7 +96,7 @@ <complexType name="JMSHeaders"> <sequence> - <element name="property" type="sca:BindingProperty" + <element name="property" type="sca:JMSUserProperty" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="type" type="string"/> @@ -163,8 +163,29 @@ </simpleContent> </complexType> - <element name="binding.jms" type="sca:JMSBinding" - substitutionGroup="sca:binding"/> + <simpleType name="JMSUserPropertyType"> + <restriction base="string"> + <enumeration value="boolean"/> + <enumeration value="byte"/> + <enumeration value="short"/> + <enumeration value="int"/> + <enumeration value="long"/> + <enumeration value="float"/> + <enumeration value="double"/> + <enumeration value="String"/> + <enumeration value="xs:string"/> + </restriction> + </simpleType> + + <complexType name="JMSUserProperty"> + <simpleContent> + <extension base="string"> + <attribute name="name" type="NMTOKEN" use="required"/> + <attribute name="type" type="sca:JMSUserPropertyType" + use="optional" default="String"/> + </extension> + </simpleContent> + </complexType> <complexType name="JMSDefaultWireFormatType"> <complexContent> @@ -178,9 +199,14 @@ </complexContent> </complexType> - <element name="wireFormat.jmsDefault" type="sca:JMSDefaultWireFormatType" + <element name="binding.jms" type="sca:JMSBinding" + substitutionGroup="sca:binding"/> + + <element name="wireFormat.jmsDefault" + type="sca:JMSDefaultWireFormatType" substitutionGroup="sca:wireFormat"/> - <element name="operationSelector.jmsDefault" type="sca:JMSDefaultOperationSelectorType" + <element name="operationSelector.jmsDefault" + type="sca:JMSDefaultOperationSelectorType" substitutionGroup="sca:operationSelector"/> </schema>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd index e99c0860e0..6dfc85e8cc 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd @@ -23,7 +23,7 @@ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-binding-jms-1.1-cd04-rev1.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-binding-jms-1.1-cd04-rev2.xsd"/> <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05-rev1.xsd"/> |