From 296998d19b12f9b844cb7ac4fdfb98700e5e76ed Mon Sep 17 00:00:00 2001
From: edwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 5 Aug 2009 22:03:18 +0000
Subject: Updated to match latest OASIS XSDs which contain fixes for problems
 which are affecting Tuscany - sca-1.1-cd03.xsd updated to use these new
 files.  As required by TUSCANY 3192. - additional changes required to make
 all files work together.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@801434 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/sca-1.1-cd03.xsd            |  44 -----
 .../src/main/resources/sca-1.1-cd04.xsd            |  36 +++++
 .../main/resources/sca-binding-jca-1.1-cd02.xsd    | 167 -------------------
 .../main/resources/sca-binding-jca-1.1-cd04.xsd    | 173 ++++++++++++++++++++
 .../main/resources/sca-binding-jms-1.1-cd02.xsd    | 160 ------------------
 .../main/resources/sca-binding-jms-1.1-cd04.xsd    | 178 +++++++++++++++++++++
 .../main/resources/sca-binding-sca-1.1-cd03.xsd    |  20 ---
 .../main/resources/sca-binding-sca-1.1-cd04.xsd    |  20 +++
 .../src/main/resources/sca-binding-ws-1.1-cd02.xsd |  36 -----
 .../src/main/resources/sca-binding-ws-1.1-cd04.xsd |  35 ++++
 .../main/resources/sca-contribution-1.1-cd03.xsd   |  86 ----------
 .../main/resources/sca-contribution-1.1-cd04.xsd   |  90 +++++++++++
 .../main/resources/sca-contribution-c-1.1-cd02.xsd |  35 ----
 .../main/resources/sca-contribution-c-1.1-cd04.xsd |  35 ++++
 .../resources/sca-contribution-cpp-1.1-cd02.xsd    |  35 ----
 .../resources/sca-contribution-cpp-1.1-cd04.xsd    |  35 ++++
 .../resources/sca-contribution-java-1.1-cd01.xsd   |  33 ----
 .../resources/sca-contribution-java-1.1-cd02.xsd   |  33 ++++
 .../src/main/resources/sca-core-1.1-cd04.xsd       |  26 ++-
 .../main/resources/sca-definitions-1.1-cd03.xsd    |  31 ----
 .../main/resources/sca-definitions-1.1-cd04.xsd    |  31 ++++
 .../resources/sca-implementation-bpel-1.1-cd02.xsd |  31 ----
 .../resources/sca-implementation-bpel-1.1-cd03.xsd |   3 +-
 .../resources/sca-implementation-c-1.1-cd02.xsd    |  57 -------
 .../resources/sca-implementation-c-1.1-cd04.xsd    |  57 +++++++
 .../sca-implementation-composite-1.1-cd03.xsd      |  26 ---
 .../sca-implementation-composite-1.1-cd04.xsd      |  26 +++
 .../resources/sca-implementation-cpp-1.1-cd02.xsd  |  54 -------
 .../resources/sca-implementation-cpp-1.1-cd04.xsd  |  54 +++++++
 .../resources/sca-implementation-java-1.1-cd01.xsd |  27 ----
 .../resources/sca-implementation-java-1.1-cd03.xsd |   2 +-
 .../sca-implementation-spring-1.1-cd01.xsd         |  21 +++
 .../resources/sca-implementation-spring-1.1.xsd    |  22 ---
 .../main/resources/sca-interface-c-1.1-cd02.xsd    |  41 -----
 .../main/resources/sca-interface-c-1.1-cd04.xsd    |  43 +++++
 .../main/resources/sca-interface-cpp-1.1-cd02.xsd  |  42 -----
 .../main/resources/sca-interface-cpp-1.1-cd04.xsd  |  44 +++++
 .../main/resources/sca-interface-java-1.1-cd03.xsd |  29 ----
 .../main/resources/sca-interface-java-1.1-cd04.xsd |  29 ++++
 .../main/resources/sca-interface-wsdl-1.1-cd03.xsd |  29 ----
 .../main/resources/sca-interface-wsdl-1.1-cd04.xsd |   2 +-
 .../src/main/resources/sca-policy-1.1-cd02.xsd     | 105 ------------
 .../src/main/resources/sca-policy-1.1-cd04.xsd     | 101 ++++++++++++
 .../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 +-
 .../src/main/resources/tuscany-sca-1.1.xsd         |   2 +-
 49 files changed, 1073 insertions(+), 1123 deletions(-)
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
 delete mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
 create mode 100644 java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
