TUSCANY-2968 - Updating binding-http schema and moving wireFormat and operationSelector to tuscany-sca-core.xsd to be sharable

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

3 files changed, 42 insertions, 8 deletions

diff --git a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-core.xsd b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-core.xsd
new file mode 100644
index 0000000000..325c0c8a59
--- /dev/null
+++ b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-core.xsd
@@ -0,0 +1,37 @@
+<?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">
+   
+    <!--  wire formats -->
+    <element name="wireFormat" type="t:WireFormat" abstract="true"/>
+    
+    <complexType name="WireFormat" abstract="true"/>
+    
+    <!--  operation selectors -->
+    <element name="operationSelector" type="t:OperationSelector" abstract="true"/>
+    
+    <complexType name="OperationSelector" abstract="true"/>
+    
+</schema>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
index bd36a8f52f..b5a0d136be 100644
--- a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
@@ -25,6 +25,8 @@
 
     <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
 
+    <include schemaLocation="tuscany-core.xsd"/>
+    
     <element name="binding.http" type="t:HTTPBinding"/>
     
     <complexType name="HTTPBinding">
diff --git a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
index b3c3dc8bf9..e5530105e4 100644
--- a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
+++ b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
@@ -24,6 +24,8 @@
         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 
@@ -32,9 +34,6 @@
         
         
    <!--  wire formats -->
-   
-   <element name="wireFormat" type="t:WireFormat" abstract="true"/>
-   <complexType name="WireFormat" abstract="true"/>
     
    <complexType name="WireFormatJMSDefaultType">
       <complexContent>
@@ -109,11 +108,7 @@
             substitutionGroup="t:wireFormat"/>   
                    
                    
-    <!--  operation selectors -->   
-    
-   <element name="operationSelector" type="t:OperationSelector" abstract="true"/>
-   <complexType name="OperationSelector" abstract="true"/>
-    
+    <!--  operation selectors -->      
    <complexType name="OperationSelectorJMSDefaultType">
       <complexContent>
          <extension base="t:OperationSelector"/>