diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-08-12 23:40:00 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-08-12 23:40:00 +0000 |
| commit | aaa85d1773cf5740e22913a9b5027f0bfebbf1de (patch) | |
| tree | 9455d628d5f7ff6188e9587ff72b6c4cb995b4e1 /java/sca/modules/assembly-xsd/src | |
| parent | 262ad21576300d370897c0d175e5ec2c4521c53b (diff) | |
Workaround the SCA schema validation issue (See http://www.mail-archive.com/dev@tuscany.apache.org/msg08925.html)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@803740 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/assembly-xsd/src')
5 files changed, 9 insertions, 5 deletions
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd index 654d568bab..74cfe9a739 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd @@ -33,7 +33,10 @@ <complexContent> <extension base="sca:CommonExtensionBase"> <sequence> + <!-- Comment out the sca:implementation to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. --> + <!-- <element ref="sca:implementation" minOccurs="0"/> + --> <choice minOccurs="0" maxOccurs="unbounded"> <element name="service" type="sca:ComponentService"/> <element name="reference" @@ -287,7 +290,8 @@ <complexContent> <extension base="sca:CommonExtensionBase"> <sequence> - <element ref="sca:implementation" minOccurs="0"/> + <!-- Set minOccurs="1" instead of "0" to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. --> + <element ref="sca:implementation" minOccurs="1"/> <choice minOccurs="0" maxOccurs="unbounded"> <element name="service" type="sca:ComponentService"/> <element name="reference" type="sca:ComponentReference"/> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd index e21f249ecb..de7bc6bdd0 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="binding.dwr" type="t:DWRBinding" substitutionGroup="sca:binding"/> + <element name="binding.dwr" type="t:DWRBinding"/> <complexType name="DWRBinding"> <complexContent> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd index 4697382296..ce8d47b575 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="binding.http" type="t:HTTPBinding" substitutionGroup="sca:binding"/> + <element name="binding.http" type="t:HTTPBinding"/> <complexType name="HTTPBinding"> <complexContent> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd index 98e0b32834..92142d117d 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="binding.jsonrpc" type="t:JSONRPCBinding" substitutionGroup="sca:binding"/> + <element name="binding.jsonrpc" type="t:JSONRPCBinding"/> <complexType name="JSONRPCBinding"> <complexContent> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd index a0fa641670..9b15010624 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd @@ -25,7 +25,7 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> - <element name="binding.rmi" type="t:RMIBinding" substitutionGroup="sca:binding"/> + <element name="binding.rmi" type="t:RMIBinding"/> <complexType name="RMIBinding"> <complexContent> |