From f2e5a288fee44a1af4d72d8f8bf4fac64b35f01f Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 18 Mar 2010 01:33:59 +0000
Subject: TUSCANY-3451 - Updating to latest drafts of OASIS 1.1 XSDs

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@924579 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/sca-1.1-cd04.xsd            |  39 --
 .../src/main/resources/sca-1.1-cd05.xsd            |  37 ++
 .../main/resources/sca-binding-ejb-1.1-cd01.xsd    |  66 +--
 .../main/resources/sca-binding-jca-1.1-cd04.xsd    |   2 +-
 .../main/resources/sca-binding-jms-1.1-cd04.xsd    |   7 +-
 .../main/resources/sca-binding-sca-1.1-cd04.xsd    |  20 -
 .../main/resources/sca-binding-sca-1.1-cd05.xsd    |  20 +
 .../src/main/resources/sca-binding-ws-1.1-cd04.xsd |   2 +-
 .../main/resources/sca-contribution-1.1-cd04.xsd   |  90 ----
 .../main/resources/sca-contribution-1.1-cd05.xsd   |  90 ++++
 .../main/resources/sca-contribution-c-1.1-cd04.xsd |   4 +-
 .../resources/sca-contribution-cpp-1.1-cd04.xsd    |   4 +-
 .../resources/sca-contribution-java-1.1-cd02.xsd   |   5 +-
 .../src/main/resources/sca-core-1.1-cd04.xsd       | 534 ---------------------
 .../src/main/resources/sca-core-1.1-cd05.xsd       | 478 ++++++++++++++++++
 .../main/resources/sca-definitions-1.1-cd04.xsd    |  31 --
 .../main/resources/sca-definitions-1.1-cd05.xsd    |  30 ++
 .../resources/sca-implementation-bpel-1.1-cd03.xsd |   2 +-
 .../resources/sca-implementation-c-1.1-cd04.xsd    |  44 +-
 .../sca-implementation-composite-1.1-cd04.xsd      |  26 -
 .../sca-implementation-composite-1.1-cd05.xsd      |  26 +
 .../resources/sca-implementation-cpp-1.1-cd04.xsd  |  15 +-
 .../resources/sca-implementation-java-1.1-cd02.xsd |  26 +
 .../resources/sca-implementation-java-1.1-cd03.xsd |  27 --
 .../sca-implementation-spring-1.1-cd01.xsd         |   2 +-
 .../main/resources/sca-interface-c-1.1-cd04.xsd    |  38 +-
 .../main/resources/sca-interface-cpp-1.1-cd04.xsd  |  41 +-
 .../main/resources/sca-interface-java-1.1-cd04.xsd |   5 +-
 .../main/resources/sca-interface-wsdl-1.1-cd04.xsd |  29 --
 .../main/resources/sca-interface-wsdl-1.1-cd05.xsd |  28 ++
 .../src/main/resources/sca-jee-1.1-wd03.xsd        | 104 ++--
 .../src/main/resources/sca-policy-1.1-cd03.xsd     | 119 +++++
 .../src/main/resources/sca-policy-1.1-cd04.xsd     | 104 ----
 .../sca-policy-1.1-intents-definitions-cd03.xml    | 249 ++++++++++
 .../main/resources/tuscany-sca-1.1-binding-dwr.xsd |   2 +-
 .../resources/tuscany-sca-1.1-binding-http.xsd     |   2 +-
 .../resources/tuscany-sca-1.1-binding-jsonrpc.xsd  |   2 +-
 .../main/resources/tuscany-sca-1.1-binding-rmi.xsd |   2 +-
 .../tuscany-sca-1.1-implementation-osgi.xsd        |   2 +-
 .../tuscany-sca-1.1-implementation-widget.xsd      |   2 +-
 .../src/main/resources/tuscany-sca-1.1.xsd         |   2 +-
 41 files changed, 1289 insertions(+), 1069 deletions(-)
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
 delete mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
 create mode 100644 sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml

