diff options
6 files changed, 20 insertions, 20 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd index e2f2a572ee..e72ff866ce 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd @@ -257,7 +257,7 @@ <element ref="sca:binding"/> <element ref="sca:requires"/> <element ref="sca:policySetAttachment"/> - <any namespace="##other" processContents="lax"/> + <!-- any namespace="##other" processContents="lax"/ --> </choice> <attribute name="requires" type="sca:listOfQNames" use="optional"/> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd index b5a67b7bbb..52445c14c5 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd @@ -25,16 +25,16 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="binding.dwr" type="t:DWRBinding"/> + <element name="binding.dwr" type="t:DWRBinding" substitutionGroup="sca:binding"/> <complexType name="DWRBinding"> <complexContent> <extension base="sca:Binding"> <sequence> - <any namespace="##targetNamespace" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> + <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/ --> </sequence> - <anyAttribute namespace="##any" processContents="lax"/> + <!-- anyAttribute namespace="##any" processContents="lax"/ --> </extension> </complexContent> </complexType> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd index cd874e9f13..67feb54963 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd @@ -25,16 +25,16 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="binding.http" type="t:HTTPBinding"/> + <element name="binding.http" type="t:HTTPBinding" substitutionGroup="sca:binding"/> <complexType name="HTTPBinding"> <complexContent> <extension base="sca:Binding"> <sequence> - <any namespace="##targetNamespace" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> + <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/ --> </sequence> - <anyAttribute namespace="##any" processContents="lax"/> + <!-- anyAttribute namespace="##any" processContents="lax"/--> </extension> </complexContent> </complexType> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd index c4e2bbf58b..d1bdcbdfae 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd @@ -25,16 +25,16 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="binding.jsonrpc" type="t:JSONRPCBinding"/> + <element name="binding.jsonrpc" type="t:JSONRPCBinding" substitutionGroup="sca:binding"/> <complexType name="JSONRPCBinding"> <complexContent> <extension base="sca:Binding"> <sequence> - <any namespace="##targetNamespace" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> + <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/ --> </sequence> - <anyAttribute namespace="##any" processContents="lax"/> + <!-- anyAttribute namespace="##any" processContents="lax"/ --> </extension> </complexContent> </complexType> diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd index 9cc641cc1f..ea39a773e0 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd @@ -25,14 +25,14 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/> - <element name="binding.rmi" type="t:RMIBinding"/> + <element name="binding.rmi" type="t:RMIBinding" substitutionGroup="sca:binding"/> <complexType name="RMIBinding"> <complexContent> <extension base="sca:Binding"> <sequence> - <any namespace="##targetNamespace" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> + <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/ --> </sequence> </extension> </complexContent> diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd index 7c5747a1ca..e533ecd168 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd +++ b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd @@ -25,16 +25,16 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" />
- <element name="binding.jsonp" type="t:JSONPBinding"/>
+ <element name="binding.jsonp" type="t:JSONPBinding" substitutionGroup="sca:binding"/>
<complexType name="JSONPBinding">
<complexContent>
<extension base="sca:Binding">
- <sequence>
+ <!-- sequence>
<any namespace="##targetNamespace" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
- </sequence>
- <anyAttribute namespace="##other" processContents="lax"/>
+ </sequence -->
+ <!-- anyAttribute namespace="##other" processContents="lax"/-->
</extension>
</complexContent>
</complexType>
|