deleted file mode 100644
index b2f36a871c..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
+++ /dev/null
@@ -1,44 +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/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
-   
-   <!-- Updated 5th August 2009 to point to updated versions of the OASIS XSDs
-        - done because the new files fix errors in the older files which cause
-          problems in Tuscany
-        - this file will be replaced as a whole when OASIS updates this file
-    -->
-   
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>						<!-- Was CD03 -->
-
-   <include schemaLocation="sca-interface-java-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-interface-wsdl-1.1-cd04.xsd"/>				<!-- Was CD03 -->
-   <include schemaLocation="sca-interface-cpp-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-interface-c-1.1-cd02.xsd"/>
-
-   <include schemaLocation="sca-implementation-java-1.1-cd03.xsd"/>			<!-- Was CD01 -->
-   <include schemaLocation="sca-implementation-composite-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-implementation-cpp-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-implementation-c-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-implementation-bpel-1.1-cd03.xsd"/>			<!-- Was CD02 -->
-   <include schemaLocation="sca-implementation-spring-1.1.xsd"/>
-
-   <include schemaLocation="sca-binding-ws-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/> 		<!-- New -->  
-   <include schemaLocation="sca-binding-jms-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-binding-jca-1.1-cd02.xsd"/>   
-   <include schemaLocation="sca-binding-sca-1.1-cd03.xsd"/>
-
-   <include schemaLocation="sca-definitions-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd02.xsd"/>
-
-   <include schemaLocation="sca-contribution-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-contribution-cpp-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-contribution-c-1.1-cd02.xsd"/>
-   <include schemaLocation="sca-contribution-java-1.1-cd01.xsd"/>
-   
-   <include schemaLocation="sca-jee-1.1-wd03.xsd"/>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
new file mode 100644
index 0000000000..8d177fc768
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+   
+   <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-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"/>
+   
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
deleted file mode 100644
index 490c9659f4..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
+++ /dev/null
@@ -1,167 +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/200903"
-	    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 	
-        elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-	<complexType name="JCABinding">
-	<complexContent>
-	<extension base="sca:Binding">
-		<sequence>
-		<element name="jca.outbound.connection" 				
-			 type="sca:JCAOutboundConnection"
-			 minOccurs="0" />
-		<element name="jca.inbound.connection" 
-			 type="sca:JCAInboundConnection"
-			 minOccurs="0" />
-		<element name="jca.outbound.interaction" 
-			 type="sca:JCAOutboundInteraction"
-			 minOccurs="0" />
-		<element name="jca.inbound.interaction" 
-			 type="sca:JCAInboundInteraction"
-			 minOccurs="0" />
-		<element name="property" type="sca:Property" minOccurs="0"
-			 maxOccurs="unbounded" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-			 maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="connectionInfo" type="anyURI" use="optional" />
-	      <attribute name="initialContextFactory" 
-			 type="anyURI" use="optional"/>
-    	      <attribute name="jndiURL" type="anyURI" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax" />
-	</extension>
-	</complexContent>
-	</complexType>
-
-	<simpleType name="ResAuth">
-		<restriction base="string">
-			<enumeration value="Container" />
-			<enumeration value="Application" />
-		</restriction>
-	</simpleType>
-	<complexType name="JCAOutboundConnection">
-		<sequence>
-			<element name="resourceAdapter" type="sca:ResourceAdapter"
-				minOccurs="0" />
-			<element name="connection" type="sca:Connection" />
-			<element name="resAuth" type="sca:ResAuth" minOccurs="0" />
-			<any namespace="##other" 
-				processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="managed" type="boolean" use="optional"
-			default="true" />
-		<anyAttribute namespace="##any" processContents="lax" />
-	</complexType>
-	<complexType name="JCAInboundConnection">
-		<sequence>
-		<element name="resourceAdapter" type="sca:ResourceAdapter" />
-		<element name="activationSpec" type="sca:ActivationSpec" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-	</complexType>
-	<complexType name="JCAOutboundInteraction">
-		<sequence>
-		<element name="connectionSpec" type="sca:ConnectionSpec"
-				minOccurs="0" />
-		<element name="interactionSpec" type="sca:InteractionSpec"
-				minOccurs="0" />
-		<element name="operation" type="sca:Operation" minOccurs="0" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-	</complexType>
-	<complexType name="JCAInboundInteraction">
-		<sequence>
-		<element name="listener" type="string" minOccurs="0" />
-		<element name="inboundOperation" type="sca:InboundOperation"
-				minOccurs="0" maxOccurs="unbounded" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-	</complexType>
-	<complexType name="ResourceAdapter">
-		<sequence>
-		<element name="property" type="sca:Property" minOccurs="0"
-				maxOccurs="unbounded" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="optional" />
-		<attribute name="type" type="NMTOKEN" use="required" />
-		<anyAttribute namespace="##any" processContents="lax" />
-	</complexType>
-	<complexType name="Connection">
-		<sequence>
-		<element name="property" type="sca:Property" minOccurs="0"
-				maxOccurs="unbounded" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="optional" />
-		<attribute name="type" type="NMTOKEN" use="required" />
-		<attribute name="create" type="sca:CreateResource" use="optional"
-			default="ifnotexist" />
-		<anyAttribute namespace="##any" processContents="lax" />
-	</complexType>
-	<complexType name="ActivationSpec">
-		<sequence>
-		<element name="property" type="sca:Property" minOccurs="0"
-				maxOccurs="unbounded" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="optional" />
-		<attribute name="type" type="NMTOKEN" use="required" />
-		<attribute name="create" type="sca:CreateResource" use="optional"
-			default="ifnotexist" />
-		<anyAttribute namespace="##any" processContents="lax" />
-	</complexType>
-	<complexType name="Operation">
-		<sequence>
-		<element name="interactionSpec" type="sca:InteractionSpec"
-				minOccurs="0" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="required" />
-		<anyAttribute namespace="##any" processContents="lax" />
-	</complexType>
-	<complexType name="InboundOperation">
-		<sequence>
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="required" />
-		<attribute name="nativeOperation" type="string" use="required" />
-		<anyAttribute namespace="##any" processContents="lax" />
-	</complexType>
-	<complexType name="ConnectionSpec">
-		<sequence>
-		<element name="property" type="sca:Property" minOccurs="0"
-				maxOccurs="unbounded" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="type" type="NMTOKEN" use="required" />
-		<anyAttribute namespace="##any" processContents="lax" />
-	</complexType>
-	<complexType name="InteractionSpec">
-		<sequence>
-		<element name="property" type="sca:Property" minOccurs="0"
-				maxOccurs="unbounded" />
-		<any namespace="##other" processContents="lax" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="type" type="NMTOKEN" use="required" />
-		<anyAttribute namespace="##any" processContents="lax" />
-	</complexType>
-	<element name="binding.jca" type="sca:JCABinding"
-		substitutionGroup="sca:binding" />
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
new file mode 100644
index 0000000000..7f9baac45c
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+        elementFormDefault="qualified">
+        
+   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+
+   <complexType name="JCABinding">
+      <complexContent>
+         <extension base="sca:Binding">
+            <sequence>
+               <element name="outboundConnection" 
+                        type="sca:JCAOutboundConnection" minOccurs="0" />
+               <element name="inboundConnection" 
+                        type="sca:JCAInboundConnection" minOccurs="0" />
+               <element name="outboundInteraction" 
+                        type="sca:JCAOutboundInteraction" minOccurs="0" />
+               <element name="inboundInteraction" 
+                        type="sca:JCAInboundInteraction" minOccurs="0" />
+               <element name="property" type="sca:Property" minOccurs="0"
+                        maxOccurs="unbounded" />
+               <any namespace="##other" processContents="lax" minOccurs="0"
+                    maxOccurs="unbounded" />
+            </sequence>
+            <attribute name="connectionInfo" type="anyURI" use="optional" />
+            <attribute name="initialContextFactory" type="anyURI" 
+                       use="optional"/>
+    	   <attribute name="jndiURL" type="anyURI" use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <simpleType name="JCACreateResource">
+      <restriction base="string">
+         <enumeration value="always" />
+         <enumeration value="never" />
+         <enumeration value="ifNotExist" />
+	    </restriction>
+   </simpleType>
+   <simpleType name="ResAuth">
+      <restriction base="string">
+         <enumeration value="container" />
+         <enumeration value="application" />
+      </restriction>
+   </simpleType>
+   <complexType name="JCAOutboundConnection">
+      <sequence>
+         <element name="resourceAdapter" type="sca:ResourceAdapter"
+                  minOccurs="0" />
+         <element name="connection" type="sca:Connection" />
+         <element name="resAuth" type="sca:ResAuth" minOccurs="0" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <attribute name="managed" type="boolean" use="optional"	
+                default="true" />
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="JCAInboundConnection">
+      <sequence>
+         <element name="resourceAdapter" type="sca:ResourceAdapter" />
+         <element name="activationSpec" type="sca:ActivationSpec" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="JCAOutboundInteraction">
+      <sequence>
+         <element name="connectionSpec" type="sca:ConnectionSpec"
+                  minOccurs="0" />
+         <element name="interactionSpec" type="sca:InteractionSpec"
+                  minOccurs="0" />
+         <element name="operation" type="sca:Operation" minOccurs="0" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="JCAInboundInteraction">
+      <sequence>
+         <element name="listener" type="string" minOccurs="0" />
+         <element name="inboundOperation" type="sca:InboundOperation"
+                  minOccurs="0" maxOccurs="unbounded" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="ResourceAdapter">
+      <sequence>
+         <element name="property" type="sca:Property" minOccurs="0"
+                  maxOccurs="unbounded" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <attribute name="name" type="NMTOKEN" use="optional" />
+      <attribute name="type" type="NMTOKEN" use="required" />
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="Connection">
+      <sequence>
+         <element name="property" type="sca:Property" minOccurs="0"
+                  maxOccurs="unbounded" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <attribute name="name" type="NMTOKEN" use="optional" />
+      <attribute name="type" type="NMTOKEN" use="required" />
+      <attribute name="create" type="sca:JCACreateResource" use="optional"
+                 default="ifNotExist" />
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="ActivationSpec">
+      <sequence>
+         <element name="property" type="sca:Property" minOccurs="0"
+                  maxOccurs="unbounded" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <attribute name="name" type="NMTOKEN" use="optional" />
+      <attribute name="type" type="NMTOKEN" use="required" />
+      <attribute name="create" type="sca:JCACreateResource" use="optional"
+                 default="ifNotExist"/>
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="Operation">
+      <sequence>
+         <element name="interactionSpec" type="sca:InteractionSpec"
+                  minOccurs="0" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <attribute name="name" type="NMTOKEN" use="required" />
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="InboundOperation">
+      <sequence>
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+		</sequence>
+		<attribute name="name" type="NMTOKEN" use="required" />
+		<attribute name="nativeOperation" type="string" use="required" />
+		<anyAttribute namespace="##other" processContents="lax" />
+	</complexType>
+	<complexType name="ConnectionSpec">
+      <sequence>
+         <element name="property" type="sca:Property" minOccurs="0"
+                  maxOccurs="unbounded" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <attribute name="type" type="NMTOKEN" use="required" />
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+   <complexType name="InteractionSpec">
+      <sequence>
+         <element name="property" type="sca:Property" minOccurs="0"
+                  maxOccurs="unbounded" />
+         <any namespace="##other" processContents="lax" minOccurs="0"
+              maxOccurs="unbounded" />
+      </sequence>
+      <attribute name="type" type="NMTOKEN" use="required" />
+      <anyAttribute namespace="##other" processContents="lax" />
+   </complexType>
+
+   <element name="binding.jca" type="sca:JCABinding"
+            substitutionGroup="sca:binding" />
+            
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
deleted file mode 100644
index 6a898c7e7b..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
+++ /dev/null
@@ -1,160 +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/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-
-   <complexType name="JMSBinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-       			<element name="destination" type="sca:JMSDestination" minOccurs="0"/>
-       			<element name="connectionFactory" type="sca:JMSConnectionFactory"/>
-       			<element name="activationSpec" type="sca:JMSActivationSpec"/>
-
-                <element name="response" type="sca:JMSResponse" minOccurs="0"/>
-                <element name="headers" type="sca:JMSHeaders" minOccurs="0"/>
-                <element name="subscriptionHeaders" type="sca:JMSSubscriptionHeaders" minOccurs="0"/>
-                <element name="resourceAdapter" type="sca:JMSResourceAdapter" minOccurs="0"/>
-                <element name="operationProperties" type="sca:JMSOperationProperties" minOccurs="0" maxOccurs="unbounded"/>
-                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="correlationScheme" type="QName" default="sca:MessageId"/>
-            <attribute name="initialContextFactory" type="anyURI"/>
-            <attribute name="jndiURL" type="anyURI"/>
-            <attribute name="requestConnection" type="QName"/>
-            <attribute name="responseConnection" type="QName"/>
-            <attribute name="operationProperties" type="QName"/>
-            <anyAttribute/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <complexType name="JMSDestination">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="required"/>
-      <attribute name="type" use="optional" default="queue">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="queue"/>
-               <enumeration value="topic"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="create" type="sca:CreateResource" 
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="JMSConnectionFactory">
-      <sequence>          
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="required"/>
-      <attribute name="create" type="sca:CreateResource" 
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="JMSActivationSpec">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="required"/>
-      <attribute name="create" type="sca:CreateResource"
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="JMSResponse">
-      <sequence>
-         <element name="destination" type="sca:JMSDestination" minOccurs="0"/>
-         <choice minOccurs="0"> 
-            <element name="connectionFactory" type="sca:JMSConnectionFactory"/> 
-            <element name="activationSpec" type="sca:JMSActivationSpec"/> 
-         </choice> 
-      </sequence>
-   </complexType>
-
-   <complexType name="JMSHeaders">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="JMSType" type="string"/>
-      <attribute name="JMSDeliveryMode">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="PERSISTENT"/>
-               <enumeration value="NON_PERSISTENT"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="JMSTimeToLive" type="long"/>
-      <attribute name="JMSPriority">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="0"/>
-               <enumeration value="1"/>
-               <enumeration value="2"/>
-               <enumeration value="3"/>
-               <enumeration value="4"/>
-               <enumeration value="5"/>
-               <enumeration value="6"/>
-               <enumeration value="7"/>
-               <enumeration value="8"/>
-               <enumeration value="9"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-   </complexType>
-
-   <complexType name="JMSSubscriptionHeaders"> 
-      <sequence> 
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/> 
-      </sequence> 
-      <attribute name="JMSSelector" type="string"/> 
-   </complexType>
-
-   <complexType name="JMSResourceAdapter">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-   </complexType>
-
-   <complexType name="JMSOperationProperties">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" minOccurs="0" maxOccurs="unbounded"/>
-         <element name="headers" type="sca:JMSHeaders"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-      <attribute name="nativeOperation" type="string"/>
-   </complexType>
-
-   <complexType name="BindingProperty">
-      <simpleContent>
-         <extension base="string">
-            <attribute name="name" type="NMTOKEN"/>
-            <attribute name="type" type="string" use="optional"
-                       default="xs:string"/>
-         </extension>
-      </simpleContent>
-   </complexType>
-
-   <element name="binding.jms" type="sca:JMSBinding" 
-            substitutionGroup="sca:binding"/>
-
-   <element name="wireFormat.jmsdefault" type="sca:WireFormatType" 
-            substitutionGroup="sca:wireFormat"/>
-
-   <element name="operationSelector.jmsdefault" type="sca:OperationSelectorType" 
-            substitutionGroup="sca:operationSelector"/>
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
new file mode 100644
index 0000000000..e16039a0cd
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+        elementFormDefault="qualified">
+
+   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+
+   <complexType name="JMSBinding">
+      <complexContent>
+         <extension base="sca:Binding">
+            <sequence>
+               <element name="destination" type="sca:JMSDestination"
+                        minOccurs="0"/> 
+               <choice minOccurs="0" maxOccurs="1"> 
+                  <element name="connectionFactory" 
+                           type="sca:JMSConnectionFactory"/> 
+                  <element name="activationSpec" type="sca:JMSActivationSpec"/> 
+               </choice>     
+               <element name="response" type="sca:JMSResponse" minOccurs="0"/>
+               <element name="headers" type="sca:JMSHeaders" minOccurs="0"/>
+               <element name="messageSelection" type="sca:JMSMessageSelection"
+                        minOccurs="0"/>
+               <element name="resourceAdapter" type="sca:JMSResourceAdapter" 
+                        minOccurs="0"/>
+               <element name="operationProperties" 
+                        type="sca:JMSOperationProperties" 
+                        minOccurs="0" maxOccurs="unbounded"/>
+               <any namespace="##other" processContents="lax" 
+                    minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="correlationScheme" type="QName"
+                       default="sca:messageId"/>
+            <attribute name="initialContextFactory" type="anyURI"/>
+            <attribute name="jndiURL" type="anyURI"/>
+            <attribute name="requestConnection" type="QName"/>
+            <attribute name="responseConnection" type="QName"/>
+            <attribute name="operationProperties" type="QName"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <simpleType name="JMSCreateResource">
+      <restriction base="string">
+         <enumeration value="always"/>
+         <enumeration value="never"/>
+         <enumeration value="ifNotExist"/>
+      </restriction>
+   </simpleType>
+
+   <complexType name="JMSDestination">
+      <sequence>
+         <element name="property" type="sca:BindingProperty" 
+                  minOccurs="0" maxOccurs="unbounded"/>
+      </sequence>
+      <attribute name="jndiName" type="anyURI" use="required"/>
+      <attribute name="type" use="optional" default="queue">
+         <simpleType>
+            <restriction base="string">
+               <enumeration value="queue"/>
+               <enumeration value="topic"/>
+            </restriction>
+         </simpleType>
+      </attribute>
+      <attribute name="create" type="sca:JMSCreateResource" 
+                 use="optional" default="ifNotExist"/>
+   </complexType>
+
+   <complexType name="JMSConnectionFactory">
+      <sequence>          <element name="property" type="sca:BindingProperty" 
+                  minOccurs="0" maxOccurs="unbounded"/>
+      </sequence>
+      <attribute name="jndiName" type="anyURI" use="required"/>
+      <attribute name="create" type="sca:JMSCreateResource" 
+                 use="optional" default="ifNotExist"/>
+   </complexType>
+
+   <complexType name="JMSActivationSpec">
+      <sequence>
+         <element name="property" type="sca:BindingProperty" 
+                  minOccurs="0" maxOccurs="unbounded"/>
+      </sequence>
+      <attribute name="jndiName" type="anyURI" use="required"/>
+      <attribute name="create" type="sca:JMSCreateResource"
+                 use="optional" default="ifNotExist"/>
+   </complexType>
+
+   <complexType name="JMSResponse">
+      <sequence>
+         <element name="wireFormat" type="sca:WireFormatType" minOccurs="0"/>
+         <element name="destination" type="sca:JMSDestination" minOccurs="0"/>
+         <choice minOccurs="0"> 
+            <element name="connectionFactory" type="sca:JMSConnectionFactory"/> 
+            <element name="activationSpec" type="sca:JMSActivationSpec"/> 
+         </choice> 
+      </sequence>
+   </complexType>
+
+   <complexType name="JMSHeaders">
+      <sequence>
+         <element name="property" type="sca:BindingProperty" 
+                  minOccurs="0" maxOccurs="unbounded"/>
+      </sequence>
+      <attribute name="type" type="string"/>
+      <attribute name="deliveryMode">
+         <simpleType>
+            <restriction base="string">
+               <enumeration value="persistent"/>
+               <enumeration value="nonpersistent"/>
+            </restriction>
+         </simpleType>
+      </attribute>
+      <attribute name="timeToLive" type="long"/>
+      <attribute name="priority">
+         <simpleType>
+            <restriction base="string">
+               <enumeration value="0"/>
+               <enumeration value="1"/>
+               <enumeration value="2"/>
+               <enumeration value="3"/>
+               <enumeration value="4"/>
+               <enumeration value="5"/>
+               <enumeration value="6"/>
+               <enumeration value="7"/>
+               <enumeration value="8"/>
+               <enumeration value="9"/>
+            </restriction>
+         </simpleType>
+      </attribute>
+   </complexType>
+
+   <complexType name="JMSMessageSelection"> 
+      <sequence> 
+         <element name="property" type="sca:BindingProperty" 
+                  minOccurs="0" maxOccurs="unbounded"/> 
+      </sequence> 
+      <attribute name="selector" type="string"/> 
+   </complexType>
+
+   <complexType name="JMSResourceAdapter">
+      <sequence>
+         <element name="property" type="sca:BindingProperty" 
+                  minOccurs="0" maxOccurs="unbounded"/>
+      </sequence>
+      <attribute name="name" type="string" use="required"/>
+   </complexType>
+
+   <complexType name="JMSOperationProperties">
+      <sequence>
+         <element name="property" type="sca:BindingProperty" 
+                  minOccurs="0" maxOccurs="unbounded"/>
+         <element name="headers" type="sca:JMSHeaders"/>
+      </sequence>
+      <attribute name="name" type="string" use="required"/>
+      <attribute name="nativeOperation" type="string"/>
+   </complexType>
+
+   <complexType name="BindingProperty">
+      <simpleContent>
+         <extension base="string">
+            <attribute name="name" type="NMTOKEN"/>
+            <attribute name="type" type="string" use="optional"
+                       default="xs:string"/>
+         </extension>
+      </simpleContent>
+   </complexType>
+
+   <element name="binding.jms" type="sca:JMSBinding" 
+            substitutionGroup="sca:binding"/>
+
+   <element name="wireFormat.jmsDefault" type="sca:WireFormatType" 
+            substitutionGroup="sca:wireFormat"/>
+
+   <element name="operationSelector.jmsDefault" type="sca:OperationSelectorType" 
+            substitutionGroup="sca:operationSelector"/>
+</schema>
\ No newline at end of file
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
deleted file mode 100644
index 7a6d1a903b..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.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/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd03.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/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
new file mode 100644
index 0000000000..897e869806
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.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/200903" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+        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/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
deleted file mode 100644
index bae52390fa..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
+++ /dev/null
@@ -1,36 +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/200903"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"
-    xmlns:wsa="http://www.w3.org/2005/08/addressing"
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.w3.org/ns/wsdl-instance"
-            schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/>
-    <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-cd03.xsd"/>
-
-    <element name="binding.ws" type="sca:WebServiceBinding"
-             substitutionGroup="sca:binding"/>
-
-    <complexType name="WebServiceBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <element name="endpointReference" type="wsa:EndpointReferenceType"
-                             minOccurs="0" maxOccurs="unbounded"/>
-                    <any namespace="##other" processContents="lax"
-                         minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="wsdlElement" type="anyURI" use="optional"/>
-                <attribute ref="wsdli:wsdlLocation" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
new file mode 100644
index 0000000000..24198c943d
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"
+    xmlns:wsa="http://www.w3.org/2005/08/addressing"
+    elementFormDefault="qualified">
+
+    <import namespace="http://www.w3.org/ns/wsdl-instance"
+            schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/>
+    <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"/>
+
+    <element name="binding.ws" type="sca:WebServiceBinding"
+             substitutionGroup="sca:binding"/>
+
+    <complexType name="WebServiceBinding">
+        <complexContent>
+            <extension base="sca:Binding">
+                <sequence>
+                    <element name="endpointReference" type="wsa:EndpointReferenceType"
+                             minOccurs="0" maxOccurs="unbounded"/>
+                    <any namespace="##other" processContents="lax"
+                         minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="wsdlElement" type="anyURI" use="optional"/>
+                <attribute ref="wsdli:wsdlLocation" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
deleted file mode 100644
index 8445749363..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
+++ /dev/null
@@ -1,86 +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/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd03.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/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
new file mode 100644
index 0000000000..f13fbd1567
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.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/200903" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   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/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
deleted file mode 100644
index 4397834520..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
+++ /dev/null
@@ -1,35 +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/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-contribution-1.1-cd03.xsd" />
-
-	<element name="export.c" type="sca:CExport"
-		substitutionGroup="sca:exportBase" />
-
-	<complexType name="CExport">
-		<complexContent>
-			<extension base="sca:Export">
-				<attribute name="name" type="QName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<element name="import.c" type="sca:CImport"
-		substitutionGroup="sca:importBase" />
-
-	<complexType name="CImport">
-		<complexContent>
-			<extension base="sca:Import">
-				<attribute name="name" type="QName" use="required" />
-				<attribute name="location" type="string" use="required" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
new file mode 100644
index 0000000000..7e2cd739fd
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
@@ -0,0 +1,35 @@
+<?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/200903"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	elementFormDefault="qualified">
+
+	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
+
+	<element name="export.c" type="sca:CExport"
+		substitutionGroup="sca:exportBase" />
+
+	<complexType name="CExport">
+		<complexContent>
+			<extension base="sca:Export">
+				<attribute name="name" type="QName" use="required" />
+				<attribute name="path" type="string" use="optional" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<element name="import.c" type="sca:CImport"
+		substitutionGroup="sca:importBase" />
+
+	<complexType name="CImport">
+		<complexContent>
+			<extension base="sca:Import">
+				<attribute name="name" type="QName" use="required" />
+				<attribute name="location" type="string" use="required" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
deleted file mode 100644
index 2271b780ee..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
+++ /dev/null
@@ -1,35 +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/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-contribution-1.1-cd03.xsd" />
-
-	<element name="export.cpp" type="sca:CPPExport"
-		substitutionGroup="sca:exportBase" />
-
-	<complexType name="CPPExport">
-		<complexContent>
-			<extension base="sca:Export">
-				<attribute name="name" type="QName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<element name="import.cpp" type="sca:CPPImport"
-		substitutionGroup="sca:importBase" />
-
-	<complexType name="CPPImport">
-		<complexContent>
-			<extension base="sca:Import">
-				<attribute name="name" type="QName" use="required" />
-				<attribute name="location" type="string" use="required" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-</schema>
\ No newline at end of file
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
new file mode 100644
index 0000000000..b808125568
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
@@ -0,0 +1,35 @@
+<?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/200903"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	elementFormDefault="qualified">
+
+	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
+
+	<element name="export.cpp" type="sca:CPPExport"
+		substitutionGroup="sca:exportBase" />
+
+	<complexType name="CPPExport">
+		<complexContent>
+			<extension base="sca:Export">
+				<attribute name="name" type="QName" use="required" />
+				<attribute name="path" type="string" use="optional" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<element name="import.cpp" type="sca:CPPImport"
+		substitutionGroup="sca:importBase" />
+
+	<complexType name="CPPImport">
+		<complexContent>
+			<extension base="sca:Import">
+				<attribute name="name" type="QName" use="required" />
+				<attribute name="location" type="string" use="required" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+</schema>
\ No newline at end of file
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
deleted file mode 100644
index a5e0c87b22..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
+++ /dev/null
@@ -1,33 +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/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-contribution-1.1-cd03.xsd"/>
-
-   <!-- Import.java -->   
-   <element name="import.java" type="sca:JavaImportType"
-      substitutionGroup="sca:importBase" />
-   <complexType name="JavaImportType">
-      <complexContent>
-         <extension base="sca:Import">
-            <attribute name="package" type="NCName" use="required"/>
-            <attribute name="location" type="anyURI" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Export.java -->
-   <element name="export.java" type="sca:JavaExportType"
-      substitutionGroup="sca:exportBase" />
-   <complexType name="JavaExportType">
-      <complexContent>
-         <extension base="sca:Export">
-            <attribute name="package" type="NCName" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
new file mode 100644
index 0000000000..1dcd515c98
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   elementFormDefault="qualified">
+
+   <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
+
+   <!-- Import.java -->   
+   <element name="import.java" type="sca:JavaImportType"
+      substitutionGroup="sca:importBase" />
+   <complexType name="JavaImportType">
+      <complexContent>
+         <extension base="sca:Import">
+            <attribute name="package" type="NCName" use="required"/>
+            <attribute name="location" type="anyURI" use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   
+   <!-- Export.java -->
+   <element name="export.java" type="sca:JavaExportType"
+      substitutionGroup="sca:exportBase" />
+   <complexType name="JavaExportType">
+      <complexContent>
+         <extension base="sca:Export">
+            <attribute name="package" type="NCName" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
index f9b02766cb..1e781c798e 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
@@ -54,7 +54,7 @@
       <complexContent>
          <extension base="sca:CommonExtensionBase">
             <sequence>
