You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/03/18 02:34:34 UTC
svn commit: r924588 -
/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/
Author: lresende
Date: Thu Mar 18 01:34:34 2010
New Revision: 924588
URL: http://svn.apache.org/viewvc?rev=924588&view=rev
Log:
TUSCANY-3453 - Updating OASIS schema to allow extensibility of bindings and other elements such as wireFormats and operationSelectors and enabling Binding-JMS schema
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
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-jms.xsd
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd?rev=924588&r1=924587&r2=924588&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd Thu Mar 18 01:34:34 2010
@@ -20,9 +20,9 @@
<include schemaLocation="sca-implementation-spring-1.1-cd01.xsd"/>
<include schemaLocation="sca-binding-ws-1.1-cd04.xsd"/>
- <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/>
<include schemaLocation="sca-binding-jms-1.1-cd04.xsd"/>
- <include schemaLocation="sca-binding-jca-1.1-cd04.xsd"/>
+ <include schemaLocation="sca-binding-jca-1.1-cd04.xsd"/>
<include schemaLocation="sca-binding-sca-1.1-cd05.xsd"/>
<include schemaLocation="sca-binding-ejb-1.1-cd01.xsd"/>
@@ -35,5 +35,4 @@
<include schemaLocation="sca-contribution-java-1.1-cd02.xsd"/>
<include schemaLocation="sca-jee-1.1-wd03.xsd"/>
-
</schema>
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd?rev=924588&r1=924587&r2=924588&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd Thu Mar 18 01:34:34 2010
@@ -21,10 +21,10 @@
<complexType name="EJBSessionBeanBinding">
<complexContent>
<extension base="sca:Binding">
- <sequence>
+ <!-- sequence>
<any namespace="##other" processContents="lax"
minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
+ </sequence-->
<attribute name="homeInterface" type="NCName" use="optional"/>
<attribute name="ejb-link-name" type="string" use="optional"/>
<attribute name="ejb-version" type="sca:VersionValue" use="optional" default="EJB3"/>
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd?rev=924588&r1=924587&r2=924588&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd Thu Mar 18 01:34:34 2010
@@ -22,8 +22,8 @@
type="sca:JCAInboundInteraction" minOccurs="0" />
<element name="property" type="sca:Property" minOccurs="0"
maxOccurs="unbounded" />
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded" />
+ <!-- any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded" /-->
</sequence>
<attribute name="connectionInfo" type="anyURI" use="optional" />
<attribute name="initialContextFactory" type="anyURI"
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd?rev=924588&r1=924587&r2=924588&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd Thu Mar 18 01:34:34 2010
@@ -24,8 +24,8 @@
<sequence>
<element name="endpointReference" type="wsa:EndpointReferenceType"
minOccurs="0" maxOccurs="unbounded"/>
- <any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded"/>
+ <!-- any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded"/-->
</sequence>
<attribute name="wsdlElement" type="anyURI" use="optional"/>
<attribute ref="wsdli:wsdlLocation" use="optional"/>
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=924588&r1=924587&r2=924588&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:34 2010
@@ -215,8 +215,8 @@
<complexContent>
<extension base="sca:CommonExtensionBase">
<sequence>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
+ <!-- any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/-->
</sequence>
<attribute name="type" type="QName" use="required"/>
<attribute name="alwaysProvides" type="sca:listOfQNames"
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd?rev=924588&r1=924587&r2=924588&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd Thu Mar 18 01:34:34 2010
@@ -27,12 +27,6 @@
<import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
- <!-- these schema types are not actually used at the moment as we rely on
- any elements in the underlying JMS binding schema to pull in wireFormat
- and operationSelection elements. However it's useful to keep track of
- what we expect the shape of these elements to be -->
-
-
<!-- wire formats -->
<!-- -->
<complexType name="WireFormatJMSDefaultType">
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd?rev=924588&r1=924587&r2=924588&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd Thu Mar 18 01:34:34 2010
@@ -25,8 +25,9 @@
-->
<import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
- <include schemaLocation="tuscany-sca-1.1-binding-atom.xsd"/>
- <!-- include schemaLocation="tuscany-sca-1.1-binding-jms.xsd"/ -->
+
+ <include schemaLocation="tuscany-sca-1.1-binding-atom.xsd"/>
+ <include schemaLocation="tuscany-sca-1.1-binding-jms.xsd"/>
<include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
<include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/>
<include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/>