Author: lresende
Date: Thu Mar 18 01:34:06 2010
New Revision: 924581
URL: http://svn.apache.org/viewvc?rev=924581&view=rev
Log:
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
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
tuscany/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd?rev=924581&r1=924580&r2=924581&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
Thu Mar 18 01:34:06 2010
@@ -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"/>
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd?rev=924581&r1=924580&r2=924581&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
Thu Mar 18 01:34:06 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd?rev=924581&r1=924580&r2=924581&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
Thu Mar 18 01:34:06 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd?rev=924581&r1=924580&r2=924581&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
Thu Mar 18 01:34:06 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd?rev=924581&r1=924580&r2=924581&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
Thu Mar 18 01:34:06 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd?rev=924581&r1=924580&r2=924581&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
Thu Mar 18 01:34:06 2010
@@ -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>