-               <element name="include" type="anyURI" minOccurs="0" 
+               <element ref="sca:include" minOccurs="0" 
                         maxOccurs="unbounded"/>
                <choice minOccurs="0" maxOccurs="unbounded">
                   <element name="service" type="sca:Service"/>
@@ -145,7 +145,8 @@
    <!-- Property -->
    <complexType name="SCAPropertyBase" mixed="true">
       <sequence>
-         <any namespace="##any" processContents="lax" minOccurs="0"/>
+         <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" -->
@@ -481,7 +482,17 @@
         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">
@@ -507,5 +518,12 @@
    <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/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
deleted file mode 100644
index 0feadcddcd..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.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/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd02.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/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
new file mode 100644
index 0000000000..2034e4d2c8
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   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/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
deleted file mode 100644
index 3c19424a83..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.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 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   xmlns="http://www.w3.org/2001/XMLSchema"
-   elementFormDefault="qualified">
-
-   <!-- SCA-Assembly XML Schema -->
-   <include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-   <!-- SCA-BPEL Component Implementation Type -->
-   <element name="implementation.bpel" 
-      type="sca:BPELImplementation" substitutionGroup="sca:implementation" />
-
-   <complexType name="BPELImplementation">
-      <complexContent>
-         <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax"
-                  minOccurs="0" maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="process" type="QName" use="required" />
-            <anyAttribute namespace="##any" processContents="lax" />
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
index 6d0e417787..11239e20d0 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
+++ b/java/sca/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-cd03.xsd" />
+   <include schemaLocation="sca-core-1.1-cd04.xsd" />
 
    <!-- SCA-BPEL Component Implementation Type -->
    <element name="implementation.bpel" 
