Updating namespaces for tuscany extensions schema files

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

8 files changed, 60 insertions, 29 deletions

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 403b16f035..63937b16e6 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
@@ -15,5 +15,4 @@
 # specific language governing permissions and limitations
 # under the License. 
 #
-sca-10/tuscany-sca.xsd
-#sca-11/tuscany-sca-1.1.xsd
\ No newline at end of file
+sca-10/tuscany-sca.xsd
\ No newline at end of file
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd
index 788571de7b..e357e212d3 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd
@@ -18,12 +18,12 @@
  * 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" 
+    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="binding.dwr" type="t:DWRBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd
index bd36a8f52f..19cd511ad3 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd
@@ -18,12 +18,12 @@
  * 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" 
+    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="binding.http" type="t:HTTPBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd
index bacfdda781..292ccfef34 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd
@@ -18,12 +18,12 @@
  * 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" 
+    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd
index 26be6feae5..b008494c0f 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd
@@ -18,12 +18,12 @@
  * 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" 
+    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="binding.rmi" type="t:RMIBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd
index 1b5c8aece2..1b8bca1e30 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd
@@ -18,12 +18,12 @@
  * 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" 
+    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="implementation.node" type="t:NodeImplementation"/>
     	
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd
index 15567c06dd..27e8760bb5 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd
@@ -24,12 +24,10 @@
     
     <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-1.1-schema-200803.xsd"/>
     
-    <include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-http.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-jsonrpc.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-jms.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-rmi.xsd"/>
+    <include schemaLocation="tuscany-sca-1.1-binding-dwr.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"/>
     
-    <include schemaLocation="tuscany-sca-implementation-node.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-resource.xsd"/> 
+    <include schemaLocation="tuscany-sca-1.1-implementation-node.xsd"/>
 </schema>
\ No newline at end of file
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd
new file mode 100644
index 0000000000..79af5e9363
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"-->
+<!-- $Id: wsdl-instance.xsd,v 1.1 2004/08/03 16:02:04 hugo Exp $ -->
+<!-- 
+   W3C XML Schema defined in the Web Services Description (WSDL)
+    Version 2.0 specification
+     http://www.w3.org/TR/wsdl20
+
+   Copyright (c) 2004 World Wide Web Consortium,
+  
+   (Massachusetts Institute of Technology, European Research Consortium for
+   Informatics and Mathematics, Keio University). All Rights Reserved. This
+   work is distributed under the W3C(r) Software License [1] in the hope that
+   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" targetNamespace="http://www.w3.org/2004/08/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
+
+  <xs:attribute name="wsdlLocation">
+    <xs:annotation>
+      <xs:documentation>
+      This attribute can be used to provide some hints on where
+      additional WSDL information for a given namespace can be
+      found in order to help with QName resolution
+      </xs:documentation>
+    </xs:annotation>
+    <xs:simpleType>
+      <xs:list itemType="xs:anyURI"/>
+    </xs:simpleType>
+  </xs:attribute>
+
+</xs:schema>