You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/08/13 01:40:01 UTC
svn commit: r803740 - in
/tuscany/java/sca/modules/assembly-xsd/src/main/resources:
sca-core-1.1-cd04.xsd tuscany-sca-1.1-binding-dwr.xsd
tuscany-sca-1.1-binding-http.xsd tuscany-sca-1.1-binding-jsonrpc.xsd
tuscany-sca-1.1-binding-rmi.xsd
Author: rfeng
Date: Wed Aug 12 23:40:00 2009
New Revision: 803740
URL: http://svn.apache.org/viewvc?rev=803740&view=rev
Log:
Workaround the SCA schema validation issue (See http://www.mail-archive.com/dev@tuscany.apache.org/msg08925.html)
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
Modified: tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd?rev=803740&r1=803739&r2=803740&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd (original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd Wed Aug 12 23:40:00 2009
@@ -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"/>
Modified: tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd?rev=803740&r1=803739&r2=803740&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd (original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd Wed Aug 12 23:40:00 2009
@@ -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>
Modified: tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd?rev=803740&r1=803739&r2=803740&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd (original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd Wed Aug 12 23:40:00 2009
@@ -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>
Modified: tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd?rev=803740&r1=803739&r2=803740&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd (original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd Wed Aug 12 23:40:00 2009
@@ -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>
Modified: tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd?rev=803740&r1=803739&r2=803740&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd (original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd Wed Aug 12 23:40:00 2009
@@ -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>