@@ -29,3 +29,4 @@
    </complexType>
 
 </schema>
+ 
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
deleted file mode 100644
index 11e191f0ed..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
+++ /dev/null
@@ -1,57 +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/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-	<element name="implementation.c" type="sca:CImplementation"
-		substitutionGroup="sca:implementation" />
-
-	<complexType name="CImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<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="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">
-		<attribute name="name" type="NCName" use="required" />
-		<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" />
-	</complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
new file mode 100644
index 0000000000..011c7a61ea
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
@@ -0,0 +1,57 @@
+<?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/200903"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	elementFormDefault="qualified">
+
+	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+
+	<element name="implementation.c" type="sca:CImplementation"
+		substitutionGroup="sca:implementation" />
+
+	<complexType name="CImplementation">
+		<complexContent>
+			<extension base="sca:Implementation">
+				<sequence>
+					<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="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">
+		<attribute name="name" type="NCName" use="required" />
+		<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" />
+	</complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
deleted file mode 100644
index 050f456386..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.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/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd03.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/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.xsd
new file mode 100644
index 0000000000..e0524ee006
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd04.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/200903" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   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/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
deleted file mode 100644
index 771186a91d..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
+++ /dev/null
@@ -1,54 +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/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-	<element name="implementation.cpp" type="sca:CPPImplementation"
-		substitutionGroup="sca:implementation" />
-	<complexType name="CPPImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<element name="function"
-						type="sca:CPPImplementationFunction" minOccurs="0"
-						maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="library" type="NCName" use="required" />
-				<attribute name="header" type="NCName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-				<attribute name="class" type="Name" use="optional" />
-				<attribute name="componentType" type="string"
-					use="optional" />
-				<attribute name="scope"
-					type="sca:CPPImplementationScope" use="optional" />
-				<attribute name="eagerInit" type="boolean"
-					use="optional" />
-				<attribute name="allowsPassByReference" type="boolean"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<simpleType name="CPPImplementationScope">
-		<restriction base="string">
-			<enumeration value="stateless" />
-			<enumeration value="composite" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="CPPImplementationFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="allowsPassByReference" type="boolean"
-			use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
new file mode 100644
index 0000000000..777da1e8ab
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
@@ -0,0 +1,54 @@
+<?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/200903"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	elementFormDefault="qualified">
+
+	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+
+	<element name="implementation.cpp" type="sca:CPPImplementation"
+		substitutionGroup="sca:implementation" />
+	<complexType name="CPPImplementation">
+		<complexContent>
+			<extension base="sca:Implementation">
+				<sequence>
+					<element name="function"
+						type="sca:CPPImplementationFunction" minOccurs="0"
+						maxOccurs="unbounded" />
+					<any namespace="##other" processContents="lax"
+						minOccurs="0" maxOccurs="unbounded" />
+				</sequence>
+				<attribute name="library" type="NCName" use="required" />
+				<attribute name="header" type="NCName" use="required" />
+				<attribute name="path" type="string" use="optional" />
+				<attribute name="class" type="Name" use="optional" />
+				<attribute name="componentType" type="string"
+					use="optional" />
+				<attribute name="scope"
+					type="sca:CPPImplementationScope" use="optional" />
+				<attribute name="eagerInit" type="boolean"
+					use="optional" />
+				<attribute name="allowsPassByReference" type="boolean"
+					use="optional" />
+				<anyAttribute namespace="##other" processContents="lax" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<simpleType name="CPPImplementationScope">
+		<restriction base="string">
+			<enumeration value="stateless" />
+			<enumeration value="composite" />
+		</restriction>
+	</simpleType>
+
+	<complexType name="CPPImplementationFunction">
+		<attribute name="name" type="NCName" use="required" />
+		<attribute name="allowsPassByReference" type="boolean"
+			use="optional" />
+		<anyAttribute namespace="##other" processContents="lax" />
+	</complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
deleted file mode 100644
index 52c92e8259..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.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/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd03.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="##any" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
index 861778b6e3..53f6a0a51a 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd03.xsd
@@ -6,7 +6,7 @@
    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
    elementFormDefault="qualified">
    
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
 
    <!-- Java Implementation -->
    <element name="implementation.java" type="sca:JavaImplementation" 
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
new file mode 100644
index 0000000000..51327ec84e
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"  
+  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+  elementFormDefault="qualified"
+  targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">  
+	
+	<include schemaLocation="sca-core-1.1-cd04.xsd"/>
+	<element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/>
+	<complexType name="SpringImplementation">
+		<complexContent>
+			<extension base="sca:Implementation">
+				<sequence>
+					<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute name="location" type="anyURI" use="required"/>
+			</extension>
+		</complexContent>
+	</complexType>
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd
deleted file mode 100644
index 9c42063977..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd
+++ /dev/null
@@ -1,22 +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/200903"
-  elementFormDefault="qualified"
-  targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">  
-	
-	<include schemaLocation="sca-core-1.1-cd03.xsd"/>
-	<element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/>
-	<complexType name="SpringImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="location" type="anyURI" use="required"/>
-				<anyAttribute namespace="##any" processContents="lax"/>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
deleted file mode 100644
index f2c7d2034f..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
+++ /dev/null
@@ -1,41 +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/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-	<element name="interface.c" type="sca:CInterface"
-		substitutionGroup="sca:interface" />
-
-	<complexType name="CInterface">
-		<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"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="header" type="string" use="required" />
-				<attribute name="callbackHeader" type="string"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="CFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="oneWay" type="boolean" use="optional" />
-		<attribute name="input" type="NCName" use="optional" />
-		<attribute name="output" type="NCName" use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
new file mode 100644
index 0000000000..045118cb43
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
@@ -0,0 +1,43 @@
+<?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/200903"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	elementFormDefault="qualified">
+
+	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+
+	<element name="interface.c" type="sca:CInterface"
+		substitutionGroup="sca:interface" />
+
+	<complexType name="CInterface">
+		<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"
+						minOccurs="0" maxOccurs="unbounded" />
+				</sequence>
+				<attribute name="header" type="string" use="required" />
+				<attribute name="callbackHeader" type="string"
+					use="optional" />
+				<anyAttribute namespace="##other" processContents="lax" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<complexType name="CFunction">
+		<attribute name="name" type="NCName" use="required" />
+		<attribute name="requires" type="sca:listOfQNames"
+			use="optional" />
+		<attribute name="oneWay" type="boolean" use="optional" />
+		<attribute name="input" type="NCName" use="optional" />
+		<attribute name="output" type="NCName" use="optional" />
+		<anyAttribute namespace="##other" processContents="lax" />
+	</complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
deleted file mode 100644
index c214f7c37b..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
+++ /dev/null
@@ -1,42 +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/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.xsd" />
-
-	<element name="interface.cpp" type="sca:CPPInterface"
-		substitutionGroup="sca:interface" />
-
-	<complexType name="CPPInterface">
-		<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"
-						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" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="CPPFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="oneWay" type="boolean" use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
new file mode 100644
index 0000000000..536b592c04
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
@@ -0,0 +1,44 @@
+<?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/200903"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	elementFormDefault="qualified">
+
+	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+
+	<element name="interface.cpp" type="sca:CPPInterface"
+		substitutionGroup="sca:interface" />
+
+	<complexType name="CPPInterface">
+		<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"
+						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" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<complexType name="CPPFunction">
+		<attribute name="name" type="NCName" use="required" />
+		<attribute name="requires" type="sca:listOfQNames"
+			use="optional" />
+		<attribute name="oneWay" type="boolean" use="optional" />
+		<anyAttribute namespace="##other" processContents="lax" />
+	</complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
deleted file mode 100644
index e5c1ea5448..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.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/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
-   
-   <!-- Java Interface -->
-   <element name="interface.java" type="sca:JavaInterface" 
-            substitutionGroup="sca:interface"/>
-   <complexType name="JavaInterface">
-      <complexContent>
-         <extension base="sca:Interface">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="interface" type="NCName" use="required"/>
-            <attribute name="callbackInterface" type="NCName" 
-                       use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
new file mode 100644
index 0000000000..faf6d1cfb1
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   elementFormDefault="qualified">
+   
+   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   
+   <!-- Java Interface -->
+   <element name="interface.java" type="sca:JavaInterface" 
+            substitutionGroup="sca:interface"/>
+   <complexType name="JavaInterface">
+      <complexContent>
+         <extension base="sca:Interface">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="interface" type="NCName" use="required"/>
+            <attribute name="callbackInterface" type="NCName" 
+                       use="optional"/>
+            <anyAttribute namespace="##other" processContents="lax"/>
+         </extension>
+      </complexContent>
+   </complexType>
+   
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
deleted file mode 100644
index f3abba888e..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.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/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd03.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="##any" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
index b8b967d890..980e4f90f5 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd04.xsd
@@ -6,7 +6,7 @@
    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
    elementFormDefault="qualified">
    
