Updated test composites and xsds to the latest SCA schemas.

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

55 files changed, 128 insertions, 326 deletions

diff --git a/sca-cpp/trunk/components/cache/mcache.composite b/sca-cpp/trunk/components/cache/mcache.composite
index 3a838abc79..15411dd702 100644
--- a/sca-cpp/trunk/components/cache/mcache.composite
+++ b/sca-cpp/trunk/components/cache/mcache.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://tuscany.apache.org/xmlns/sca/components"
   name="mcache">
diff --git a/sca-cpp/trunk/components/webservice/webservice.composite b/sca-cpp/trunk/components/webservice/webservice.composite
index 9498a26b53..a87bce03f6 100644
--- a/sca-cpp/trunk/components/webservice/webservice.composite
+++ b/sca-cpp/trunk/components/webservice/webservice.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://tuscany.apache.org/xmlns/sca/components"
   name="webservice">
diff --git a/sca-cpp/trunk/kernel/xml-test.cpp b/sca-cpp/trunk/kernel/xml-test.cpp
index 585a2e519d..9e0cde597b 100644
--- a/sca-cpp/trunk/kernel/xml-test.cpp
+++ b/sca-cpp/trunk/kernel/xml-test.cpp
@@ -35,7 +35,7 @@ namespace tuscany {
 
 const string currencyXML =
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" "
+"<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" "
 "xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.1\" "
 "targetNamespace=\"http://services\" "
 "name=\"currency\">"
diff --git a/sca-cpp/trunk/modules/java/domain-test.composite b/sca-cpp/trunk/modules/java/domain-test.composite
index e35945f314..190f2ff5bb 100644
--- a/sca-cpp/trunk/modules/java/domain-test.composite
+++ b/sca-cpp/trunk/modules/java/domain-test.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://domain/test"
   name="domain-test">
diff --git a/sca-cpp/trunk/modules/python/domain-test.composite b/sca-cpp/trunk/modules/python/domain-test.composite
index a0e92dfb0c..c8e92b286e 100644
--- a/sca-cpp/trunk/modules/python/domain-test.composite
+++ b/sca-cpp/trunk/modules/python/domain-test.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://domain/test"
   name="domain-test">
diff --git a/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd b/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd
index 24d5e224bc..c811ba6729 100644
--- a/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd
+++ b/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd
@@ -19,11 +19,11 @@
 -->
 <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/200903"
+    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/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="implementation.python" type="t:PythonImplementation" substitutionGroup="sca:implementation"/>
     	
diff --git a/sca-cpp/trunk/modules/scdl/test.composite b/sca-cpp/trunk/modules/scdl/test.composite
index 92e8f64ca5..f6fdba7f5f 100644
--- a/sca-cpp/trunk/modules/scdl/test.composite
+++ b/sca-cpp/trunk/modules/scdl/test.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
diff --git a/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd b/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd
index 4c2a30a55a..5b32834832 100644
--- a/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd
+++ b/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd
@@ -19,11 +19,11 @@
 -->
 <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/200903"
+    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/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="implementation.scheme" type="t:SchemeImplementation" substitutionGroup="sca:implementation"/>
     	
diff --git a/sca-cpp/trunk/modules/server/domain-test.composite b/sca-cpp/trunk/modules/server/domain-test.composite
index 1635f1f6cf..ef85bb919b 100644
--- a/sca-cpp/trunk/modules/server/domain-test.composite
+++ b/sca-cpp/trunk/modules/server/domain-test.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://domain/test"
   name="domain-test">
diff --git a/sca-cpp/trunk/test/store-cpp/store.composite b/sca-cpp/trunk/test/store-cpp/store.composite
index ce109b6eab..3839a8b816 100644
--- a/sca-cpp/trunk/test/store-cpp/store.composite
+++ b/sca-cpp/trunk/test/store-cpp/store.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
diff --git a/sca-cpp/trunk/test/store-java/store.composite b/sca-cpp/trunk/test/store-java/store.composite
index aecd1e8805..15e778ca36 100644
--- a/sca-cpp/trunk/test/store-java/store.composite
+++ b/sca-cpp/trunk/test/store-java/store.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
diff --git a/sca-cpp/trunk/test/store-python/store.composite b/sca-cpp/trunk/test/store-python/store.composite
index abf43433d5..8dc9950204 100644
--- a/sca-cpp/trunk/test/store-python/store.composite
+++ b/sca-cpp/trunk/test/store-python/store.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
diff --git a/sca-cpp/trunk/test/store-scheme/store.composite b/sca-cpp/trunk/test/store-scheme/store.composite
index 64ceaa2a24..94e066acad 100644
--- a/sca-cpp/trunk/test/store-scheme/store.composite
+++ b/sca-cpp/trunk/test/store-scheme/store.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd b/sca-cpp/trunk/xsd/external/XMLSchema.dtd
index e8e8f7625a..e8e8f7625a 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
+++ b/sca-cpp/trunk/xsd/external/XMLSchema.dtd
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd b/sca-cpp/trunk/xsd/external/datatypes.dtd
index 685e89a57e..685e89a57e 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
+++ b/sca-cpp/trunk/xsd/external/datatypes.dtd
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd b/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd
index 641798b17f..641798b17f 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ b/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd b/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-utility-1.0.xsd
index f8d74e9c6e..f8d74e9c6e 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ b/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-utility-1.0.xsd
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/sca-cpp/trunk/xsd/external/ws-addr.xsd
index f6fc9c53b0..f6fc9c53b0 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
+++ b/sca-cpp/trunk/xsd/external/ws-addr.xsd
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/sca-cpp/trunk/xsd/external/ws-policy.xsd
index c43e5814ed..c43e5814ed 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
+++ b/sca-cpp/trunk/xsd/external/ws-policy.xsd
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd b/sca-cpp/trunk/xsd/external/wsdli.xsd
index 24e0b5a975..24e0b5a975 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
+++ b/sca-cpp/trunk/xsd/external/wsdli.xsd
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/sca-cpp/trunk/xsd/external/xml.xsd
index ac4b0ec8e6..ac4b0ec8e6 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
+++ b/sca-cpp/trunk/xsd/external/xml.xsd
diff --git a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd
index 16c791e533..2a767e42ea 100644
--- a/sca-cpp/trunk/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
+++ b/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd
@@ -11,7 +11,7 @@
 
 <!-- Schema for XML Signatures
     http://www.w3.org/2000/09/xmldsig#
-    $Revision$ on $Date$ by $Author: reagle $
+    $Revision: 796166 $ on $Date: 2009-07-21 00:03:47 -0700 (Tue, 21 Jul 2009) $ by $Author: reagle $
 
     Copyright 2001 The Internet Society and W3C (Massachusetts Institute
     of Technology, Institut National de Recherche en Informatique et en
diff --git a/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd
index de4620f460..224c1254b3 100644
--- a/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
    
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
 
@@ -24,6 +24,7 @@
    <include schemaLocation="sca-binding-jms-1.1-cd04.xsd"/>
    <include schemaLocation="sca-binding-jca-1.1-cd04.xsd"/>   
    <include schemaLocation="sca-binding-sca-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-binding-ejb-1.1-cd01.xsd"/>
 
    <include schemaLocation="sca-definitions-1.1-cd04.xsd"/>
    <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-binding-ejb-1.1-cd01.xsd b/sca-cpp/trunk/xsd/sca-binding-ejb-1.1-cd01.xsd
new file mode 100644
index 0000000000..b8556f3632
--- /dev/null
+++ b/sca-cpp/trunk/xsd/sca-binding-ejb-1.1-cd01.xsd
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark,
+		IPR and other policies apply. -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	elementFormDefault="qualified">
+	
+	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+	
+	<element name="binding.ejb" type="sca:EJBSessionBeanBinding"
+		substitutionGroup="sca:binding" />
+	
+	<simpleType name="VersionValue">
+		<restriction base="string">
+			<enumeration value="EJB2" />
+			<enumeration value="EJB3" />
+		</restriction>
+	</simpleType>
+	
+	<complexType name="EJBSessionBeanBinding">
+		<complexContent>
+			<extension base="sca:Binding">
+				<sequence>
+					<any namespace="##other" processContents="lax" minOccurs="0"
+						maxOccurs="unbounded" />
+				</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" />
+			</extension>
+		</complexContent>
+	</complexType>
+</schema>
\ No newline at end of file
diff --git a/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd
index 7f9baac45c..5fd3f9d687 100644
--- a/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
         elementFormDefault="qualified">
         
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd
index e16039a0cd..e1838dddf0 100644
--- a/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
         elementFormDefault="qualified">
 
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
@@ -95,6 +95,11 @@
             <element name="connectionFactory" type="sca:JMSConnectionFactory"/> 
             <element name="activationSpec" type="sca:JMSActivationSpec"/> 
          </choice> 
+
+         <!-- TUSCANY-3297 -->
+         <any namespace="##other" processContents="lax" 
+              minOccurs="0" maxOccurs="unbounded"/>
+
       </sequence>
    </complexType>
 
diff --git a/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd
index 897e869806..d607d8730f 100644
--- a/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
         elementFormDefault="qualified">
 
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd
index 24198c943d..8e5a72b493 100644
--- a/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"
     xmlns:wsa="http://www.w3.org/2005/08/addressing"
     elementFormDefault="qualified">
diff --git a/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd
index 4bc2e73d4c..874e36bab8 100644
--- a/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd
@@ -3,7 +3,7 @@
      OASIS trademark, IPR and other policies apply -->
 
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     elementFormDefault="qualified">
 
     <element name="WSCallback">
diff --git a/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd
index f13fbd1567..f17675a8b1 100644
--- a/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd
index 7e2cd739fd..f765eaae85 100644
--- a/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
 	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
diff --git a/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd
index b808125568..f98c6dc040 100644
--- a/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
 	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
diff --git a/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd b/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd
index 1dcd515c98..7bad3bfc2a 100644
--- a/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd
+++ b/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
    <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
@@ -13,7 +13,7 @@
    <complexType name="JavaImportType">
       <complexContent>
          <extension base="sca:Import">
-            <attribute name="package" type="NCName" use="required"/>
+            <attribute name="package" type="string" use="required"/>
             <attribute name="location" type="anyURI" use="optional"/>
          </extension>
       </complexContent>
@@ -25,7 +25,7 @@
    <complexType name="JavaExportType">
       <complexContent>
          <extension base="sca:Export">
-            <attribute name="package" type="NCName" use="required"/>
+            <attribute name="package" type="string" use="required"/>
          </extension>
       </complexContent>
    </complexType>
diff --git a/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd
index 654d568bab..158daff214 100644
--- a/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
    <import namespace="http://www.w3.org/XML/1998/namespace" 
@@ -33,7 +33,10 @@
       <complexContent>
          <extension base="sca:CommonExtensionBase">
             <sequence>
+               <!-- Comment out the sca:implementation to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. -->
+               <!-- 
                <element ref="sca:implementation" minOccurs="0"/>
+                -->
                <choice minOccurs="0" maxOccurs="unbounded">
                   <element name="service" type="sca:ComponentService"/>
                   <element name="reference" 
@@ -287,7 +290,8 @@
       <complexContent>
          <extension base="sca:CommonExtensionBase">
             <sequence>
-               <element ref="sca:implementation" minOccurs="0"/>
+               <!-- Set minOccurs="1" instead of "0" to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. -->
+               <element ref="sca:implementation" minOccurs="1"/>
                <choice minOccurs="0" maxOccurs="unbounded">
                   <element name="service" type="sca:ComponentService"/>
                   <element name="reference" type="sca:ComponentReference"/>
diff --git a/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd
index 2034e4d2c8..ef22e1dd3e 100644
--- a/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd b/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd
index 11239e20d0..0d5b747253 100644
--- a/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 

      OASIS trademark, IPR and other policies apply. -->

 <schema 

-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"

+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

    xmlns:xsd="http://www.w3.org/2001/XMLSchema"

    xmlns="http://www.w3.org/2001/XMLSchema"

    elementFormDefault="qualified">

diff --git a/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd
index 011c7a61ea..e408f727f8 100644
--- a/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
 	<include schemaLocation="sca-core-1.1-cd04.xsd" />
diff --git a/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd
index e0524ee006..c0517b0a32 100644
--- a/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd
index 777da1e8ab..b71eda300d 100644
--- a/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
 	<include schemaLocation="sca-core-1.1-cd04.xsd" />
diff --git a/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd b/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd
index 53f6a0a51a..aac845ff59 100644
--- a/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd b/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd
index 51327ec84e..cce7738dff 100644
--- a/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd
+++ b/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd
@@ -2,9 +2,9 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"  
-  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   elementFormDefault="qualified"
-  targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">  
+  targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912">  
 	
 	<include schemaLocation="sca-core-1.1-cd04.xsd"/>
 	<element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/>
diff --git a/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd
index 045118cb43..d5bff5d542 100644
--- a/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
 	<include schemaLocation="sca-core-1.1-cd04.xsd" />
diff --git a/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd
index 536b592c04..e3e3c9369e 100644
--- a/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
 	<include schemaLocation="sca-core-1.1-cd04.xsd" />
diff --git a/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd
index faf6d1cfb1..7d3a536b8c 100644
--- a/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd
index 980e4f90f5..3f0be7dc6d 100644
--- a/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd b/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd
index 6df685b881..18daa8c926 100644
--- a/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd
+++ b/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

    elementFormDefault="qualified">

 

 	<include schemaLocation="sca-core-1.1-cd04.xsd"/>

diff --git a/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd b/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd
index a6cdfb2be5..372e8c24b3 100644
--- a/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd
+++ b/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd
@@ -1,6 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
 	elementFormDefault="qualified">
 
diff --git a/sca-cpp/trunk/xsd/sca-policy-1.1-intents-definitions-cd02.xml b/sca-cpp/trunk/xsd/sca-policy-1.1-intents-definitions-cd02.xml
deleted file mode 100644
index 8efde2653f..0000000000
--- a/sca-cpp/trunk/xsd/sca-policy-1.1-intents-definitions-cd02.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<definitions xmlns:xml="http://www.w3.org/XML/1998/namespace" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">
-                 
-	<!-- Security related intents -->                 
-	<intent name="serverAuthentication" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding requires that the 
-			server is authenticated by the client
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent>
-
-	<intent name="clientAuthentication" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding requires that the 
-			client is authenticated by the server
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent>
-
-	<intent name="authentication" requires="clientAuthentication">
-		<description>
-			A convenience intent to help migration
-		</description>
-	</intent>
-
-	<intent name="mutualAuthentication"
-		requires="clientAuthentication serverAuthentication">
-		<description>
-			Communication through the binding requires that the
-			client and server to authenticate each other
-		</description>
-	</intent>
-
-	<intent name="confidentiality" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding prevents unauthorized 
-			users from reading the messages
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>	
-	</intent>
-
-	<intent name="integrity" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding prevents tampering 
-			with the messages sent between the client and the service.
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent> 
-
-	<intent name="authorization" constrains="sca:implementation" 
-	    intentType="implementation">
-		<description>
-			Ensures clients are authorized to use services. 
-		</description>
-		<qualifier name="fineGrain" default="true"/>
-	</intent>
-
-	
-	<!-- Reliable messaging related intents -->    
-	<intent name="atLeastOnce" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			This intent is used to indicate that a message sent
-			by a client is always delivered to the component.
-		</description>
-	</intent>
-
-	<intent name="atMostOnce" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			This intent is used to indicate that a message that was 
-			successfully sent by a client is not delivered more than 
-			once to the component.
-		</description>
-	</intent>
-
-	<intent name="exactlyOnce" requires="atLeastOnce atMostOnce" 
-	    constrains="sca:binding" intentType="interaction">
-		<description>
-			This profile intent is used to indicate that a message sent 
-			by a client is always delivered to the component. It also 
-			indicates that duplicate messages are not delivered to the 
-			component.
-	    </description>
-	</intent>	           
-
-	<intent name="ordered" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			This intent is used to indicate that all the messages are 
-			delivered to the component in the order they were sent by 
-			the client.
-		</description>
-	</intent>
-	
-	<!-- Transaction related intents -->
-	<intent name="managedTransaction" excludes="sca:noManagedTransaction" 
-	    mutuallyExclusive="true" constrains="sca:implementation" 
-	    intentType="implementation">
-		<description>
-		A managed transaction environment is necessary in order to 
-		run the component. The specific type of managed transaction 
-		needed is not constrained.
-		</description>
-		<qualifier name="global" default="true">
-			<description>
-			For a component marked with managedTransaction.global 
-			a global transaction needs to be present before dispatching 
-			any method on the component - using any transaction 
-			propagated from the client or else beginning and completing 
-			a new transaction. 
-			</description>
-		</qualifier>
-		<qualifier name="local">
-			<description>
-			A component marked with managedTransaction.local needs to 
-			run within a local transaction containment (LTC) that 
-			is started and ended by the SCA runtime.
-			</description>
-		</qualifier>		
-	</intent>
-
-	<intent name="noManagedTransaction" excludes="sca:managedTransaction" 
-	    constrains="sca:implementation" intentType="implementation">
-		<description>
-		A component marked with noManagedTransaction needs to run without 
-		a managed transaction, under neither a global transaction nor 
-		an LTC. A transaction propagated to the hosting SCA runtime 
-		is not joined by the hosting runtime on behalf of a 
-		component marked with noManagedtransaction.
-		</description>
-	</intent>
-
-	<intent name="transactedOneWay" excludes="sca:immediateOneWay" 
-	    constrains="sca:binding" intentType="implementation">
-		<description>
-		For a reference marked as transactedOneWay any OneWay invocation 
-		messages are transacted as part of a client global 
-		transaction.
-		For a service marked as transactedOneWay any OneWay invocation 
-		message are received from the transport binding in a 
-		transacted fashion, under the service’s global transaction.
-		</description>
-	</intent>
-
-	<intent name="immediateOneWay" excludes="transactedOneWay" 
-	    constrains="sca:binding" intentType="implementation">
-		<description>
-		For a reference indicates that any OneWay invocation messages 
-		are sent immediately regardless of any client transaction.
-		For a service indicates that any OneWay invocation is 
-		received immediately regardless of any target service 
-		transaction.
-		</description>
-	</intent>
-
-	<intent name="propagatesTransaction" excludes="suspendsTransaction" 
-	    constrains="sca:binding" intentType="interaction">
-		<description>
-		A service marked with propagatesTransaction is dispatched 
-		under any propagated (client) transaction and the service binding 
-		needs to be capable	of receiving a transaction context.
-		A reference marked with propagatesTransaction propagates any 
-		transaction context under which the client runs when the 
-		reference is used for a request-response interaction and the 
-		binding of a reference marked with propagatesTransaction needs to
-		be capable of propagating a transaction context. 
-		</description>
-	</intent>
-
-	<intent name="suspendsTransaction" excludes="propagatesTransaction" 
-	    constrains="sca:binding" intentType="interaction">
-		<description>
-		A service marked with suspendsTransaction is not dispatched 
-		under any propagated (client) transaction.
-		A reference marked with suspendsTransaction does not propagate 
-		any transaction context under which the client runs when the 
-		reference is used.
-		</description>
-	</intent>
-	
-	<intent name="managedSharedTransaction" 
-		requires="managedTransaction.global propagatesTransaction">
-		<description>
-			Used to indicate that the component requires both the 
-			managedTransaction.global and the propagatesTransactions 
-			intents
-		</description>
-	</intent>
-	
-	<!-- Miscellaneous intents -->	
-	<intent name="asyncInvocation" constrains="sca:binding" 
-		intentType="interaction">
-		<description>
-			Indicates that request/response operations for the 
-			interface of this wire are "long running" and must be
-			treated as two separate message transmissions
-		</description>
-	</intent>
-	
-	<intent name="SOAP" constrains="sca:binding" intentType="interaction" mutuallyExclusive="true">
-		<description>
-		Specifies that the SOAP messaging model is used for delivering 
-		messages.
-		</description>
-		<qualifier name="V1_1" default="true"/>
-		<qualifier name="V1_2"/>
-	</intent>	
-
-	<intent name="JMS" constrains="sca:binding" intentType="interaction">
-		<description>
-		Requires that the messages are delivered and received via the 
-		JMS API.
-		</description>
-	</intent>
-
-	<intent name="noListener" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-		This intent can only be used on a reference. Indicates that the 
-		client is not able to handle new inbound connections. The binding 
-		and callback binding are configured so that any 
-		response or callback comes either through a back channel of the 
-		connection from the client to the server or by having the client 
-		poll the server for messages. 
-		</description>
-	</intent>	
-	
-</definitions>
diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd
index de7bc6bdd0..a41087d6ec 100644
--- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd
@@ -19,11 +19,11 @@
 -->
 <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/200903"
+    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/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.dwr" type="t:DWRBinding"/>
     
diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd
index ce8d47b575..ff0ecd1414 100644
--- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd
@@ -19,11 +19,11 @@
 -->
 <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/200903"
+    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/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.http" type="t:HTTPBinding"/>
     
diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
index 92142d117d..2fb4587862 100644
--- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
@@ -19,11 +19,11 @@
 -->
 <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/200903"
+    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/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
     
diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd
index 9b15010624..a3477c4a34 100644
--- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd
@@ -19,11 +19,11 @@
 -->
 <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/200903"
+    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/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.rmi" type="t:RMIBinding"/>
     
diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd
index dfe819d97f..ab445dfe9e 100644
--- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd
@@ -19,11 +19,11 @@
 -->
 <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/200903"
+    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/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="implementation.osgi" type="t:OSGiImplementation" substitutionGroup="sca:implementation"/>
 
diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd
index 8e65b402d7..21d6fa377d 100644
--- a/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd
@@ -17,13 +17,13 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
+<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/200903"
+    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/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="implementation.widget" type="t:WidgetImplementation" substitutionGroup="sca:implementation"/>
     	
@@ -39,5 +39,4 @@
             </extension>
         </complexContent>
     </complexType>
-
 </schema>
diff --git a/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd b/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd
index fb0a0cf9d5..4a1a1e000d 100644
--- a/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd
+++ b/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd
@@ -23,7 +23,7 @@
 <!--
     <import namespace="http://www.w3.org/ns/wsdl-instance" schemaLocation="wsdli.xsd"/>
 -->
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
@@ -32,4 +32,4 @@
 
     <include schemaLocation="tuscany-sca-1.1-implementation-osgi.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-implementation-widget.xsd"/>
-</schema>
+</schema>
\ No newline at end of file