TUSCANY-3453 - Updating OASIS schema to allow extensibility of bindings and other elements such as wireFormats and operationSelectors and enabling Binding-JMS schema

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@924588 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 13 insertions, 19 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
index 6eedc3ef66..5f3c796810 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
@@ -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>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
index b1f2a0cc59..4bccf9d5f8 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
@@ -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"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
index 1b96f839fe..824ba95b47 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
@@ -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" 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
index fd5c46e096..b801ba2153 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
@@ -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"/>
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 e72ff866ce..ab0fce9ac8 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
@@ -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" 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
index f3af6dd4d8..200f3e50a4 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
@@ -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">
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index 1d98d72b90..6eddf41e83 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
@@ -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"/>