-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
    
    <!-- WSDL Interface -->
    <element name="interface.wsdl" type="sca:WSDLPortType" 
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
deleted file mode 100644
index b3de95509e..0000000000
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
+++ /dev/null
@@ -1,105 +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/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd03.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="##any" 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="required"/>
-		<attribute name="attachTo" type="string" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<element name="policySetAttachment" 
-	   type="sca:PolicySetAttachment"/>
-	<complexType name="PolicySetAttachment">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="PolicySetReference">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##any" 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="##any" processContents="lax"/>
-	</complexType>
-
-	<complexType name="Qualifier">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="string" use="required"/>
-		<anyAttribute namespace="##any" 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>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
new file mode 100644
index 0000000000..a6cdfb2be5
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
@@ -0,0 +1,101 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	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/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
index bb3ad00cd7..de7bc6bdd0 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
+++ b/java/sca/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/200903" schemaLocation="sca-1.1-cd03.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.dwr" type="t:DWRBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
index 32f2a51276..ce8d47b575 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ b/java/sca/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/200903" schemaLocation="sca-1.1-cd03.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.http" type="t:HTTPBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
index 68dea85a12..92142d117d 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/java/sca/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/200903" schemaLocation="sca-1.1-cd03.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
index fadf94fffe..9b15010624 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
+++ b/java/sca/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/200903" schemaLocation="sca-1.1-cd03.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.rmi" type="t:RMIBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
index 4fd2bd0b06..0e29a09e72 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/java/sca/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/200903" schemaLocation="sca-1.1-cd03.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="implementation.osgi" type="t:OSGiImplementation"/>
 
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index d36fff3ca1..7a8f45954f 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/java/sca/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/200903" schemaLocation="sca-1.1-cd03.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
-- 
cgit v1.2.3