diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-18 01:34:06 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-18 01:34:06 +0000 |
| commit | c5992d5d1ea68612d90ffd86eb330a896388add9 (patch) | |
| tree | 4725e04b9b3af8ce47e269fe9a2e5f939bf6b450 /sca-java-2.x/trunk/modules/assembly-xsd/src/main | |
| parent | 36be2422b9ea944591cdd10e67357909581d7c22 (diff) | |
TUSCANY-3451 - Workaround for a simmilar issue described in http://www.osoa.org/jira/browse/ASSEMBLY-177 which is causing issues when creating binding extension in a different namespace
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@924581 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/assembly-xsd/src/main')
5 files changed, 16 insertions, 16 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> |