From a68bdb7a2067a48770c29cf163043f8bea77782f Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 18 Mar 2010 01:34:30 +0000
Subject: TUSCANY-3453 - Updates to binding-jms tuscany specific schema and
 some workarounds on the main binding-jms schema to better cope with
 extensibility for wireFormats and operatorSelector

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@924587 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/sca-binding-jms-1.1-cd04.xsd    |   9 +-
 .../main/resources/tuscany-sca-1.1-binding-jms.xsd | 134 +++++++++++++++++++++
 .../src/main/resources/tuscany-sca-1.1.xsd         |   1 +
 .../src/main/resources/tuscany-sca-binding-jms.xsd | 132 --------------------
 4 files changed, 140 insertions(+), 136 deletions(-)
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd

(limited to 'sca-java-2.x/trunk/modules/assembly-xsd/src/main')

diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
index 85895f65f6..e236f6cda3 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
@@ -28,8 +28,8 @@
                <element name="operationProperties" 
                         type="sca:JMSOperationProperties" 
                         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="correlationScheme" type="QName"
                        default="sca:messageId"/>
@@ -69,8 +69,9 @@
    </complexType>
 
    <complexType name="JMSConnectionFactory">
-      <sequence>          <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
+      <sequence>
+          <element name="property" type="sca:BindingProperty" 
+            minOccurs="0" maxOccurs="unbounded"/>
       </sequence>
       <attribute name="jndiName" type="anyURI" use="required"/>
       <attribute name="create" type="sca:JMSCreateResource" 
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
new file mode 100644
index 0000000000..f3af6dd4d8
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
+    elementFormDefault="qualified">
+
+   <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-binding-jms-1.1-cd04.xsd"/>
+   
+   <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">
+      <complexContent>
+         <extension base="sca:WireFormatType">
+             <attribute name="sendFormat" default="bytes">
+                  <simpleType>
+                      <restriction base="string">
+                         <enumeration value="text"/>
+                         <enumeration value="bytes"/>
+                      </restriction>
+                  </simpleType>             
+             </attribute>
+         </extension>
+      </complexContent>
+   </complexType>    
+   <element name="wireFormat.jmsdefault" 
+            type="t:WireFormatJMSDefaultType"
+            substitutionGroup="sca:wireFormat"/>            
+
+  <complexType name="WireFormatJMSTextType">
+      <complexContent>
+         <extension base="sca:WireFormatType"/>
+      </complexContent>
+   </complexType>
+   <element name="wireFormat.jmsText" 
+            type="t:WireFormatJMSTextType"
+            substitutionGroup="sca:wireFormat"/>
+                  
+   <complexType name="WireFormatJMSTextXMLType">
+      <complexContent>
+         <extension base="sca:WireFormatType"/>
+      </complexContent>
+   </complexType>
+   <element name="wireFormat.jmsTextXML" 
+            type="t:WireFormatJMSTextXMLType"
+            substitutionGroup="sca:wireFormat"/>
+      
+   <complexType name="WireFormatJMSBytesType">
+      <complexContent>
+         <extension base="sca:WireFormatType"/>
+      </complexContent>
+   </complexType>
+   <element name="wireFormat.jmsBytes" 
+            type="t:WireFormatJMSBytesType"
+            substitutionGroup="sca:wireFormat"/>
+   
+   <complexType name="WireFormatJMSBytesXMLType">
+      <complexContent>
+         <extension base="sca:WireFormatType"/>
+      </complexContent>
+   </complexType>
+   <element name="wireFormat.jmsBytesXML" 
+            type="t:WireFormatJMSBytesXMLType"
+            substitutionGroup="sca:wireFormat"/>
+   
+   <complexType name="WireFormatJMSObjectType">
+      <complexContent>
+         <extension base="sca:WireFormatType">
+             <attribute name="wrapSingle" default="false">
+                  <simpleType>
+                      <restriction base="string">
+                         <enumeration value="true"/>
+                         <enumeration value="false"/>
+                      </restriction>
+                  </simpleType>             
+             </attribute>
+         </extension>
+      </complexContent>
+   </complexType>       
+   <element name="wireFormat.jmsObject" 
+            type="t:WireFormatJMSObjectType"
+            substitutionGroup="sca:wireFormat"/>   
+   <!--  -->
+                   
+   <!--  operation selectors -->
+   <!-- -->      
+   <complexType name="OperationSelectorJMSDefaultType">
+      <complexContent>
+         <extension base="sca:OperationSelectorType"/>
+      </complexContent>
+   </complexType>    
+   <element name="operationSelector.jmsdefault" 
+            type="t:OperationSelectorJMSDefaultType"
+            substitutionGroup="sca:operationSelector"/>            
+
+   <complexType name="OperationSelectorJMSUserPropType">
+      <complexContent>
+         <extension base="sca:OperationSelectorType">
+             <attribute name="propertyName" type="string"/>           
+         </extension>         
+      </complexContent>
+   </complexType>    
+   <element name="operationSelector.jmsUserProp" 
+            type="t:OperationSelectorJMSUserPropType"
+            substitutionGroup="sca:operationSelector"/>
+
+	<!-- -->                           
+</schema>
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 c51071ac58..1d98d72b90 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
@@ -26,6 +26,7 @@
     <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-http.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