(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-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
deleted file mode 100644
index 224c1254b3..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
+++ /dev/null
@@ -1,39 +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.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   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"/>
-
-   <include schemaLocation="sca-interface-java-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-interface-wsdl-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-interface-c-1.1-cd04.xsd"/>
-
-   <include schemaLocation="sca-implementation-java-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-implementation-composite-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-implementation-cpp-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-implementation-c-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-implementation-bpel-1.1-cd03.xsd"/>
-   <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"/> 		<!-- New -->  
-   <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"/>
-
-   <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-contribution-cpp-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-contribution-c-1.1-cd04.xsd"/>
-   <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-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
new file mode 100644
index 0000000000..d5accb648d
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
+   
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+
+   <include schemaLocation="sca-interface-java-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-interface-wsdl-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-interface-c-1.1-cd04.xsd"/>
+
+   <include schemaLocation="sca-implementation-java-1.1-cd02.xsd"/>
+   <include schemaLocation="sca-implementation-composite-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-implementation-cpp-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-implementation-c-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-implementation-bpel-1.1-cd03.xsd"/>
+   <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-jms-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"/>
+
+   <include schemaLocation="sca-definitions-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
+
+   <include schemaLocation="sca-contribution-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-contribution-cpp-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-contribution-c-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-contribution-java-1.1-cd02.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 b8556f3632..b1f2a0cc59 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
@@ -1,34 +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
+<!-- Copyright(C) OASIS(R) 2005,2010. 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-cd05.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>
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 5fd3f9d687..1b96f839fe 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
@@ -6,7 +6,7 @@
         xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
         elementFormDefault="qualified">
         
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
 
    <complexType name="JCABinding">
       <complexContent>
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 e1838dddf0..85895f65f6 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
@@ -6,7 +6,7 @@
         xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
         elementFormDefault="qualified">
 
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
 
    <complexType name="JMSBinding">
       <complexContent>
@@ -95,11 +95,6 @@
             <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-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
deleted file mode 100644
index d607d8730f..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
+++ /dev/null
@@ -1,20 +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.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        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"/>
-
-   <!-- SCA Binding -->
-   <element name="binding.sca" type="sca:SCABinding" 
-            substitutionGroup="sca:binding"/>
-   <complexType name="SCABinding">
-      <complexContent>
-         <extension base="sca:Binding"/>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
new file mode 100644
index 0000000000..a337296d45
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
@@ -0,0 +1,20 @@
+<?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/200912" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+        elementFormDefault="qualified">
+
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+
+   <!-- SCA Binding -->
+   <element name="binding.sca" type="sca:SCABinding" 
+            substitutionGroup="sca:binding"/>
+   <complexType name="SCABinding">
+      <complexContent>
+         <extension base="sca:Binding"/>
+      </complexContent>
+   </complexType>
+
+</schema>
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 8e5a72b493..fd5c46e096 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
@@ -13,7 +13,7 @@
     <import namespace="http://www.w3.org/2005/08/addressing"
             schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
 
-    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+    <include schemaLocation="sca-core-1.1-cd05.xsd"/>
 
     <element name="binding.ws" type="sca:WebServiceBinding"
              substitutionGroup="sca:binding"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
deleted file mode 100644
index f17675a8b1..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
+++ /dev/null
@@ -1,90 +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.  -->
-<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"/>
-
-   <!-- Contribution -->
-   <element name="contribution" type="sca:ContributionType"/>
-   <complexType name="ContributionType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element name="deployable" type="sca:DeployableType" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-               <element ref="sca:importBase" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:exportBase" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Deployable -->
-   <complexType name="DeployableType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="composite" type="QName" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Import -->
-   <element name="importBase" type="sca:Import" abstract="true" />
-   <complexType name="Import" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>   
-   </complexType>
-   
-   <element name="import" type="sca:ImportType" 
-            substitutionGroup="sca:importBase"/>
-   <complexType name="ImportType">
-      <complexContent>
-         <extension base="sca:Import">
-            <attribute name="namespace" type="string" use="required"/>
-            <attribute name="location" type="anyURI" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Export -->
-   <element name="exportBase" type="sca:Export" abstract="true" />
-   <complexType name="Export" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>      
-   </complexType>
-   
-   <element name="export" type="sca:ExportType" 
-            substitutionGroup="sca:exportBase"/>
-   <complexType name="ExportType">
-      <complexContent>
-         <extension base="sca:Export">
-            <attribute name="namespace" type="string" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
new file mode 100644
index 0000000000..da391a983f
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
@@ -0,0 +1,90 @@
+<?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-cd05.xsd"/>
+
+   <!-- Contribution -->
+   <element name="contribution" type="sca:ContributionType"/>
+   <complexType name="ContributionType">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <element name="deployable" type="sca:DeployableType" 
+                        minOccurs="0" maxOccurs="unbounded"/>
+               <element ref="sca:importBase" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:exportBase" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Deployable -->
+   <complexType name="DeployableType">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="composite" type="QName" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Import -->
+   <element name="importBase" type="sca:Import" abstract="true" />
+   <complexType name="Import" abstract="true">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+         </extension>
+      </complexContent>   
+   </complexType>
+   
+   <element name="import" type="sca:ImportType" 
+            substitutionGroup="sca:importBase"/>
+   <complexType name="ImportType">
+      <complexContent>
+         <extension base="sca:Import">
+            <attribute name="namespace" type="string" use="required"/>
+            <attribute name="location" type="anyURI" use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Export -->
+   <element name="exportBase" type="sca:Export" abstract="true" />
+   <complexType name="Export" abstract="true">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+         </extension>
+      </complexContent>      
+   </complexType>
+   
+   <element name="export" type="sca:ExportType" 
+            substitutionGroup="sca:exportBase"/>
+   <complexType name="ExportType">
+      <complexContent>
+         <extension base="sca:Export">
+            <attribute name="namespace" type="string" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
index f765eaae85..a93c4c5960 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2007,2010. 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/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
+	<include schemaLocation="sca-contribution-1.1-cd05.xsd" />
 
 	<element name="export.c" type="sca:CExport"
 		substitutionGroup="sca:exportBase" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
index f98c6dc040..98fffa201f 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2006,2010. 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/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
+	<include schemaLocation="sca-contribution-1.1-cd05.xsd" />
 
 	<element name="export.cpp" type="sca:CPPExport"
 		substitutionGroup="sca:exportBase" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
index 7bad3bfc2a..6131804edc 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->
+<!-- Copyright(C) OASIS(R) 2005,2010. 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-contribution-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-contribution-1.1-cd05.xsd"/>
 
    <!-- Import.java -->   
    <element name="import.java" type="sca:JavaImportType"
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
deleted file mode 100644
index 158daff214..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
+++ /dev/null
@@ -1,534 +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.  -->
-<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">
-
-   <import namespace="http://www.w3.org/XML/1998/namespace" 
-           schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-   <!-- Common extension base for SCA definitions -->
-   <complexType name="CommonExtensionBase">
-      <sequence>
-         <element ref="sca:documentation" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-   
-   <element name="documentation" type="sca:Documentation"/>
-   <complexType name="Documentation" mixed="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded"/>
-      </sequence>
-      <attribute ref="xml:lang"/>
-   </complexType>
-
-   <!-- Component Type -->
-   <element name="componentType" type="sca:ComponentType"/>
-   <complexType name="ComponentType">
-      <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" 
-                     type="sca:ComponentTypeReference"/>
-                  <element name="property" type="sca:Property"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Composite -->
-   <element name="composite" type="sca:Composite"/>
-   <complexType name="Composite">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:include" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:Service"/>
-                  <element name="property" type="sca:Property"/>
-                  <element name="component" type="sca:Component"/>
-                  <element name="reference" type="sca:Reference"/>
-                  <element name="wire" type="sca:Wire"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="targetNamespace" type="anyURI" use="required"/>
-            <attribute name="local" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="autowire" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Contract base type for Service, Reference -->
-   <complexType name="Contract" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:binding" minOccurs="0" 
-                        maxOccurs="unbounded" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional" />
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Service -->
-   <complexType name="Service">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="promote" type="anyURI" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Interface -->
-   <element name="interface" type="sca:Interface" abstract="true"/>
-   <complexType name="Interface" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <attribute name="remotable" type="boolean" use="optional"/>
-	        <attribute name="requires" type="sca:listOfQNames" 
-               use="optional"/>
-	        <attribute name="policySets" type="sca:listOfQNames" 
-               use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Reference -->
-   <complexType name="Reference">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="target" type="sca:listOfAnyURIs" 
-                       use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="promote" type="sca:listOfAnyURIs" 
-                       use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Property -->
-   <complexType name="SCAPropertyBase" mixed="true">
-      <sequence>
-         <any namespace="##any" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded"/>
-         <!-- NOT an extension point; This any exists to accept
-             the element-based or complex type property
-             i.e. no element-based extension point under "sca:property" -->
-      </sequence>
-      <!-- mixed="true" to handle simple type -->
-      <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-      <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-   </complexType>
-   
-   <complexType name="Property" mixed="true">
-      <complexContent mixed="true">
-         <extension base="sca:SCAPropertyBase">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="mustSupply" type="boolean" use="optional" 
-                       default="false"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-         <!-- extension defines the place to hold default value -->
-         <!-- an extension point ; attribute-based only -->
-      </complexContent>
-   </complexType>
-   
-   <!-- ConstrainingProperty is equivalent to the Property type but removes 
-        the capability to contain a value -->
-   <complexType name="ConstrainingProperty" mixed="true">
-      <complexContent mixed="true">
-         <restriction base="sca:Property">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="mustSupply" type="boolean" use="optional" 
-                       default="false"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-   <complexType name="PropertyValue" mixed="true">
-      <complexContent mixed="true">
-         <extension base="sca:SCAPropertyBase">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="source" type="string" use="optional"/>
-            <attribute name="file" type="anyURI" use="optional"/>
-            <attribute name="value" type="string" use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-         <!-- an extension point ; attribute-based only -->
-      </complexContent>
-   </complexType>
-
-   <!-- Binding -->
-   <element name="binding" type="sca:Binding" abstract="true"/>
-   <complexType name="Binding" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:operationSelector" minOccurs="0" 
-                        maxOccurs="1" />
-            </sequence>
-            <attribute name="uri" type="anyURI" use="optional"/>
-            <attribute name="name" type="NCName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Binding Type -->
-   <element name="bindingType" type="sca:BindingType"/>
-   <complexType name="BindingType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="type" type="QName" use="required"/>
-            <attribute name="alwaysProvides" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="mayProvide" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- WireFormat Type -->
-   <element name="wireFormat" type="sca:WireFormatType" abstract="true"/>
-   <complexType name="WireFormatType" abstract="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-
-   <!-- OperationSelector Type -->
-   <element name="operationSelector" type="sca:OperationSelectorType" abstract="true"/>
-   <complexType name="OperationSelectorType" abstract="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-   
-   <!-- Callback -->
-   <element name="callback" type="sca:Callback"/>
-   <complexType name="Callback">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <choice minOccurs="0" maxOccurs="unbounded">
-               <element ref="sca:binding"/>
-               <any namespace="##other" processContents="lax"/>
-            </choice>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Component -->
-   <complexType name="Component">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <!-- 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"/>
-                  <element name="property" type="sca:PropertyValue"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Component Service -->
-   <complexType name="ComponentService">
-      <complexContent>
-         <extension base="sca:Contract">
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Constraining Service -->
-   <complexType name="ConstrainingService">
-      <complexContent>
-         <restriction base="sca:ComponentService">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-
-   <!-- Component Reference -->
-   <complexType name="ComponentReference">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="target" type="sca:listOfAnyURIs" 
-                       use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="nonOverridable" type="boolean" use="optional" 
-                       default="false"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Constraining Reference -->
-   <complexType name="ConstrainingReference">
-      <complexContent>
-         <restriction base="sca:ComponentReference">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-         </restriction>
-      </complexContent>
-   </complexType>   
-   
-   <!-- Component Type Reference -->
-   <complexType name="ComponentTypeReference">
-      <complexContent>
-         <restriction base="sca:ComponentReference">
-            <sequence>
-               <element ref="sca:documentation" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:interface" minOccurs="0"/>
-               <element ref="sca:binding" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:callback" minOccurs="0"/>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-
-   <!-- Implementation -->
-   <element name="implementation" type="sca:Implementation" abstract="true"/>
-   <complexType name="Implementation" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Implementation Type -->
-   <element name="implementationType" type="sca:ImplementationType"/>
-   <complexType name="ImplementationType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="type" type="QName" use="required"/>
-            <attribute name="alwaysProvides" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="mayProvide" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Wire -->
-   <complexType name="Wire">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="source" type="anyURI" use="required"/>
-            <attribute name="target" type="anyURI" use="required"/>
-            <attribute name="replace" type="boolean" use="optional" 
-               default="false"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Include -->
-   <element name="include" type="sca:Include"/>
-   <complexType name="Include">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <attribute name="name" type="QName"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Constraining Type -->
-   <element name="constrainingType" type="sca:ConstrainingType"/>
-   <complexType name="ConstrainingType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ConstrainingService"/>
-                  <element name="reference" 
-                           type="sca:ConstrainingReference"/>
-                  <element name="property" type="sca:ConstrainingProperty"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="targetNamespace" type="anyURI"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Intents within WSDL documents -->
-   <attribute name="requires" type="sca:listOfQNames"/>
-
-   <!-- Global attribute definition for @callback to mark a WSDL port type    
-        as having a callback interface defined in terms of a second port 
-        type. -->
-   <attribute name="callback" type="anyURI"/>
-   
-   <!-- Value type definition for property values -->
-   <element name="value" type="sca:ValueType"/> 
-   <complexType name="ValueType" mixed="true">
-      <sequence> 
-         <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs='unbounded'/> 
-      </sequence> 
-      <!-- mixed="true" to handle simple type --> 
-      <anyAttribute namespace="##any" processContents="lax"/> 
-   </complexType> 
-   
-   <!-- Miscellaneous simple type definitions -->
-   <simpleType name="Multiplicity">
-      <restriction base="string">
-         <enumeration value="0..1"/>
-         <enumeration value="1..1"/>
-         <enumeration value="0..n"/>
-         <enumeration value="1..n"/>
-      </restriction>
-   </simpleType>
-   
-   <simpleType name="OverrideOptions">
-      <restriction base="string">
-         <enumeration value="no"/>
-         <enumeration value="may"/>
-         <enumeration value="must"/>
-      </restriction>
-   </simpleType>
-   
-   <simpleType name="listOfQNames">
-      <list itemType="QName"/>
-   </simpleType>
-   
-   <simpleType name="listOfAnyURIs">
-      <list itemType="anyURI"/>
-   </simpleType>
-	
-	<simpleType name="CreateResource">
-		<restriction base="string">
-			<enumeration value="always" />
-			<enumeration value="never" />
-			<enumeration value="ifnotexist" />
-		</restriction>
-	</simpleType>
-</schema>
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
new file mode 100644
index 0000000000..5b338674f4
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
@@ -0,0 +1,478 @@
+<?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-policy-1.1-cd03.xsd"/>	
+   <import namespace="http://www.w3.org/XML/1998/namespace" 
+           schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+   <!-- Common extension base for SCA definitions -->
+   <complexType name="CommonExtensionBase">
+      <sequence>
+         <element ref="sca:documentation" minOccurs="0" 
+                  maxOccurs="unbounded"/>
+      </sequence>
+      <anyAttribute namespace="##other" processContents="lax"/>
+   </complexType>
+   
+   <element name="documentation" type="sca:Documentation"/>
+   <complexType name="Documentation" mixed="true">
+      <sequence>
+         <any namespace="##other" processContents="lax" minOccurs="0" 
+              maxOccurs="unbounded"/>
+      </sequence>
+      <attribute ref="xml:lang"/>
+   </complexType>
+
+   <!-- Component Type -->
+   <element name="componentType" type="sca:ComponentType"/>
+   <complexType name="ComponentType">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <element ref="sca:implementation" minOccurs="0"/>
+               <choice minOccurs="0" maxOccurs="unbounded">
+                  <element name="service" type="sca:ComponentService"/>
+                  <element name="reference" 
+                     type="sca:ComponentTypeReference"/>
+                  <element name="property" type="sca:Property"/>
+               </choice>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Composite -->
+   <element name="composite" type="sca:Composite"/>
+   <complexType name="Composite">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <element ref="sca:include" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <choice minOccurs="0" maxOccurs="unbounded">
+                  <element ref="sca:requires"/>
+                  <element ref="sca:policySetAttachment"/>
+                  <element name="service" type="sca:Service"/>
+                  <element name="property" type="sca:Property"/>
+                  <element name="component" type="sca:Component"/>
+                  <element name="reference" type="sca:Reference"/>
+                  <element name="wire" type="sca:Wire"/>
+               </choice>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="name" type="NCName" use="required"/>
+            <attribute name="targetNamespace" type="anyURI" use="required"/>
+            <attribute name="local" type="boolean" use="optional" 
+                       default="false"/>
+            <attribute name="autowire" type="boolean" use="optional" 
+                       default="false"/>
+            <attribute name="requires" type="sca:listOfQNames" 
+                       use="optional"/>
+            <attribute name="policySets" type="sca:listOfQNames" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   
+   <!-- Contract base type for Service, Reference -->
+   <complexType name="Contract" abstract="true">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
+               <element ref="sca:binding" minOccurs="0" 
+                        maxOccurs="unbounded" />
+               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
+               <element ref="sca:requires" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:policySetAttachment" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
+            </sequence>
+            <attribute name="name" type="NCName" use="required" />
+            <attribute name="requires" type="sca:listOfQNames" 
+                       use="optional" />
+            <attribute name="policySets" type="sca:listOfQNames" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Service -->
+   <complexType name="Service">
+      <complexContent>
+         <extension base="sca:Contract">
+            <attribute name="promote" type="anyURI" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Interface -->
+   <element name="interface" type="sca:Interface" abstract="true"/>
+   <complexType name="Interface" abstract="true">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <choice minOccurs="0" maxOccurs="unbounded">
+               <element ref="sca:requires"/>
+               <element ref="sca:policySetAttachment"/>
+            </choice>
+            <attribute name="remotable" type="boolean" use="optional"/>
+	        <attribute name="requires" type="sca:listOfQNames" 
+               use="optional"/>
+	        <attribute name="policySets" type="sca:listOfQNames" 
+               use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Reference -->
+   <complexType name="Reference">
+      <complexContent>
+         <extension base="sca:Contract">
+            <attribute name="target" type="sca:listOfAnyURIs" 
+                       use="optional"/>
+            <attribute name="wiredByImpl" type="boolean" use="optional" 
+                       default="false"/>
+            <attribute name="multiplicity" type="sca:Multiplicity" 
+                       use="required"/>
+            <attribute name="promote" type="sca:listOfAnyURIs" 
+                       use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Property -->
+   <complexType name="SCAPropertyBase" mixed="true">
+      <sequence>
+         <any namespace="##any" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded"/>
+         <!-- NOT an extension point; This any exists to accept
+             the element-based or complex type property
+             i.e. no element-based extension point under "sca:property" -->
+      </sequence>
+      <!-- mixed="true" to handle simple type -->
+      <attribute name="name" type="NCName" use="required"/>
+      <attribute name="type" type="QName" use="optional"/>
+      <attribute name="element" type="QName" use="optional"/>
+      <attribute name="many" type="boolean" use="optional" default="false"/>
+      <attribute name="value" type="anySimpleType" use="optional"/>
+      <anyAttribute namespace="##other" processContents="lax"/>
+   </complexType>
+   
+   <complexType name="Property" mixed="true">
+      <complexContent mixed="true">
+         <extension base="sca:SCAPropertyBase">
+            <attribute name="mustSupply" type="boolean" use="optional" 
+                       default="false"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   
+   <complexType name="PropertyValue" mixed="true">
+      <complexContent mixed="true">
+         <extension base="sca:SCAPropertyBase">
+            <attribute name="source" type="string" use="optional"/>
+            <attribute name="file" type="anyURI" use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Binding -->
+   <element name="binding" type="sca:Binding" abstract="true"/>
+   <complexType name="Binding" abstract="true">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
+               <element ref="sca:operationSelector" minOccurs="0" 
+                        maxOccurs="1" />
+               <element ref="sca:requires" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:policySetAttachment" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="uri" type="anyURI" use="optional"/>
+            <attribute name="name" type="NCName" use="optional"/>
+            <attribute name="requires" type="sca:listOfQNames" 
+                       use="optional"/>
+            <attribute name="policySets" type="sca:listOfQNames" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Binding Type -->
+   <element name="bindingType" type="sca:BindingType"/>
+   <complexType name="BindingType">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="type" type="QName" use="required"/>
+            <attribute name="alwaysProvides" type="sca:listOfQNames" 
+                       use="optional"/>
+            <attribute name="mayProvide" type="sca:listOfQNames" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   
+   <!-- WireFormat Type -->
+   <element name="wireFormat" type="sca:WireFormatType" abstract="true"/>
+   <complexType name="WireFormatType" abstract="true">
+      <sequence>
+         <any namespace="##other" processContents="lax" minOccurs="0" 
+              maxOccurs="unbounded" />
+      </sequence>
+      <anyAttribute namespace="##other" processContents="lax"/>
+   </complexType>
+
+   <!-- OperationSelector Type -->
+   <element name="operationSelector" type="sca:OperationSelectorType"
+      abstract="true"/>
+   <complexType name="OperationSelectorType" abstract="true">
+      <sequence>
+         <any namespace="##other" processContents="lax" minOccurs="0" 
+              maxOccurs="unbounded" />
+      </sequence>
+      <anyAttribute namespace="##other" processContents="lax"/>
+   </complexType>
+   
+   <!-- Callback -->
+   <element name="callback" type="sca:Callback"/>
+   <complexType name="Callback">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <choice minOccurs="0" maxOccurs="unbounded">
+               <element ref="sca:binding"/>
+               <element ref="sca:requires"/>
+               <element ref="sca:policySetAttachment"/>
+               <any namespace="##other" processContents="lax"/>
+            </choice>
+            <attribute name="requires" type="sca:listOfQNames" 
+                       use="optional"/>
+            <attribute name="policySets" type="sca:listOfQNames" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Component -->
+   <complexType name="Component">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <element ref="sca:implementation" minOccurs="1" 
+                  maxOccurs="1"/>
+               <choice minOccurs="0" maxOccurs="unbounded">
+                  <element name="service" type="sca:ComponentService"/>
+                  <element name="reference" type="sca:ComponentReference"/>
+                  <element name="property" type="sca:PropertyValue"/>
+                  <element ref="sca:requires"/>
+                  <element ref="sca:policySetAttachment"/>
+               </choice>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="name" type="NCName" use="required"/>
+            <attribute name="autowire" type="boolean" use="optional"/>
+            <attribute name="requires" type="sca:listOfQNames" 
+                       use="optional"/>
+            <attribute name="policySets" type="sca:listOfQNames" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Component Service -->
+   <complexType name="ComponentService">
+      <complexContent>
+         <extension base="sca:Contract">
+         </extension>
+      </complexContent>
+   </complexType>
+   
+   <!-- Component Reference -->
+   <complexType name="ComponentReference">
+      <complexContent>
+         <extension base="sca:Contract">
+            <attribute name="autowire" type="boolean" use="optional"/>
+            <attribute name="target" type="sca:listOfAnyURIs" 
+                       use="optional"/>
+            <attribute name="wiredByImpl" type="boolean" use="optional" 
+                       default="false"/>
+            <attribute name="multiplicity" type="sca:Multiplicity" 
+                       use="optional" default="1..1"/>
+            <attribute name="nonOverridable" type="boolean" use="optional" 
+                       default="false"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   
+   <!-- Component Type Reference -->
+   <complexType name="ComponentTypeReference">
+      <complexContent>
+         <restriction base="sca:ComponentReference">
+            <sequence>
+               <element ref="sca:documentation" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:interface" minOccurs="0"/>
+               <element ref="sca:binding" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:callback" minOccurs="0"/>
+               <element ref="sca:requires" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:policySetAttachment" minOccurs="0"  
+                        maxOccurs="unbounded"/>              
+               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
+            </sequence>
+            <attribute name="name" type="NCName" use="required"/>
+            <attribute name="autowire" type="boolean" use="optional"/>
+            <attribute name="wiredByImpl" type="boolean" use="optional" 
+                       default="false"/>
+            <attribute name="multiplicity" type="sca:Multiplicity" 
+                       use="optional" default="1..1"/>
+            <attribute name="requires" type="sca:listOfQNames" 
+                       use="optional"/>
+            <attribute name="policySets" type="sca:listOfQNames" 
+                       use="optional"/>
+            <anyAttribute namespace="##other" processContents="lax"/>
+         </restriction>
+      </complexContent>
+   </complexType>
+   
+
+   <!-- Implementation -->
+   <element name="implementation" type="sca:Implementation" abstract="true"/>
+   <complexType name="Implementation" abstract="true">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+	        <choice minOccurs="0" maxOccurs="unbounded">
+	           <element ref="sca:requires"/>
+	           <element ref="sca:policySetAttachment"/>
+	        </choice>     
+            <attribute name="requires" type="sca:listOfQNames" 
+                       use="optional"/>
+            <attribute name="policySets" type="sca:listOfQNames" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Implementation Type -->
+   <element name="implementationType" type="sca:ImplementationType"/>
+   <complexType name="ImplementationType">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="type" type="QName" use="required"/>
+            <attribute name="alwaysProvides" type="sca:listOfQNames" 
+                       use="optional"/>
+            <attribute name="mayProvide" type="sca:listOfQNames" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Wire -->
+   <complexType name="Wire">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="source" type="anyURI" use="required"/>
+            <attribute name="target" type="anyURI" use="required"/>
+            <attribute name="replace" type="boolean" use="optional" 
+               default="false"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Include -->
+   <element name="include" type="sca:Include"/>
+   <complexType name="Include">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <attribute name="name" type="QName"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   
+   <!-- Extensions element -->
+   <element name="extensions">
+      <complexType>
+         <sequence>
+            <any namespace="##other" processContents="lax" 
+               minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <!-- Intents within WSDL documents -->
+   <attribute name="requires" type="sca:listOfQNames"/>
+
+   <!-- Global attribute definition for @callback to mark a WSDL port type    
+        as having a callback interface defined in terms of a second port 
+        type. -->
+   <attribute name="callback" type="anyURI"/>
+   
+   <!-- Value type definition for property values -->
+   <element name="value" type="sca:ValueType"/> 
+   <complexType name="ValueType" mixed="true">
+      <sequence> 
+         <any namespace="##any" processContents="lax" minOccurs="0"
+            maxOccurs='unbounded'/> 
+      </sequence> 
+      <!-- mixed="true" to handle simple type --> 
+      <anyAttribute namespace="##any" processContents="lax"/> 
+   </complexType> 
+   
+   <!-- Miscellaneous simple type definitions -->
+   <simpleType name="Multiplicity">
+      <restriction base="string">
+         <enumeration value="0..1"/>
+         <enumeration value="1..1"/>
+         <enumeration value="0..n"/>
+         <enumeration value="1..n"/>
+      </restriction>
+   </simpleType>
+   
+   <simpleType name="OverrideOptions">
+      <restriction base="string">
+         <enumeration value="no"/>
+         <enumeration value="may"/>
+         <enumeration value="must"/>
+      </restriction>
+   </simpleType>
+   
+   <simpleType name="listOfQNames">
+      <list itemType="QName"/>
+   </simpleType>
+   
+   <simpleType name="listOfAnyURIs">
+      <list itemType="anyURI"/>
+   </simpleType>
+	
+   <simpleType name="CreateResource">
+      <restriction base="string">
+         <enumeration value="always" />
+         <enumeration value="never" />
+         <enumeration value="ifnotexist" />
+      </restriction>
+   </simpleType>
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
deleted file mode 100644
index ef22e1dd3e..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
+++ /dev/null
@@ -1,31 +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.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   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"/>
-   <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
-   
-   <!-- Definitions -->
-   <element name="definitions" type="sca:tDefinitions"/>
-   <complexType name="tDefinitions">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <choice minOccurs="0" maxOccurs="unbounded">
-               <element ref="sca:intent"/>
-               <element ref="sca:policySet"/>
-               <element ref="sca:binding"/>
-               <element ref="sca:bindingType"/>
-               <element ref="sca:implementationType"/>
-               <any namespace="##other" processContents="lax" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-            </choice>
-            <attribute name="targetNamespace" type="anyURI" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
new file mode 100644
index 0000000000..8f2f20db19
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
@@ -0,0 +1,30 @@
+<?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/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   elementFormDefault="qualified">
+   
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
+   
+   <!-- Definitions -->
+   <element name="definitions" type="sca:tDefinitions"/>
+   <complexType name="tDefinitions">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <choice minOccurs="0" maxOccurs="unbounded">
+               <element ref="sca:intent"/>
+               <element ref="sca:policySet"/>
+               <element ref="sca:bindingType"/>
+               <element ref="sca:implementationType"/>
+               <any namespace="##other" processContents="lax" 
+                  minOccurs="0" maxOccurs="unbounded"/>
+            </choice>
+            <attribute name="targetNamespace" type="anyURI" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
index 0d5b747253..967dadf395 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
@@ -9,7 +9,7 @@
    elementFormDefault="qualified">
 
    <!-- SCA-Assembly XML Schema -->
-   <include schemaLocation="sca-core-1.1-cd04.xsd" />
+   <include schemaLocation="sca-core-1.1-cd05.xsd" />
 
    <!-- SCA-BPEL Component Implementation Type -->
    <element name="implementation.bpel" 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
index e408f727f8..ee4b313e6d 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-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/200912"
+	<!--
+		Copyright(C) OASIS(R) 2007,2010. 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/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+	<include schemaLocation="sca-core-1.1-cd05.xsd" />
 
 	<element name="implementation.c" type="sca:CImplementation"
 		substitutionGroup="sca:implementation" />
@@ -15,40 +16,37 @@
 		<complexContent>
 			<extension base="sca:Implementation">
 				<sequence>
-					<element name="operation"
-						type="sca:CImplementationFunction" minOccurs="0"
-						maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
+					<element name="operation" type="sca:CImplementationFunction"
 						minOccurs="0" maxOccurs="unbounded" />
+					<any namespace="##other" processContents="lax" minOccurs="0"
+						maxOccurs="unbounded" />
 				</sequence>
 				<attribute name="module" type="NCName" use="required" />
 				<attribute name="path" type="string" use="optional" />
 				<attribute name="library" type="boolean" use="optional" />
 				<attribute name="componentType" type="string" use="required" />
-				<attribute name="scope" type="sca:CImplementationScope"
-					use="optional" />
-				<attribute name="eagerInit" type="boolean"
-					use="optional" />
+				<attribute name="eagerInit" type="boolean" use="optional" />
 				<attribute name="init" type="boolean" use="optional" />
 				<attribute name="destoy" type="boolean" use="optional" />
 				<attribute name="allowsPassByReference" type="boolean"
 					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
 			</extension>
 		</complexContent>
 	</complexType>
 
-	<simpleType name="CImplementationScope">
-		<restriction base="string">
-			<enumeration value="stateless" />
-			<enumeration value="composite" />
-		</restriction>
-	</simpleType>
-
 	<complexType name="CImplementationFunction">
+		<sequence>
+			<choice minOccurs="0" maxOccurs="unbounded">
+				<element ref="sca:requires"/>
+				<element ref="sca:policySetAttachment"/>
+			</choice>
+			<any namespace="##other" processContents="lax" minOccurs="0"
+				maxOccurs="unbounded" />
+		</sequence>
 		<attribute name="name" type="NCName" use="required" />
-		<attribute name="allowsPassByReference" type="boolean"
-			use="optional" />
+		<attribute name="requires" type="sca:listOfQNames" use="optional" />
+		<attribute name="policySets" type="sca:listOfQNames" use="optional" />
+		<attribute name="allowsPassByReference" type="boolean" use="optional" />
 		<attribute name="init" type="boolean" use="optional" />
 		<attribute name="destoy" type="boolean" use="optional" />
 		<anyAttribute namespace="##other" processContents="lax" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
deleted file mode 100644
index c0517b0a32..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
+++ /dev/null
@@ -1,26 +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.  -->
-<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"/>
-
-   <!-- Composite Implementation -->
-   <element name="implementation.composite" type="sca:SCAImplementation" 
-            substitutionGroup="sca:implementation"/>
-   <complexType name="SCAImplementation">
-      <complexContent>
-         <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="QName" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
new file mode 100644
index 0000000000..f2780f9895
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
@@ -0,0 +1,26 @@
+<?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-cd05.xsd"/>
+
+   <!-- Composite Implementation -->
+   <element name="implementation.composite" type="sca:SCAImplementation" 
+            substitutionGroup="sca:implementation"/>
+   <complexType name="SCAImplementation">
+      <complexContent>
+         <extension base="sca:Implementation">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="name" type="QName" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
index b71eda300d..b54ced4e4e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2006,2010. 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/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+	<include schemaLocation="sca-core-1.1-cd05.xsd" />
 
 	<element name="implementation.cpp" type="sca:CPPImplementation"
 		substitutionGroup="sca:implementation" />
@@ -32,7 +32,6 @@
 					use="optional" />
 				<attribute name="allowsPassByReference" type="boolean"
 					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
 			</extension>
 		</complexContent>
 	</complexType>
@@ -45,7 +44,17 @@
 	</simpleType>
 
 	<complexType name="CPPImplementationFunction">
+		<sequence>
+			<choice minOccurs="0" maxOccurs="unbounded">
+				<element ref="sca:requires"/>
+				<element ref="sca:policySetAttachment"/>
+			</choice>
+			<any namespace="##other" processContents="lax" minOccurs="0"
+				maxOccurs="unbounded" />
+		</sequence>
 		<attribute name="name" type="NCName" use="required" />
+		<attribute name="requires" type="sca:listOfQNames" use="optional" />
+		<attribute name="policySets" type="sca:listOfQNames" use="optional" />
 		<attribute name="allowsPassByReference" type="boolean"
 			use="optional" />
 		<anyAttribute namespace="##other" processContents="lax" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
new file mode 100644
index 0000000000..2856a51450
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2010. 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-cd05.xsd"/>
+
+   <!-- Java Implementation -->
+   <element name="implementation.java" type="sca:JavaImplementation" 
+            substitutionGroup="sca:implementation"/>
+   <complexType name="JavaImplementation">
+      <complexContent>
+         <extension base="sca:Implementation">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="class" type="NCName" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
deleted file mode 100644
index aac845ff59..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
+++ /dev/null
@@ -1,27 +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.  -->
-<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"/>
-
-   <!-- Java Implementation -->
-   <element name="implementation.java" type="sca:JavaImplementation" 
-            substitutionGroup="sca:implementation"/>
-   <complexType name="JavaImplementation">
-      <complexContent>
-         <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="class" type="NCName" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
index cce7738dff..5ef3e86c92 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
@@ -6,7 +6,7 @@
   elementFormDefault="qualified"
   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912">  
 	
-	<include schemaLocation="sca-core-1.1-cd04.xsd"/>
+	<include schemaLocation="sca-core-1.1-cd05.xsd"/>
 	<element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/>
 	<complexType name="SpringImplementation">
 		<complexContent>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
index d5bff5d542..518f0747fb 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-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/200912"
+	<!--
+		Copyright(C) OASIS(R) 2007,2010. 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/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+	<include schemaLocation="sca-core-1.1-cd05.xsd" />
 
 	<element name="interface.c" type="sca:CInterface"
 		substitutionGroup="sca:interface" />
@@ -15,26 +16,33 @@
 		<complexContent>
 			<extension base="sca:Interface">
 				<sequence>
-					<element name="function" type="sca:CFunction"
-						minOccurs="0" maxOccurs="unbounded" />
-					<element name="callbackFunction"
-						type="sca:CFunction" minOccurs="0" maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
+					<element name="function" type="sca:CFunction" minOccurs="0"
+						maxOccurs="unbounded" />
+					<element name="callbackFunction" type="sca:CFunction"
 						minOccurs="0" maxOccurs="unbounded" />
+					<any namespace="##other" processContents="lax" minOccurs="0"
+						maxOccurs="unbounded" />
 				</sequence>
 				<attribute name="header" type="string" use="required" />
-				<attribute name="callbackHeader" type="string"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
+				<attribute name="callbackHeader" type="string" use="optional" />
 			</extension>
 		</complexContent>
 	</complexType>
 
 	<complexType name="CFunction">
+		<sequence>
+			<choice minOccurs="0" maxOccurs="unbounded">
+				<element ref="sca:requires"/>
+				<element ref="sca:policySetAttachment"/>
+			</choice>
+			<any namespace="##other" processContents="lax" minOccurs="0"
+				maxOccurs="unbounded" />
+		</sequence>
 		<attribute name="name" type="NCName" use="required" />
-		<attribute name="requires" type="sca:listOfQNames"
-			use="optional" />
+		<attribute name="requires" type="sca:listOfQNames" use="optional" />
+		<attribute name="policySets" type="sca:listOfQNames" use="optional" />
 		<attribute name="oneWay" type="boolean" use="optional" />
+		<attribute name="exclude" type="boolean" use="optional" />
 		<attribute name="input" type="NCName" use="optional" />
 		<attribute name="output" type="NCName" use="optional" />
 		<anyAttribute namespace="##other" processContents="lax" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
index e3e3c9369e..b07bf01f1d 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-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/200912"
+	<!--
+		Copyright(C) OASIS(R) 2006,2010. 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/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+	<include schemaLocation="sca-core-1.1-cd05.xsd" />
 
 	<element name="interface.cpp" type="sca:CPPInterface"
 		substitutionGroup="sca:interface" />
@@ -15,29 +16,35 @@
 		<complexContent>
 			<extension base="sca:Interface">
 				<sequence>
-					<element name="function" type="sca:CPPFunction"
-						minOccurs="0" maxOccurs="unbounded" />
-					<element name="callbackFunction"
-						type="sca:CPPFunction" minOccurs="0" maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
+					<element name="function" type="sca:CPPFunction" minOccurs="0"
+						maxOccurs="unbounded" />
+					<element name="callbackFunction" type="sca:CPPFunction"
 						minOccurs="0" maxOccurs="unbounded" />
+					<any namespace="##other" processContents="lax" minOccurs="0"
+						maxOccurs="unbounded" />
 				</sequence>
 				<attribute name="header" type="string" use="required" />
 				<attribute name="class" type="Name" use="required" />
-				<attribute name="callbackHeader" type="string"
-					use="optional" />
-				<attribute name="callbackClass" type="Name"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
+				<attribute name="callbackHeader" type="string" use="optional" />
+				<attribute name="callbackClass" type="Name" use="optional" />
 			</extension>
 		</complexContent>
 	</complexType>
 
 	<complexType name="CPPFunction">
+		<sequence>
+			<choice minOccurs="0" maxOccurs="unbounded">
+				<element ref="sca:requires"/>
+				<element ref="sca:policySetAttachment"/>
+			</choice>
+			<any namespace="##other" processContents="lax" minOccurs="0"
+				maxOccurs="unbounded" />
+		</sequence>
 		<attribute name="name" type="NCName" use="required" />
-		<attribute name="requires" type="sca:listOfQNames"
-			use="optional" />
+		<attribute name="requires" type="sca:listOfQNames" use="optional" />
+		<attribute name="policySets" type="sca:listOfQNames" use="optional" />
 		<attribute name="oneWay" type="boolean" use="optional" />
+		<attribute name="exclude" type="boolean" use="optional" />
 		<anyAttribute namespace="##other" processContents="lax" />
 	</complexType>
 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
index 7d3a536b8c..7b78e13749 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912" 
    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
    
    <!-- Java Interface -->
    <element name="interface.java" type="sca:JavaInterface" 
@@ -21,7 +21,6 @@
             <attribute name="interface" type="NCName" use="required"/>
             <attribute name="callbackInterface" type="NCName" 
                        use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
          </extension>
       </complexContent>
    </complexType>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
deleted file mode 100644
index 3f0be7dc6d..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
+++ /dev/null
@@ -1,29 +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.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   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"/>
-   
-   <!-- WSDL Interface -->
-   <element name="interface.wsdl" type="sca:WSDLPortType" 
-            substitutionGroup="sca:interface"/>
-   <complexType name="WSDLPortType">
-      <complexContent>
-         <extension base="sca:Interface">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="interface" type="anyURI" use="required"/>
-            <attribute name="callbackInterface" type="anyURI" 
-                       use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
new file mode 100644
index 0000000000..8d3510be7d
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
@@ -0,0 +1,28 @@
+<?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/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   elementFormDefault="qualified">
+   
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+   
+   <!-- WSDL Interface -->
+   <element name="interface.wsdl" type="sca:WSDLPortType" 
+            substitutionGroup="sca:interface"/>
+   <complexType name="WSDLPortType">
+      <complexContent>
+         <extension base="sca:Interface">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="interface" type="anyURI" use="required"/>
+            <attribute name="callbackInterface" type="anyURI" 
+                       use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
index 18daa8c926..97b44f8da5 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
@@ -1,52 +1,52 @@
-<?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="implementation.ejb" type="sca:EJBImplementation" 
-      substitutionGroup="sca:implementation"/>
-	<complexType name="EJBImplementation">
-	   <complexContent>
-	      <extension base="sca:Implementation">
-	         <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="ejb-link" type="string" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-        </extension>
-      </complexContent>
-	</complexType>
-	<element name="implementation.web" type="sca:WebImplementation" 
-      substitutionGroup="sca:implementation"/>
-	<complexType name="WebImplementation">
-	   <complexContent>
-	      <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="web-uri" type="string" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-	</complexType>
-	<element name="implementation.jee" type="sca:JEEImplementation" 
-      substitutionGroup="sca:implementation"/>
-	<complexType name="JEEImplementation">
-      <complexContent>
-         <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="archive" type="string" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-	</complexType>
-</schema>
+<?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-cd05.xsd"/>
+
+	<element name="implementation.ejb" type="sca:EJBImplementation" 
+      substitutionGroup="sca:implementation"/>
+	<complexType name="EJBImplementation">
+	   <complexContent>
+	      <extension base="sca:Implementation">
+	         <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                  maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="ejb-link" type="string" use="required"/>
+            <anyAttribute namespace="##other" processContents="lax"/>
+        </extension>
+      </complexContent>
+	</complexType>
+	<element name="implementation.web" type="sca:WebImplementation" 
+      substitutionGroup="sca:implementation"/>
+	<complexType name="WebImplementation">
+	   <complexContent>
+	      <extension base="sca:Implementation">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                  maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="web-uri" type="string" use="required"/>
+            <anyAttribute namespace="##other" processContents="lax"/>
+         </extension>
+      </complexContent>
+	</complexType>
+	<element name="implementation.jee" type="sca:JEEImplementation" 
+      substitutionGroup="sca:implementation"/>
+	<complexType name="JEEImplementation">
+      <complexContent>
+         <extension base="sca:Implementation">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                  maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="archive" type="string" use="required"/>
+            <anyAttribute namespace="##other" processContents="lax"/>
+         </extension>
+      </complexContent>
+	</complexType>
+</schema>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
new file mode 100644
index 0000000000..61693046c1
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2010. 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/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+	elementFormDefault="qualified">
+
+	<include schemaLocation="sca-core-1.1-cd05.xsd"/>	
+	<import namespace="http://www.w3.org/ns/ws-policy"
+		schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
+
+	<element name="intent" type="sca:Intent"/>
+	<complexType name="Intent">
+		<sequence>
+			<element name="description" type="string" minOccurs="0"
+			   maxOccurs="1" />
+			<element name="qualifier" type="sca:IntentQualifier" 
+			   minOccurs="0" maxOccurs="unbounded" />
+			<any namespace="##other" processContents="lax" 
+			   minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<attribute name="constrains" type="sca:listOfQNames" 
+		   use="optional"/>
+		<attribute name="requires" type="sca:listOfQNames" 
+		   use="optional"/>
+		<attribute name="excludes" type="sca:listOfQNames" 
+		   use="optional"/>
+		<attribute name="mutuallyExclusive" type="boolean" 
+		   use="optional" default="false"/>
+		<attribute name="intentType" 
+			type="sca:InteractionOrImplementation" 
+			use="optional" default="interaction"/>
+		<anyAttribute namespace="##other" processContents="lax"/>
+	</complexType>
+
+	<complexType name="IntentQualifier">
+		<sequence>
+			<element name="description" type="string" minOccurs="0" 
+			   maxOccurs="1" />
+			<any namespace="##other" processContents="lax" minOccurs="0"
+			   maxOccurs="unbounded"/> 
+		</sequence>
+  		<attribute name="name" type="NCName" use="required"/>
+  		<attribute name="default" type="boolean" use="optional" 
+  		   default="false"/>
+	</complexType>
+
+	<element name="requires"> 
+		<complexType>
+			<sequence minOccurs="0" maxOccurs="unbounded">
+				<any namespace="##other" processContents="lax"/>
+			</sequence>		
+			<attribute name="intents" type="sca:listOfQNames" use="required"/>
+			<anyAttribute namespace="##other" processContents="lax"/>
+		</complexType>
+	</element>
+
+	<element name="policySet" type="sca:PolicySet"/>
+	<complexType name="PolicySet">
+		<choice minOccurs="0" maxOccurs="unbounded">
+  			<element name="policySetReference" 
+  			   type="sca:PolicySetReference"/>
+  			<element name="intentMap" type="sca:IntentMap"/>
+  			<any namespace="##other" processContents="lax"/>
+		</choice>
+		<attribute name="name" type="NCName" use="required"/>
+		<attribute name="provides" type="sca:listOfQNames"/>
+		<attribute name="appliesTo" type="string" use="optional"/>
+		<attribute name="attachTo" type="string" use="optional"/>
+		<anyAttribute namespace="##other" processContents="lax"/>
+	</complexType>
+
+	<element name="policySetAttachment">
+		<complexType>
+			<sequence minOccurs="0" maxOccurs="unbounded">
+				<any namespace="##other" processContents="lax"/>
+			</sequence>
+			<attribute name="name" type="QName" use="required"/>
+			<anyAttribute namespace="##other" processContents="lax"/>
+		</complexType>
+	</element>
+
+	<complexType name="PolicySetReference">
+		<attribute name="name" type="QName" use="required"/>
+		<anyAttribute namespace="##other" processContents="lax"/>
+	</complexType>
+
+	<complexType name="IntentMap">
+		<choice minOccurs="1" maxOccurs="unbounded">
+			<element name="qualifier" type="sca:Qualifier"/>
+			<any namespace="##other" processContents="lax"/>
+		</choice>
+		<attribute name="provides" type="QName" use="required"/>
+		<anyAttribute namespace="##other" processContents="lax"/>
+	</complexType>
+
+	<complexType name="Qualifier">
+		<sequence minOccurs="0" maxOccurs="unbounded">
+			<any namespace="##other" processContents="lax"/>
+		</sequence>
+		<attribute name="name" type="string" use="required"/>
+		<anyAttribute namespace="##other" processContents="lax"/>
+	</complexType>
+
+	<simpleType name="listOfNCNames">
+		<list itemType="NCName"/>
+	</simpleType>
+
+	<simpleType name="InteractionOrImplementation">
+		<restriction base="string">
+			<enumeration value="interaction"/>
+			<enumeration value="implementation"/>
+		</restriction>
+	</simpleType>
+
+</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
deleted file mode 100644
index 372e8c24b3..0000000000
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
+++ /dev/null
@@ -1,104 +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.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	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">
-
-	<include schemaLocation="sca-core-1.1-cd04.xsd"/>	
-	<import namespace="http://www.w3.org/ns/ws-policy"
-		schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
-
-	<element name="intent" type="sca:Intent"/>
-	<complexType name="Intent">
-		<sequence>
-			<element name="description" type="string" minOccurs="0"
-			   maxOccurs="1" />
-			<element name="qualifier" type="sca:IntentQualifier" 
-			   minOccurs="0" maxOccurs="unbounded" />
-			<any namespace="##other" processContents="lax" 
-			   minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="constrains" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="requires" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="excludes" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="mutuallyExclusive" type="boolean" 
-		   use="optional" default="false"/>
-		<attribute name="intentType" 
-			type="sca:InteractionOrImplementation" 
-			use="optional" default="interaction"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<complexType name="IntentQualifier">
-		<sequence>
-			<element name="description" type="string" minOccurs="0" 
-			   maxOccurs="1" />
-		</sequence>
-  		<attribute name="name" type="NCName" use="required"/>
-  		<attribute name="default" type="boolean" use="optional" 
-  		   default="false"/>
-	</complexType>
-
-	<element name="policySet" type="sca:PolicySet"/>
-	<complexType name="PolicySet">
-		<choice minOccurs="0" maxOccurs="unbounded">
-  			<element name="policySetReference" 
-  			   type="sca:PolicySetReference"/>
-  			<element name="intentMap" type="sca:IntentMap"/>
-  			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="provides" type="sca:listOfQNames"/>
-		<attribute name="appliesTo" type="string" use="optional"/>
-		<attribute name="attachTo" type="string" use="optional"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<element name="policySetAttachment" 
-	   type="sca:PolicySetAttachment"/>
-	<complexType name="PolicySetAttachment">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<complexType name="PolicySetReference">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<complexType name="IntentMap">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="qualifier" type="sca:Qualifier"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="provides" type="QName" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<complexType name="Qualifier">
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<any namespace="##other" processContents="lax"/>
-		</sequence>
-		<attribute name="name" type="string" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<simpleType name="listOfNCNames">
-		<list itemType="NCName"/>
-	</simpleType>
-
-	<simpleType name="InteractionOrImplementation">
-		<restriction base="string">
-			<enumeration value="interaction"/>
-			<enumeration value="implementation"/>
-		</restriction>
-	</simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
new file mode 100644
index 0000000000..4505850072
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
+<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912">
+                 
+	<!-- Security related intents -->                 
+        <sca:intent name="serverAuthentication" constrains="sca:binding"
+	    intentType="interaction">
+                <sca:description>
+			Communication through the binding requires that the 
+			server is authenticated by the client
+                </sca:description>
+                <sca:qualifier name="transport" default="true"/>
+                <sca:qualifier name="message"/>
+        </sca:intent>
+
+        <sca:intent name="clientAuthentication" constrains="sca:binding"
+	    intentType="interaction">
+                <sca:description>
+			Communication through the binding requires that the 
+			client is authenticated by the server
+                </sca:description>
+                <sca:qualifier name="transport" default="true"/>
+                <sca:qualifier name="message"/>
+        </sca:intent>
+
+        <sca:intent name="authentication" requires="sca:clientAuthentication">
+                <sca:description>
+			A convenience intent to help migration
+                </sca:description>
+        </sca:intent>
+
+        <sca:intent name="mutualAuthentication"
+                requires="sca:clientAuthentication sca:serverAuthentication">
+                <sca:description>
+			Communication through the binding requires that the
+			client and server to authenticate each other
+                </sca:description>
+        </sca:intent>
+
+        <sca:intent name="confidentiality" constrains="sca:binding"
+	    intentType="interaction">
+                <sca:description>
+			Communication through the binding prevents unauthorized 
+			users from reading the messages
+                </sca:description>
+                <sca:qualifier name="transport" default="true"/>
+                <sca:qualifier name="message"/>
+        </sca:intent>
+
+        <sca:intent name="integrity" constrains="sca:binding"
+	    intentType="interaction">
+                <sca:description>
+			Communication through the binding prevents tampering 
+			with the messages sent between the client and the service.
+                </sca:description>
+                <sca:qualifier name="transport" default="true"/>
+                <sca:qualifier name="message"/>
+        </sca:intent>
+
+        <sca:intent name="authorization" constrains="sca:implementation"
+	    intentType="implementation">
+                <sca:description>
+			Ensures clients are authorized to use services. 
+                </sca:description>
+        </sca:intent>
+
+	
+	<!-- Reliable messaging related intents -->    
+        <sca:intent name="atLeastOnce" constrains="sca:binding"
+	    intentType="interaction">
+                <sca:description>
+			This intent is used to indicate that a message sent
+			by a client is always delivered to the component.
+                </sca:description>
+        </sca:intent>
+
+        <sca:intent name="atMostOnce" constrains="sca:binding"
+	    intentType="interaction">
+                <sca: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.
+                </sca:description>
+        </sca:intent>
+
+        <sca:intent name="exactlyOnce" requires="sca:atLeastOnce sca:atMostOnce"
+	    constrains="sca:binding" intentType="interaction">
+                <sca: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.
+            </sca:description>
+        </sca:intent>
+
+        <sca:intent name="ordered" constrains="sca:binding"
+	    intentType="interaction">
+                <sca: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.
+                </sca:description>
+        </sca:intent>
+	
+	<!-- Transaction related intents -->
+        <sca:intent name="managedTransaction" excludes="sca:noManagedTransaction"
+	    mutuallyExclusive="true" constrains="sca:implementation" 
+	    intentType="implementation">
+                <sca:description>
+		A managed transaction environment is necessary in order to 
+		run the component. The specific type of managed transaction 
+		needed is not constrained.
+                </sca:description>
+                <sca:qualifier name="global" default="true">
+                        <sca: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. 
+                        </sca:description>
+                </sca:qualifier>
+                <sca:qualifier name="local">
+                        <sca: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.
+                        </sca:description>
+                </sca:qualifier>
+        </sca:intent>
+
+        <sca:intent name="noManagedTransaction" excludes="sca:managedTransaction"
+	    constrains="sca:implementation" intentType="implementation">
+                <sca: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.
+                </sca:description>
+        </sca:intent>
+
+        <sca:intent name="transactedOneWay" excludes="sca:immediateOneWay"
+	    constrains="sca:binding" intentType="implementation">
+                <sca: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.
+                </sca:description>
+        </sca:intent>
+
+        <sca:intent name="immediateOneWay" excludes="sca:transactedOneWay"
+	    constrains="sca:binding" intentType="implementation">
+                <sca: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.
+                </sca:description>
+        </sca:intent>
+
+        <sca:intent name="propagatesTransaction" excludes="sca:suspendsTransaction"
+	    constrains="sca:binding" intentType="interaction">
+                <sca: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. 
+                </sca:description>
+        </sca:intent>
+
+        <sca:intent name="suspendsTransaction" excludes="sca:propagatesTransaction"
+	    constrains="sca:binding" intentType="interaction">
+                <sca: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.
+                </sca:description>
+        </sca:intent>
+	
+        <sca:intent name="managedSharedTransaction"
+                requires="sca:managedTransaction.global sca:propagatesTransaction">
+                <sca:description>
+			Used to indicate that the component requires both the 
+			managedTransaction.global and the propagatesTransactions 
+			intents
+                </sca:description>
+        </sca:intent>
+	
+	<!-- Miscellaneous intents -->	
+	<sca:intent name="asyncInvocation" excludes="sca:propagatesTransaction"
+                constrains="sca:binding"	intentType="interaction">
+                <sca:description>
+			Indicates that request/response operations for the 
+			interface of this wire are "long running" and must be
+			treated as two separate message transmissions
+                </sca:description>
+    </sca:intent>
+	
+	<sca:intent name="EJB" constrains="sca:binding" 
+		intentType="interaction">
+                <sca:description>
+			Specifies that the EJB API is needed to communicate with
+			the service or reference.
+                </sca:description>
+    </sca:intent>
+    
+	<sca:intent name="SOAP" constrains="sca:binding" intentType="interaction" mutuallyExclusive="true">
+		<sca:description>
+		Specifies that the SOAP messaging model is used for delivering 
+		messages.
+                </sca:description>
+                <sca:qualifier name="v1_1" default="true"/>
+                <sca:qualifier name="v1_2"/>
+    </sca:intent>
+
+    <sca:intent name="JMS" constrains="sca:binding" intentType="interaction">
+                <sca:description>
+		Requires that the messages are delivered and received via the 
+		JMS API.
+                </sca:description>
+    </sca:intent>
+
+    <sca:intent name="noListener" constrains="sca:binding"
+	    intentType="interaction">
+                <sca: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. 
+                </sca:description>
+    </sca:intent>
+	
+</sca:definitions>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
index a41087d6ec..b5a67b7bbb 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
@@ -23,7 +23,7 @@
     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-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <element name="binding.dwr" type="t:DWRBinding"/>
     
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
index ff0ecd1414..cd874e9f13 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
@@ -23,7 +23,7 @@
     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-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <element name="binding.http" type="t:HTTPBinding"/>
     
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
index 2fb4587862..c4e2bbf58b 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
@@ -23,7 +23,7 @@
     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-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
     
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
index a3477c4a34..9cc641cc1f 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
@@ -23,7 +23,7 @@
     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-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <element name="binding.rmi" type="t:RMIBinding"/>
     
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
index ab445dfe9e..c97b91251b 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
@@ -23,7 +23,7 @@
     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-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <element name="implementation.osgi" type="t:OSGiImplementation" substitutionGroup="sca:implementation"/>
 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
index 21d6fa377d..491cb2abce 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
@@ -23,7 +23,7 @@
     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-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <element name="implementation.widget" type="t:WidgetImplementation" substitutionGroup="sca:implementation"/>
     	
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 92b7703278..5724da84d8 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
@@ -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/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
-- 
cgit v1.2.3