diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-08-18 13:55:52 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-08-18 13:55:52 +0000 |
commit | ed42783b7d9f43ab72e53eb0166c8830f8d20025 (patch) | |
tree | b823b225bf6214f5470af405f66c7595295621ee /sca-java-2.x/trunk/modules/assembly-xsd/src/main | |
parent | 9ca49365c62bc6a37ec07a8f719fc84561f323c9 (diff) |
Update JMS schema for operationSelector and wireformat schema fix proposal
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@986680 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/assembly-xsd/src/main')
2 files changed, 16 insertions, 4 deletions
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-rev1.xsd index 0fd827dadc..a43ca5a76e 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-rev1.xsd @@ -166,9 +166,21 @@ <element name="binding.jms" type="sca:JMSBinding" substitutionGroup="sca:binding"/> - <element name="wireFormat.jmsDefault" type="sca:WireFormatType" + <complexType name="JMSDefaultWireFormatType"> + <complexContent> + <extension base="sca:WireFormatType"/> + </complexContent> + </complexType> + + <complexType name="JMSDefaultOperationSelectorType"> + <complexContent> + <extension base="sca:OperationSelectorType"/> + </complexContent> + </complexType> + + <element name="wireFormat.jmsDefault" type="sca:JMSDefaultWireFormatType" substitutionGroup="sca:wireFormat"/> - <element name="operationSelector.jmsDefault" type="sca:OperationSelectorType" + <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 200f3e50a4..e99c0860e0 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,9 +23,9 @@ 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.xsd"/> + <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-1.1-cd05.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05-rev1.xsd"/> <!-- wire formats --> <!-- --> |