deleted file mode 100644
index e5530105e4..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-        elementFormDefault="qualified">
-
-   <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-binding-jms.xsd"/>
-   
-   <include schemaLocation="tuscany-core.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">
-      <complexContent>
-         <extension base="t:WireFormat">
-             <attribute name="sendFormat" default="bytes">
-                  <simpleType>
-                      <restriction base="string">
-                         <enumeration value="text"/>
-                         <enumeration value="bytes"/>
-                      </restriction>
-                  </simpleType>             
-             </attribute>
-         </extension>
-      </complexContent>
-   </complexType>    
-   <element name="wireFormat.jmsdefault" 
-            type="t:WireFormatJMSDefaultType"
-            substitutionGroup="t:wireFormat"/>            
-
-  <complexType name="WireFormatJMSTextType">
-      <complexContent>
-         <extension base="t:WireFormat"/>
-      </complexContent>
-   </complexType>
-   <element name="wireFormat.jmsText" 
-            type="t:WireFormatJMSTextType"
-            substitutionGroup="t:wireFormat"/>
-                  
-   <complexType name="WireFormatJMSTextXMLType">
-      <complexContent>
-         <extension base="t:WireFormat"/>
-      </complexContent>
-   </complexType>
-   <element name="wireFormat.jmsTextXML" 
-            type="t:WireFormatJMSTextXMLType"
-            substitutionGroup="t:wireFormat"/>
-      
-   <complexType name="WireFormatJMSBytesType">
-      <complexContent>
-         <extension base="t:WireFormat"/>
-      </complexContent>
-   </complexType>
-   <element name="wireFormat.jmsBytes" 
-            type="t:WireFormatJMSBytesType"
-            substitutionGroup="t:wireFormat"/>
-   
-   <complexType name="WireFormatJMSBytesXMLType">
-      <complexContent>
-         <extension base="t:WireFormat"/>
-      </complexContent>
-   </complexType>
-   <element name="wireFormat.jmsBytesXML" 
-            type="t:WireFormatJMSBytesXMLType"
-            substitutionGroup="t:wireFormat"/>
-   
-   <complexType name="WireFormatJMSObjectType">
-      <complexContent>
-         <extension base="t:WireFormat">
-             <attribute name="wrapSingle" default="false">
-                  <simpleType>
-                      <restriction base="string">
-                         <enumeration value="true"/>
-                         <enumeration value="false"/>
-                      </restriction>
-                  </simpleType>             
-             </attribute>
-         </extension>
-      </complexContent>
-   </complexType>       
-   <element name="wireFormat.jmsObject" 
-            type="t:WireFormatJMSObjectType"
-            substitutionGroup="t:wireFormat"/>   
-                   
-                   
-    <!--  operation selectors -->      
-   <complexType name="OperationSelectorJMSDefaultType">
-      <complexContent>
-         <extension base="t:OperationSelector"/>
-      </complexContent>
-   </complexType>    
-   <element name="operationSelector.jmsdefault" 
-            type="t:OperationSelectorJMSDefaultType"
-            substitutionGroup="t:operationSelector"/>            
-
-   <complexType name="OperationSelectorJMSUserPropType">
-      <complexContent>
-         <extension base="t:OperationSelector">
-             <attribute name="propertyName" type="string"/>           
-         </extension>         
-      </complexContent>
-   </complexType>    
-   <element name="operationSelector.jmsUserProp" 
-            type="t:OperationSelectorJMSUserPropType"
-            substitutionGroup="t:operationSelector"/>
-                           
-</schema>
-- 
cgit v1.2.3