TUSCANY-3388 - Updating to the latests OASIS schema

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

250 files changed, 419 insertions, 419 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 23399a7105..45aef2230a 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface Constants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
     
     String COMPONENT_TYPE = "componentType";
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
index 8ac0de9617..6d6594d735 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
@@ -49,7 +49,7 @@ public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding> {
     private static final String NAME = "name";
     private static final String URI = "uri";
 
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     private static final String BINDING_SCA = "binding.sca";
     private static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA);
 
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
index d28d51a956..d5018f6da9 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
@@ -61,7 +61,7 @@ public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements S
     private StAXArtifactProcessor<Object> extensionProcessor;
     private DefinitionsFactory definitionsFactory;
 
-    public static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    public static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     public static final String BINDING = "binding";
     public static final String IMPLEMENTATION = "implementation";
     public static final String DEFINITIONS = "definitions";
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 979dad3c8b..69c5a11e9b 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
 public interface PolicyConstants {
     String WHITE_SPACE = " ";
     String COLON = ":";
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
     String INTENT = "intent";
     String POLICY_SET = "policySet";
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
index bbbbc93255..aee8f121b5 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
-<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912">
                  
 	<!-- Security related intents -->                 
         <sca:intent name="serverAuthentication" constrains="sca:binding"
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7826aa0eea..7982dc123c 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,14 +16,14 @@
 # under the License.

 

 # Implementation class for the artifact processor extension

-org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#componentType,model=org.apache.tuscany.sca.assembly.ComponentType

-org.apache.tuscany.sca.assembly.xml.CompositeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#composite,model=org.apache.tuscany.sca.assembly.Composite

-org.apache.tuscany.sca.assembly.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding

+org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#componentType,model=org.apache.tuscany.sca.assembly.ComponentType

+org.apache.tuscany.sca.assembly.xml.CompositeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#composite,model=org.apache.tuscany.sca.assembly.Composite

+org.apache.tuscany.sca.assembly.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding

 org.apache.tuscany.sca.assembly.xml.EndpointProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#endpoint,model=org.apache.tuscany.sca.assembly.Endpoint

 org.apache.tuscany.sca.assembly.xml.EndpointReferenceProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#endpointReference,model=org.apache.tuscany.sca.assembly.EndpointReference

-org.apache.tuscany.sca.definitions.xml.DefinitionsProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#definitions,model=org.apache.tuscany.sca.definitions.Definitions

-org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#bindingType,model=org.apache.tuscany.sca.policy.BindingType

-org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementationType,model=org.apache.tuscany.sca.policy.ImplementationType

-org.apache.tuscany.sca.policy.xml.IntentProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#intent,model=org.apache.tuscany.sca.policy.Intent

-org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#policySet,model=org.apache.tuscany.sca.policy.PolicySet

+org.apache.tuscany.sca.definitions.xml.DefinitionsProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#definitions,model=org.apache.tuscany.sca.definitions.Definitions

+org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#bindingType,model=org.apache.tuscany.sca.policy.BindingType

+org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#implementationType,model=org.apache.tuscany.sca.policy.ImplementationType

+org.apache.tuscany.sca.policy.xml.IntentProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#intent,model=org.apache.tuscany.sca.policy.Intent

+org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#policySet,model=org.apache.tuscany.sca.policy.PolicySet

 

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
index 9646356eb7..28a2bb6851 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
@@ -47,7 +47,7 @@ import org.junit.Test;
 public class ReadWriteAnyAttributeTestCase {
 
     private static final String XML = "<?xml version='1.0' encoding='UTF-8'?>"+
-		 	 "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" " +
+		 	 "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" " +
 		 	            "targetNamespace=\"http://calc\" " +
 		 	            "name=\"Calculator\">"+
  	 	 	    "<component name=\"AddServiceComponent\" xmlns:test=\"http://test\" test:customAttribute=\"customValue\">"+
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
index 42730415b3..7a36c1d97d 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
@@ -43,7 +43,7 @@ import org.junit.Test;
 public class ReadWriteAnyElementTestCase {
     private static final String XML_RECURSIVE_EXTENDED_ELEMENT =
         "<?xml version='1.0' encoding='UTF-8'?>" +
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://temp\" name=\"RecursiveExtendedElement\">" +
+        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://temp\" name=\"RecursiveExtendedElement\">" +
          "<unknownElement>" +
            "<subUnknownElement1 attribute=\"anyAttribute\" />" +
            "<subUnknownElement2 />" +
@@ -52,7 +52,7 @@ public class ReadWriteAnyElementTestCase {
 
     private static final String XML_UNKNOWN_IMPL =
         "<?xml version='1.0' encoding='UTF-8'?>" + 
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
+        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
          "<component name=\"unknownImpl\">" +
            "<implementation.unknown class=\"raymond\" />" +
            "<service name=\"service\">" +
@@ -63,7 +63,7 @@ public class ReadWriteAnyElementTestCase {
 
     private static final String XML_UNKNOWN_IMPL_WITH_INVALID_ATTRIBUTE =
         "<?xml version='1.0' encoding='UTF-8'?>" + 
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
+        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
          "<component name=\"unknownImpl\">" +
            "<implementation.unknown class=\"raymond\" />" +
            "<service name=\"service\" requires=\"\">" +
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index 7787361e62..fc675dcdce 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
@@ -54,7 +54,7 @@ public class ReadWriteLocalCompositeTestCase {
     private ProcessorContext context;
     
     private static final String LOCAL_COMPOSITE_XML = "<?xml version='1.0' encoding='UTF-8'?>"+
-    "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://localcalc\" name=\"LocalCalculator\" local=\"true\">"+
+    "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://localcalc\" name=\"LocalCalculator\" local=\"true\">"+
     "</composite>";
     
     @Before
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index 827994f1f6..20c11e82ee 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
@@ -161,7 +161,7 @@ public class TestSCABindingImpl implements SCABinding, OptimizableBinding, Polic
     }
 
     private class TestSCABindingType implements ExtensionType {
-        private QName name = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903","binding");
+        private QName name = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912","binding");
         public QName getBaseType() {
             return BINDING_BASE;
         }
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
index b1720ea8e6..f99b81f73f 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
@@ -62,7 +62,7 @@ public class ReadDocumentTestCase {
     private static Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
     private static Map<QName, BindingType> bindingTypesTable = new Hashtable<QName, BindingType>();
     private static Map<QName, ImplementationType> implTypesTable = new Hashtable<QName, ImplementationType>();
-    public static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    public static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     public static final String namespace = "http://test";
 
     private static final QName secureWsPolicy = new QName(namespace, "SecureWSPolicy");
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
index f0bd5d8bde..4f8c608459 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
@@ -107,7 +107,7 @@ public class PolicyXPathFunctionResolverTestCase {
 
     private static class NamespaceContextImpl implements NamespaceContext {
 
-        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
 
         public String getNamespaceURI(String prefix) {
             if ("sca".equals(prefix)) {
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index c39dede56d..231bdfd516 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
@@ -66,13 +66,13 @@ public class ReadDocumentTestCase {
     private ProcessorContext context;
     
     private static final QName elementToProcess =
-        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "implementationType");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "implementationType");
 
     private Map<QName, Intent> intentTable = new Hashtable<QName, Intent>();
     private Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
     private Map<QName, BindingType> bindingTypesTable = new Hashtable<QName, BindingType>();
     private Map<QName, ImplementationType> implTypesTable = new Hashtable<QName, ImplementationType>();
-    private static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     private static final String namespace = "http://test";
 
     private static final QName confidentiality = new QName(namespace, "confidentiality");
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 961a40b841..be0c1eb737 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 	xmlns:x="http://x"

 	xmlns:calc="http://calc"
 	targetNamespace="http://calc"

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 2f4518a42c..83fa64cef4 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
   <service name="CalculatorService">
         <interface.java interface="calculator.CalculatorService" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index 0d73d1a189..0d344ac937 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://temp" 
            name="composite1"> 
   <component name="data7"> 
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index bf3676c585..5606e653bb 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 	xmlns:calc="http://calc"
 	targetNamespace="http://calc"

 	name="Calculator">

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 9f40faa806..9140403fc4 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	       targetNamespace="http://helloWorldRMI"
            name="HelloWorldRmiComposite">
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 807e256fc5..195dfcf106 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
@@ -20,9 +20,9 @@
 

 <composite autowire="false" local="true" name="TestAllCalculator" policySets="sns:SecureReliablePolicy"

     requires="cns:confidentiality" targetNamespace="http://calc" xmlns:tns="http://calc"

-    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

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

-    xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200903 http://docs.oasis-open.org/ns/opencsa/sca/200903 "
+    xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912 "
     xmlns:ext="http://extension"

     xmlns:cns="http://test" xmlns:sns="http://test">

 

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 8ca71a0580..42e6c1c3ec 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
@@ -23,10 +23,10 @@
 	policySets="" requires=""
 	targetNamespace="http://calc"
 	xmlns:tns="http://calc"
-	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200903 http://docs.oasis-open.org/ns/opencsa/sca/200903 ">
+	xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912 ">
 	
     <!-- 
   <include name="tns:CompleteDivide"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 5c7e4435bb..424cec3e8a 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
@@ -20,9 +20,9 @@
 

 <composite autowire="false" local="true" name="TestAllCalculator" 

     requires="cns:tuscanyIntent_1" targetNamespace="http://calc" xmlns:tns="http://calc"

-    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

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

-    xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200903 http://docs.oasis-open.org/ns/opencsa/sca/200903 "
+    xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912 "
     xmlns:ext="http://extension"

     xmlns:cns="http://test" xmlns:sns="http://test">

 

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index 22c01b887a..489d6abed1 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
@@ -19,7 +19,7 @@
 -->
 <sca:definitions xmlns="http://test"
  			targetNamespace="http://test"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
 <!-- simple intent -->
  <sca:intent name="tuscanyIntent_1" 
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 4949cd017f..279f7d534e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:calc="http://localcalc"
 	xmlns:test="http://testlocal"
 	targetNamespace="http://localcalc"
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index 4325309463..2cfbd6bcff 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://test"
-    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://test"
+    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
     <!-- Extension Types Metadata -->
     <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />
@@ -38,7 +38,7 @@
     </intent>
 
     <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for
                  "basic authentication" -->
@@ -51,7 +51,7 @@
 
     <!-- POLICY SETS -->
     <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for
                  "basic authentication" -->
@@ -63,7 +63,7 @@
     </policySet>
 
     <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="transport">
                 <wsp:PolicyAttachment>
@@ -80,7 +80,7 @@
     </policySet>
 
     <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="message">
                 <wsp:PolicyAttachment>
@@ -99,13 +99,13 @@
     </policySet>
 
     <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
         <policySetReference name="test:AuthenticationPolicies" />
         <policySetReference name="test:ConfidentialityPolicies" />
     </policySet>
 
     <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for "basic
         authentication" -->
@@ -113,7 +113,7 @@
     </policySet>
 
     <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="transport">
                 <wsp:PolicyAttachment>
@@ -133,7 +133,7 @@
     </policySet>
 
     <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
         xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:Policy>
             <wsp:ExactlyOne>
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
index dac8e384e3..dc7f5c422c 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://test"
-    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://test"
+    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
     <!-- Extension Types Metadata -->
     <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />
@@ -39,7 +39,7 @@
 
     <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
         attachTo = "//sca:component[@name='CalculatorServiceComponent']/sca:reference[@name='addService']"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for
                  "basic authentication" -->
@@ -52,7 +52,7 @@
 
     <!-- POLICY SETS -->
     <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for
                  "basic authentication" -->
@@ -64,7 +64,7 @@
     </policySet>
 
     <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="transport">
                 <wsp:PolicyAttachment>
@@ -81,7 +81,7 @@
     </policySet>
 
     <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="message">
                 <wsp:PolicyAttachment>
@@ -100,13 +100,13 @@
     </policySet>
 
     <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
         <policySetReference name="test:AuthenticationPolicies" />
         <policySetReference name="test:ConfidentialityPolicies" />
     </policySet>
 
     <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for "basic
         authentication" -->
@@ -114,7 +114,7 @@
     </policySet>
 
     <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="transport">
                 <wsp:PolicyAttachment>
@@ -134,7 +134,7 @@
     </policySet>
 
     <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
         xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:Policy>
             <wsp:ExactlyOne>
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
index d6082a936d..0e7aad877e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index b4857c499f..a262b00345 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://test"
-    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://test"
+    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
     <!-- Extension Types Metadata -->
     <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />
@@ -39,7 +39,7 @@
 
     <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
         attachTo = "//sca:component[@name='CalculatorServiceComponent']/sca:reference[@name='addService']"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for
                  "basic authentication" -->
@@ -52,7 +52,7 @@
 
     <!-- POLICY SETS -->
     <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for
                  "basic authentication" -->
@@ -64,7 +64,7 @@
     </policySet>
 
     <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="transport">
                 <wsp:PolicyAttachment>
@@ -81,7 +81,7 @@
     </policySet>
 
     <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="message">
                 <wsp:PolicyAttachment>
@@ -97,13 +97,13 @@
     </policySet>
 
     <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
         <policySetReference name="test:AuthenticationPolicies" />
         <policySetReference name="test:ConfidentialityPolicies" />
     </policySet>
 
     <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for "basic
         authentication" -->
@@ -111,7 +111,7 @@
     </policySet>
 
     <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="transport">
                 <wsp:PolicyAttachment>
@@ -131,7 +131,7 @@
     </policySet>
 
     <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
         xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:Policy>
             <wsp:ExactlyOne>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
index b59cce55ab..9d5a149ad4 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
@@ -31,7 +31,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface Constants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
     
     String COMPONENT_TYPE = "componentType";
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
index b5fc21e9c0..224c1254b3 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
    
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
index bcb9539c40..b8556f3632 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark,
 		IPR and other policies apply. -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 	
 	<include schemaLocation="sca-core-1.1-cd04.xsd" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
index 7f9baac45c..5fd3f9d687 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
         elementFormDefault="qualified">
         
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
index b7f58705cd..e1838dddf0 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
         elementFormDefault="qualified">
 
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
index 897e869806..d607d8730f 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
         elementFormDefault="qualified">
 
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
index 24198c943d..8e5a72b493 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"
     xmlns:wsa="http://www.w3.org/2005/08/addressing"
     elementFormDefault="qualified">
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
index 4bc2e73d4c..874e36bab8 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
@@ -3,7 +3,7 @@
      OASIS trademark, IPR and other policies apply -->
 
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     elementFormDefault="qualified">
 
     <element name="WSCallback">
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
index f13fbd1567..f17675a8b1 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
index 7e2cd739fd..f765eaae85 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
 	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
index b808125568..f98c6dc040 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
 	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
index a361fac8fe..7bad3bfc2a 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
    <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
index 74cfe9a739..158daff214 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
    <import namespace="http://www.w3.org/XML/1998/namespace" 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
index 2034e4d2c8..ef22e1dd3e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
index 11239e20d0..0d5b747253 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 

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

 <schema 

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

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

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

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

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

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

    elementFormDefault="qualified">

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

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

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

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

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

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

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

    elementFormDefault="qualified">

 

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

diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
index f803c354cd..372e8c24b3 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
 	elementFormDefault="qualified">
 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
index de7bc6bdd0..a41087d6ec 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.dwr" type="t:DWRBinding"/>
     
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
index ce8d47b575..ff0ecd1414 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.http" type="t:HTTPBinding"/>
     
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
index 92142d117d..2fb4587862 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
     
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
index 9b15010624..a3477c4a34 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="binding.rmi" type="t:RMIBinding"/>
     
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
index dfe819d97f..ab445dfe9e 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="implementation.osgi" type="t:OSGiImplementation" substitutionGroup="sca:implementation"/>
 
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
index 37f1fdc6d9..21d6fa377d 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <element name="implementation.widget" type="t:WidgetImplementation" substitutionGroup="sca:implementation"/>
     	
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index 54c305f756..4a1a1e000d 100644
--- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
@@ -23,7 +23,7 @@
 <!--
     <import namespace="http://www.w3.org/ns/wsdl-instance" schemaLocation="wsdli.xsd"/>
 -->
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
 
     <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 96dc906395..4125f09b16 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
@@ -24,7 +24,7 @@ package org.apache.tuscany.sca.assembly;
  * @version $Rev$ $Date$
  */
 public interface Base {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
 
     /**
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
index e7a93c8907..bc24b2afbb 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
@@ -27,8 +27,8 @@ import javax.xml.namespace.QName;
  * Definition of extension type: binding or implementation
  */
 public interface ExtensionType {
-    QName BINDING_BASE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "binding");
-    QName IMPLEMENTATION_BASE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "implementation");
+    QName BINDING_BASE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "binding");
+    QName IMPLEMENTATION_BASE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "implementation");
 
     /**
      * The name of the extension type (binding or implementation). The extension type name 
diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index fa80fc0a39..43d8a7feda 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	   targetNamespace="http://customer"
 	   name="Consumer">
diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index c029cef2fb..819e19a801 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

 	   targetNamespace = "http://customer"
 	   name="Provider">

diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
index a50a876ac4..580e0ac324 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

 	   targetNamespace = "http://customer"
 	   name="ProviderNonCollection">

diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
index 090336bc5d..bac14b5b8b 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

 	   targetNamespace = "http://receipt"
 	   name="ReceiptProvider">

diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
index 35e25957fb..63085b3ea6 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	targetNamespace="http://aggregator"
     name="FeedAggregator">
diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
index 49d98f83cf..bc74509dc5 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	targetNamespace="http://news"
     name="newsService">
diff --git a/sca-java-2.x/trunk/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/sca-java-2.x/trunk/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
index 6b8ff10d1a..bc71b89b77 100644
--- a/sca-java-2.x/trunk/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
@@ -41,7 +41,7 @@ public class AtomBindingProcessorTestCase extends TestCase {
     
     private static final String COMPOSITE =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\" targetNamespace=\"http://binding-atom\" name=\"binding-atom\">"
+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\" targetNamespace=\"http://binding-atom\" name=\"binding-atom\">"
             + " <component name=\"HelloWorldComponent\">"
             + "   <implementation.java class=\"services.HelloWorld\"/>"
             + "      <service name=\"HelloWorldService\">"
diff --git a/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/resources/account/account.composite
index 943f82c0ed..f308daa32d 100644
--- a/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/resources/account/account.composite
+++ b/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/resources/account/account.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            name="account">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 70d2398d71..82edd9a61b 100644
--- a/sca-java-2.x/trunk/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 

 

 # Implementation class for the artifact processor extension

-org.apache.tuscany.sca.binding.ejb.impl.EJBBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.ejb,model=org.apache.tuscany.sca.binding.ejb.EJBBinding

+org.apache.tuscany.sca.binding.ejb.impl.EJBBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#binding.ejb,model=org.apache.tuscany.sca.binding.ejb.EJBBinding

 

diff --git a/sca-java-2.x/trunk/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml b/sca-java-2.x/trunk/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml
index 1d55a38a2f..965e127d04 100644
--- a/sca-java-2.x/trunk/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml
@@ -20,9 +20,9 @@
 
 <!-- $Rev$ $Date$ -->
 
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
             
     <sca:bindingType type="sca:binding.ejb" mayProvide="" alwaysProvides=""/>
diff --git a/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/resources/test.composite b/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/resources/test.composite
index 1fb8fce37e..e3525f4afd 100644
--- a/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/resources/test.composite
+++ b/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/resources/test.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	targetNamespace="http://sample/test"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	xmlns:sr="http://sample/test"
diff --git a/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/resources/testCache.composite b/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/resources/testCache.composite
index 277556dab4..4923cfa74d 100644
--- a/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/resources/testCache.composite
+++ b/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/resources/testCache.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	targetNamespace="http://sample/test"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	xmlns:sr="http://sample/test"
diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6d0e20d06c..3e6b2d887a 100644
--- a/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,7 +16,7 @@
 # under the License. 

 

 # Implementation class for the artifact processor extension

-org.apache.tuscany.sca.binding.jms.JMSBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.jms,model=org.apache.tuscany.sca.binding.jms.JMSBinding

+org.apache.tuscany.sca.binding.jms.JMSBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#binding.jms,model=org.apache.tuscany.sca.binding.jms.JMSBinding

 org.apache.tuscany.sca.binding.jms.wireformat.WireFormatJMSDefaultProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#wireFormat.jmsdefault,model=org.apache.tuscany.sca.binding.jms.wireformat.WireFormatJMSDefault

 org.apache.tuscany.sca.binding.jms.wireformat.WireFormatJMSTextXMLProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#wireFormat.jmsTextXML,model=org.apache.tuscany.sca.binding.jms.wireformat.WireFormatJMSTextXML

 org.apache.tuscany.sca.binding.jms.wireformat.WireFormatJMSBytesProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#wireFormat.jmsBytes,model=org.apache.tuscany.sca.binding.jms.wireformat.WireFormatJMSBytes

diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java b/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
index dd30d5ee6b..40e40c7326 100644
--- a/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
@@ -49,7 +49,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     // consider adding a similar test case to JMSBindingProcessorWriteTestCase.

     public static final String COMPOSITE =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -60,7 +60,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String HEADERS1 =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -74,7 +74,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     

     public static final String HEADERS_INVALID_PRIORITY =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -88,7 +88,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String PROPERTIES1 =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -104,7 +104,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     

     public static final String OP_PROPERTIES1 =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -128,7 +128,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String OP_NAMES_NO_PROPERTIES1 =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -144,7 +144,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String SELECTOR =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -157,7 +157,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String COMPOSITE_INVALID_URI =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -169,7 +169,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     // Invalid: contains both a response attribute and a response element.

     public static final String COMPOSITE_INVALID_RESPONSE_ATTR_ELEMENT =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -184,7 +184,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String DEST_PROPS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -204,7 +204,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String CF_PROPS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -224,7 +224,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String AS_PROPS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -244,7 +244,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String RESP_DEST_PROPS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -266,7 +266,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String RESP_CF_PROPS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -288,7 +288,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String RESP_AS_PROPS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -310,7 +310,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String OP_PROPS_PROPS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -330,7 +330,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String RES_ADPT_PROPS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -350,7 +350,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String CONFIGURED_OPERATIONS =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -365,7 +365,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
     

     public static final String WIRE_FORMAT =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

@@ -382,7 +382,7 @@ public class JMSBindingProcessorTestCase extends TestCase {
 

     public static final String OP_PROP_NAME =

         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"

             + " <component name=\"HelloWorldComponent\">"

             + "   <implementation.java class=\"services.HelloWorld\"/>"

             + "      <service name=\"HelloWorldService\">"

diff --git a/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java b/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
index 468295df36..db138aa30d 100644
--- a/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
@@ -49,7 +49,7 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
     
     public static final String DEFAULT =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"
+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">"
             + " <component name=\"HelloWorldComponent\">"
             + "      <service name=\"HelloWorldService\">"
             + "          <binding.jms>"
@@ -400,7 +400,7 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
         System.out.println(bos.toString());
         assertEquals(bos.toString(),
                      "<?xml version=\'1.0\' encoding=\'UTF-8\'?>" +
-                     "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">" +
+                     "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://binding-jms\" name=\"binding-jms\">" +
                        "<component name=\"HelloWorldComponent\">" + 
                            "<service name=\"HelloWorldService\">" +
                              "<binding.jms><operationProperties name=\"JKL\" /> " +
diff --git a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
index d058e4869f..065e888bb7 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
+++ b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
            targetNamespace="http://itest"
            name="HelloWorldComposite">
diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
index 0817fd7969..7c5747a1ca 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
+++ b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
@@ -19,11 +19,11 @@
 -->

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

     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 

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

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

     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 

     elementFormDefault="qualified">

 

-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" />

+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" />

 

     <element name="binding.jsonp" type="t:JSONPBinding"/>

     

diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
index 8d7a60b30f..9c97574db7 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

 	targetNamespace="http://jsonrpc"

 	xmlns:jsonrpc="http://jsonrpc"

diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
index 0cda58286e..16dcbce45f 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	targetNamespace="http://jsonrpc"
 	xmlns:jsonrpc="http://jsonrpc"
diff --git a/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType b/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
index 6def6715fd..59e7606bbb 100644
--- a/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <service name="HelloWorldService">
         <interface.java interface="helloworld.HelloWorldService"/>
     </service>
diff --git a/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
index 5a68cdde8d..819a00f978 100644
--- a/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
     <service name="HelloWorldRmiService">
         <interface.java interface="helloworld.HelloWorldRmiService"/>
diff --git a/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite b/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
index 06c1c5e9fc..9d526b7f11 100644
--- a/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	       targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
            name="HelloWorldRmiComposite">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
index 385c456ddf..e797a0aa9c 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorld">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml
index 00afc5b7f4..e6ccae5c73 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchReference/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
               xmlns:sample="http://sample">
    <deployable composite="sample:HelloWorld"/>
 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
index bab26454ba..079ee49380 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorld">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml
index 00afc5b7f4..e6ccae5c73 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/asynchService/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
               xmlns:sample="http://sample">
    <deployable composite="sample:HelloWorld"/>
 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
index f02c77a01e..1d5630f3d0 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorld">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml
index d7685c6143..392f5c335c 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackReference/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	      targetNamespace="http://sample"
               xmlns:sample="http://sample">
    <deployable composite="sample:HelloWorld"/>
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
index e0fae3c988..ded3766d49 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorld">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml
index d7685c6143..392f5c335c 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/callbackService/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	      targetNamespace="http://sample"
               xmlns:sample="http://sample">
    <deployable composite="sample:HelloWorld"/>
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
index dece7b0d63..4513f21acf 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorld">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
index 4579442a99..9645384d54 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/HelloWorldComponent.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorldComponent">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml
index 00afc5b7f4..e6ccae5c73 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionReference/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
               xmlns:sample="http://sample">
    <deployable composite="sample:HelloWorld"/>
 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
index 00ac746111..e6a7d776c9 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorld">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
index 944dd0b625..0393280625 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/HelloWorldComponent.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorldComponent">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml
index 00afc5b7f4..e6ccae5c73 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/promotionService/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
               xmlns:sample="http://sample">
    <deployable composite="sample:HelloWorld"/>
 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
index 87945b6692..f4d2789ff7 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorld">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml
index 00afc5b7f4..e6ccae5c73 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleReference/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
               xmlns:sample="http://sample">
    <deployable composite="sample:HelloWorld"/>
 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
index f94b6d3ba0..7e6311a22d 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="HelloWorld">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml
index 00afc5b7f4..e6ccae5c73 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-axis2-runtime/src/test/resources/simpleService/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
               xmlns:sample="http://sample">
    <deployable composite="sample:HelloWorld"/>
 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite
index 4a6c87318d..8c825ca805 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorld">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml
index ac1d0a36c1..ab75f7d225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:HelloWorld"/>

 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite
index 4e3e0c269b..79b1a5d794 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorld">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml
index ac1d0a36c1..ab75f7d225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:HelloWorld"/>

 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite
index eae8b705d3..e8924d2728 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorld">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml
index ac1d0a36c1..ab75f7d225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:HelloWorld"/>

 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite
index dbbdc9b774..4edc8df5cd 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorld">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml
index ac1d0a36c1..ab75f7d225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:HelloWorld"/>

 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite
index c8cc77001c..823cab4f56 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorld">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite
index 290ae8723b..755633ff33 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorldComponent">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml
index ac1d0a36c1..ab75f7d225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:HelloWorld"/>

 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite
index aec75574f7..454e9c55cf 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorld">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite
index 3f7e8f5cfa..a313fb8f68 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorldComponent">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml
index ac1d0a36c1..ab75f7d225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:HelloWorld"/>

 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite
index 31b85329f1..4151749523 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="HelloWorld">

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml
index ac1d0a36c1..ab75f7d225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:HelloWorld"/>

 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite
index 9f0d212582..37af7625ff 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml
index ac1d0a36c1..ab75f7d225 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:HelloWorld"/>

 </contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index c00df2ef35..ff378f8f32 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
  			
 	<sca:bindingType type="sca:binding.sca"  mayProvide="" alwaysProvides=""/>	 		
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index be464172ed..93bd129a65 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
@@ -69,7 +69,7 @@ public class WriteTestCase {
         assertNotNull(componentType);
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos), context);
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" ><service name=\"CalculatorService\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><reference name=\"addService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></reference></componentType>",
+        assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" ><service name=\"CalculatorService\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><reference name=\"addService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></reference></componentType>",
         		     bos.toString());
         }
 
@@ -81,7 +81,7 @@ public class WriteTestCase {
         assertNotNull(composite);
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context);
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?><composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://calc\" name=\"Calculator\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><component name=\"CalculatorServiceComponent\"><implementation.java class=\"calculator.CalculatorServiceImpl\" /><reference name=\"addService\" target=\"AddServiceComponent\"><binding.sca /></reference><reference name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference name=\"divideService\" target=\"DivideServiceComponent\" /></component><component name=\"AddServiceComponent\"><implementation.java class=\"calculator.AddServiceImpl\" /><service name=\"AddService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></service></component><component name=\"SubtractServiceComponent\"><implementation.java class=\"calculator.SubtractServiceImpl\" /></component><component name=\"MultiplyServiceComponent\"><implementation.java class=\"calculator.MultiplyServiceImpl\" /></component><component name=\"DivideServiceComponent\"><implementation.java class=\"calculator.DivideServiceImpl\" /></component></composite>",
+        assertEquals("<?xml version='1.0' encoding='UTF-8'?><composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://calc\" name=\"Calculator\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><component name=\"CalculatorServiceComponent\"><implementation.java class=\"calculator.CalculatorServiceImpl\" /><reference name=\"addService\" target=\"AddServiceComponent\"><binding.sca /></reference><reference name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference name=\"divideService\" target=\"DivideServiceComponent\" /></component><component name=\"AddServiceComponent\"><implementation.java class=\"calculator.AddServiceImpl\" /><service name=\"AddService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></service></component><component name=\"SubtractServiceComponent\"><implementation.java class=\"calculator.SubtractServiceImpl\" /></component><component name=\"MultiplyServiceComponent\"><implementation.java class=\"calculator.MultiplyServiceImpl\" /></component><component name=\"DivideServiceComponent\"><implementation.java class=\"calculator.DivideServiceImpl\" /></component></composite>",
                      bos.toString());
     }
 
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/Calculator.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/Calculator.composite
index c404b3bcd4..1847b2b452 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
         xmlns:calc="http://calc"
         targetNamespace="http://calc"
         name="Calculator">
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
index 85535842be..da4219759f 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
   <service name="CalculatorService">
         <interface.java interface="calculator.CalculatorService" />
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 90cc3cd31a..1e62916818 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -140,7 +140,7 @@ public class Axis2ServiceProvider {
         new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.EPR_REFERENCE_PARAMETERS);
 
     private static final QName TRANSPORT_JMS_QUALIFIED_INTENT =
-        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "transport.jms");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "transport.jms");
     private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
 
     //Schema element names
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index da02d1033e..965d29032e 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
@@ -34,7 +34,7 @@ import org.apache.tuscany.sca.policy.PolicySubject;
  */
 public class AxisPolicyHelper {
 
-    public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     public static final QName AUTHENTICATION_INTENT = new QName(XMLNS_SCA_11, "authentication");
     public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_11, "confidentiality");
     public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_11, "integrity");
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index 68f0372b61..17a9a543a2 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2-15-runtime/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
@@ -20,9 +20,9 @@
 
 <!-- $Rev$ $Date$ -->
 
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
             
     <sca:bindingType type="sca:binding.ws"  mayProvide="SOAP SOAP.V1_1 SOAP.V1_2 MTOM" alwaysProvides=""/>
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 90cc3cd31a..1e62916818 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -140,7 +140,7 @@ public class Axis2ServiceProvider {
         new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.EPR_REFERENCE_PARAMETERS);
 
     private static final QName TRANSPORT_JMS_QUALIFIED_INTENT =
-        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "transport.jms");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "transport.jms");
     private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
 
     //Schema element names
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index da02d1033e..965d29032e 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
@@ -34,7 +34,7 @@ import org.apache.tuscany.sca.policy.PolicySubject;
  */
 public class AxisPolicyHelper {
 
-    public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     public static final QName AUTHENTICATION_INTENT = new QName(XMLNS_SCA_11, "authentication");
     public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_11, "confidentiality");
     public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_11, "integrity");
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index 68f0372b61..17a9a543a2 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
@@ -20,9 +20,9 @@
 
 <!-- $Rev$ $Date$ -->
 
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
             
     <sca:bindingType type="sca:binding.ws"  mayProvide="SOAP SOAP.V1_1 SOAP.V1_2 MTOM" alwaysProvides=""/>
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index f8e3f11284..130817100c 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-		   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+		   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 		   targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="HelloWorld">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
index 3c8ed37414..4163b550f3 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-		   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+		   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 		   targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="HelloWorldNoWSDL">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
index 9c11895223..6ed9d1e8e9 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+           xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="DefaultMultiService">
            
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
index 5852d58b19..0e1054ef0b 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="DefaultSingleService">
            
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
index d72d0b4239..9f4f62e317 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="endpoint3">
            
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
index aefe1b41a1..317f9e98ed 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="endpoint4">
            
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
index 1d3ea6e91e..d5806449ee 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="HelloWorld2">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index 4367e2d88d..d6da2aa3c4 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="HelloWorldOM-Merged">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index 24a66ccbca..bb3dfc641e 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="HelloWorldOM">
     
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
index 4d605a2012..d467d3ff1c 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
@@ -20,8 +20,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
             targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="HelloWorldPrec">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
index 3dcef5ab46..f455154dcd 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

 	targetNamespace="http://filetransfer"

 	xmlns:hw="http://filetransfer"

     name="filetransferws">

diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/test.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/test.composite
index 74aff65651..f4c1da8c07 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/test.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/pojo/test.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     targetNamespace="http://test" 
     xmlns:hw="http://helloworld"
     name="test">
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
index 60673ab103..60b2190f5d 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

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

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

            targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"

            name="endpoint3">

            

diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
index bc3107c388..61dde2853a 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"

            name="endpoint3">

            

diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
index ae07495cf3..ec9d59577c 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"

            name="endpoint3">

            

diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index e46345bdbc..a3fd1e9312 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
  <!-- WS Security POLICY SETS -->
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
index 19a8521f61..cee5560150 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
  <sca:intent name="wsAuthentication" 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
index 9a2ed7d29a..8c77119ce6 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="WSSecurityMixed">
            
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
index fb08fee447..ccb433c0a7 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
  <!-- WS Security POLICY SETS -->
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
index 780130e699..9555b656d7 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

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

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

            targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"

            name="endpoint3">

            

diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
index dd0a102476..eb8424d8bd 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"

            name="endpoint3">

            

diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
index 904c0b469e..30c7eb4c82 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

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

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

            targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"

            name="endpoint3">

            

diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index 8a5aacf916..b97dc97262 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
  
  <!-- WS Security POLICY SETS -->
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
index 95e93419da..dc6466c91b 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="QuestionMarkWSDLImport">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
index 9f035663bc..6973dbe734 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="QuestionMarkWSDLInclude">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index 3ed8b206a7..973b028ee9 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

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

 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="QuestionMarkWSDLTests">
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
index f7caa55fce..b8f4cb8b9a 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"

            name="HelloWorld">

 

diff --git a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
index 6118743da3..c927224763 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
+++ b/sca-java-2.x/trunk/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"

            name="QuestionMarkWSDLTests">

 

diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
index a63ac662b7..3364dd83d9 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
@@ -60,7 +60,7 @@ import org.apache.tuscany.sca.xsd.XSDFactory;
  */
 public class BindingWSDLGenerator {
     private static final Logger logger = Logger.getLogger(BindingWSDLGenerator.class.getName());
-    private static final QName SOAP12_INTENT = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "SOAP.1_2");
+    private static final QName SOAP12_INTENT = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "SOAP.1_2");
 
     public static boolean printWSDL;     // external code sets this to print generated WSDL
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index de5c1c389e..6bbd064e40 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
@@ -70,7 +70,7 @@ public class WSDLServiceGenerator {
     
     private static final Logger logger = Logger.getLogger(WSDLServiceGenerator.class.getName());
     private static final QName TRANSPORT_JMS_QUALIFIED_INTENT =
-        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "transport.jms");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "transport.jms");
     private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
     private static final String ADDRESS = "Address";
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder
index 985d9cb88d..e39d9352b3 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder
+++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the

 # specific language governing permissions and limitations

 # under the License. 

-org.apache.tuscany.sca.binding.ws.wsdlgen.WebServiceBindingBuilder;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.ws

+org.apache.tuscany.sca.binding.ws.wsdlgen.WebServiceBindingBuilder;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#binding.ws

 

diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index 46330c13f5..88f173368d 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface WebServiceConstants {
-	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
 	
     String BINDING_WS = "binding.ws";
     QName BINDING_WS_QNAME = new QName(SCA11_NS, BINDING_WS);
diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 678dfa1e2f..75a0170373 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding
+org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding
 

diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite b/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
index 558365b05e..2404e9ba28 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:calc="http://sample.calculator"
     targetNamespace="http://calc"
     xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index 1952d83755..64965a689c 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index 6d36198124..b86683b79a 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">
 
   <service name="CalculatorService">
diff --git a/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
index 036b5f0d1a..1b6423be1d 100644
--- a/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
+++ b/sca-java-2.x/trunk/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
index 46ff781847..df8c16c6b3 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
+++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
@@ -74,7 +74,7 @@ import org.xml.sax.InputSource;
  * @version $Rev$ $Date$
  */
 public class ComponentBuilderImpl {
-    protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     protected static final String BINDING_SCA = "binding.sca";
     protected static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA);
 
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
index ef569222ae..36b8c2ac40 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
+++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
@@ -62,7 +62,7 @@ import org.apache.tuscany.sca.policy.PolicySubject;
 public class CompositeComponentTypeBuilderImpl {
     private static final Logger logger = Logger.getLogger(CompositeComponentTypeBuilderImpl.class.getName());
 
-    protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     protected static final String BINDING_SCA = "binding.sca";
     protected static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA);
 
diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
index d6082a936d..0e7aad877e 100644
--- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">
diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
index 105a478842..584f27eea7 100644
--- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
+++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Composite1">
diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
index d3d5bafdfc..12cf984b88 100644
--- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
+++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Composite2">
diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
index 12aa35b694..e6be99195e 100644
--- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
+++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Composite3">
diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
index 141ff2a4ea..02167e43cf 100644
--- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
+++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Composite4">
diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
index fe76d0038a..5b22d5b596 100644
--- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
+++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
@@ -18,10 +18,10 @@
  * under the License.    
 -->
 <definitions 
-    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     targetNamespace="http://sample"
     xmlns:sample="http://sample" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
     <policySet name="PolicySet1" appliesTo="sca:implementation.java"
         attachTo = "//composite[@name='']">
diff --git a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
index dac8e384e3..dc7f5c422c 100644
--- a/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
+++ b/sca-java-2.x/trunk/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://test"
-    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://test"
+    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
     <!-- Extension Types Metadata -->
     <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />
@@ -39,7 +39,7 @@
 
     <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
         attachTo = "//sca:component[@name='CalculatorServiceComponent']/sca:reference[@name='addService']"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for
                  "basic authentication" -->
@@ -52,7 +52,7 @@
 
     <!-- POLICY SETS -->
     <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for
                  "basic authentication" -->
@@ -64,7 +64,7 @@
     </policySet>
 
     <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="transport">
                 <wsp:PolicyAttachment>
@@ -81,7 +81,7 @@
     </policySet>
 
     <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="message">
                 <wsp:PolicyAttachment>
@@ -100,13 +100,13 @@
     </policySet>
 
     <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
         <policySetReference name="test:AuthenticationPolicies" />
         <policySetReference name="test:ConfidentialityPolicies" />
     </policySet>
 
     <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:PolicyAttachment>
             <!-- policy expression and policy subject for "basic
         authentication" -->
@@ -114,7 +114,7 @@
     </policySet>
 
     <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <intentMap provides="test:confidentiality">
             <qualifier name="transport">
                 <wsp:PolicyAttachment>
@@ -134,7 +134,7 @@
     </policySet>
 
     <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
         xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
         <wsp:Policy>
             <wsp:ExactlyOne>
diff --git a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index de25081832..bfa89d02fe 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
@@ -46,7 +46,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class JavaExportProcessor implements StAXArtifactProcessor<JavaExport> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     
     private static final QName EXPORT_JAVA = new QName(SCA11_NS, "export.java");
     
diff --git a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index c16660277a..1cfb30ac6d 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
@@ -46,7 +46,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class JavaImportProcessor  implements StAXArtifactProcessor<JavaImport> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     
     private static final QName IMPORT_JAVA = new QName(SCA11_NS, "import.java");
 
diff --git a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index a23f38e8ef..b6731f735b 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
@@ -50,7 +50,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  */
 public class NamespaceExportProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<NamespaceExport> {
 
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     private static final QName EXPORT = new QName(SCA11_NS, "export");
     private static final String NAMESPACE = "namespace";
 
diff --git a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index 2efa8d6aca..120689c28e 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
@@ -49,7 +49,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class NamespaceImportProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<NamespaceImport> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
 
     private static final QName IMPORT = new QName(SCA11_NS, "import");
 
diff --git a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index 817e5a5ee2..b8d16b7fae 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
@@ -340,7 +340,7 @@ public abstract class BaseStAXArtifactProcessor {
      */
     public static class XAttr {
 
-        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
 
         private String uri = SCA11_NS;
         private String name;
diff --git a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index eebc49edbb..6feb0569c6 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
@@ -56,7 +56,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  */
 public class ContributionMetadataProcessor extends BaseStAXArtifactProcessor implements
     StAXArtifactProcessor<ContributionMetadata> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
 
     private static final QName CONTRIBUTION_QNAME = new QName(SCA11_NS, "contribution");
     private static final QName DEPLOYABLE_QNAME = new QName(SCA11_NS, "deployable");
diff --git a/sca-java-2.x/trunk/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6aba85a94d..bbc1421599 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,10 +16,10 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.contribution.xml.ContributionMetadataProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
+org.apache.tuscany.sca.contribution.xml.ContributionMetadataProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
 org.apache.tuscany.sca.contribution.processor.xml.AnyElementProcessor;qname=http://www.w3.org/2001/XMLSchema#any,model=org.apache.tuscany.sca.assembly.Extension
-org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
-org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#export,model=org.apache.tuscany.sca.contribution.namespace.NamespaceExport
-org.apache.tuscany.sca.contribution.java.impl.JavaImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
-org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport
+org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
+org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#export,model=org.apache.tuscany.sca.contribution.namespace.NamespaceExport
+org.apache.tuscany.sca.contribution.java.impl.JavaImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
+org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport
 

diff --git a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index f25fb5d981..25c4b91eaa 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
@@ -49,11 +49,11 @@ public class JavaExportProcessorTestCase {
 
     private static final String VALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\"/>";
+            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\"/>";
 
     private static final String INVALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\"/>";
+            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
diff --git a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index f3b52117bb..e9bfa4b5f3 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
@@ -48,11 +48,11 @@ public class JavaImportProcessorTestCase {
 
     private static final String VALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\" location=\"sca://contributions/001\"/>";
+            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\" location=\"sca://contributions/001\"/>";
 
     private static final String INVALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
+            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
diff --git a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index cec66b23c3..384892ce62 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
@@ -48,12 +48,12 @@ public class NamespaceExportProcessorTestCase {
 
     private static final String VALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>"
-            + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\""
+            + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:ns=\"http://ns\""
             + " ns:ext=\"extended\" namespace=\"http://foo\">"
             + "<ns:foo/></export>";
 
     private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\"/>";
+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:ns=\"http://ns\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
diff --git a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index 03407f9065..32f95e86ab 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
@@ -50,13 +50,13 @@ public class NamespaceImportProcessorTestCase {
 
     private static final String VALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\""
+            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:ns=\"http://ns\""
             + " namespace=\"http://foo\" location=\"sca://contributions/001\" ns:ext=\"extended\">"
             + "<ns:foo/></import>";
 
     private static final String INVALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>"
-            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
+            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
diff --git a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index 1d0ea5dc8a..a4aa564392 100644
--- a/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
@@ -52,7 +52,7 @@ import org.junit.Test;
 public class ContributionMetadataProcessorTestCase {
 
     private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\""
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\""
             + " xmlns:ns=\"http://ns\" ns:foo=\"extended\">"
             + "<deployable composite=\"ns:Composite1\"/>"
             + "<deployable xmlns:ns2=\"http://ns2\" composite=\"ns2:Composite2\"/>"
@@ -60,7 +60,7 @@ public class ContributionMetadataProcessorTestCase {
             + "</contribution>";
 
     private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\">"
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:ns=\"http://ns\">"
             + "<deployable composite=\"ns:Composite1\"/>"
             + "<deployable/>"
             + "</contribution>";
diff --git a/sca-java-2.x/trunk/modules/deployment/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
index f00e00a373..5dc99a46a7 100644
--- a/sca-java-2.x/trunk/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
@@ -18,7 +18,7 @@
 * under the License.    
 -->
 
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
               xmlns:sc="http://sample/composite">
     <deployable composite="sc:HelloWorld1" />
 </contribution>
diff --git a/sca-java-2.x/trunk/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite b/sca-java-2.x/trunk/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
index b4fee2c7a6..23555ea491 100644
--- a/sca-java-2.x/trunk/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	targetNamespace="http://sample/composite"
 	name="HelloWorld1">
diff --git a/sca-java-2.x/trunk/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/sca-java-2.x/trunk/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index 47815f8377..c149d228c6 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
@@ -67,7 +67,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  *  @version $Rev$ $Date$
  */
 public class BPELImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<BPELImplementation> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     private static final String PROCESS = "process";
     private static final String IMPLEMENTATION_BPEL = "implementation.bpel";
     private static final QName IMPLEMENTATION_BPEL_QNAME = new QName(SCA11_NS, IMPLEMENTATION_BPEL);
diff --git a/sca-java-2.x/trunk/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 5b53ed1ee0..ffb781d3b4 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.bpel.xml.BPELImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation

+org.apache.tuscany.sca.implementation.bpel.xml.BPELImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation

diff --git a/sca-java-2.x/trunk/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-2.x/trunk/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index c56ab48854..37e5660636 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
@@ -44,7 +44,7 @@ public class BPELImplementationProcessorTestCase extends TestCase {
 
     private static final String COMPOSITE =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
             + " <component name=\"BPELHelloWorldComponent\">"
             + "   <implementation.bpel process=\"hns:HelloWorld\" />"
             + " </component>"
@@ -52,7 +52,7 @@ public class BPELImplementationProcessorTestCase extends TestCase {
 
     private static final String COMPOSITE_INVALID =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
+            + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
             + " <component name=\"BPELHelloWorldComponent\">"
             + "   <implementation.bpel/>"
             + " </component>"
diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
index 14d99e8b02..e790317458 100644
--- a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
+++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
@@ -20,9 +20,9 @@
 
 <!-- $Rev$ $Date$ -->
 
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
             
     <sca:implementationType type="sca:implementation.java"  mayProvide="" alwaysProvides=""/>
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 3537dc97cf..c23f5e4d39 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface JavaImplementationConstants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     String IMPLEMENTATION_JAVA = "implementation.java";
     QName IMPLEMENTATION_JAVA_QNAME = new QName(SCA11_NS, "implementation.java");
     String CLASS = "class";
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index aa889448f6..2b09ee1d4d 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation
+org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation
 

diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index f4182679bc..87798357e0 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:calc="http://sample.calculator"
 	requires="cns:tuscanyIntent_1"
 	targetNamespace="http://sample.calculator"
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index 88a8e346c7..9ecb608816 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
@@ -19,7 +19,7 @@
 -->
 <sca:definitions xmlns="http://test"
  			targetNamespace="http://test"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
 <!-- simple intent -->
  <sca:intent name="tuscanyIntent_1" 
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 60d63a3e5f..18bb3078e2 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://test" targetNamespace="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<sca:definitions xmlns="http://test" targetNamespace="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
     <!-- simple intent -->
     <sca:intent name="tuscanyIntent_1" constrains="sca:binding sca:implementation.java">
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
index f531c2c4ed..8718e58d8e 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/trunk/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     targetNamespace="http://www.osgi.org/xmlns/sca/intents/v1.0.0">
                  
     <intent name="passByReference" constrains="sca:implementation" 
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java b/sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java
index 9c529eecfc..a900f1fa93 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java
@@ -47,7 +47,7 @@ import org.apache.tuscany.sca.policy.PolicySet;
 <?xml version="1.0" encoding="UTF-8"?>
 <scact:sca-config targetNamespace="http://www.foocorp.com/definitions"
   xmlns:scact="http://www.osgi.org/xmlns/scact/v1.0.0" 
-  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:foocorp="http://www.foocorp.com/definitions"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.osgi.org/xmlns/scact/v1.0.0 http://www.osgi.org/xmlns/scact/v1.0.0/sca-config.xsd">
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/trunk/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
index f531c2c4ed..8718e58d8e 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<sca:definitions xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     targetNamespace="http://www.osgi.org/xmlns/sca/intents/v1.0.0">
                  
     <intent name="passByReference" constrains="sca:implementation" 
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java b/sca-java-2.x/trunk/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
index 1b28373f5b..cef99f5625 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
@@ -43,7 +43,7 @@ public class ServiceDescriptionsTestCase {
     private static final String xml =
         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" 
             + "<service-descriptions xmlns=\"http://www.osgi.org/xmlns/sd/v1.0.0\" "
-            + "xmlns:sca=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\">"
+            + "xmlns:sca=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\">"
             + "<service-description>"
             + "<provide interface=\"calculator.operations.AddService\"/>"
             + "<property name=\"service.intents\">sca:SOAP sca:HTTP</property>"
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/trunk/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
index bc9e4f6aaf..d58fb634aa 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
     <!-- The service elment defines an SCA view of the OSGi service -->
diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-2.x/trunk/modules/implementation-osgi/src/test/resources/osgitest.composite
index 8c59703724..7c54e46a54 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/src/test/resources/osgitest.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
            targetNamespace="http://test"
diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder b/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
index 501eb945d8..7ea615051e 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the

 # specific language governing permissions and limitations

 # under the License. 

-org.apache.tuscany.sca.implementation.spring.SpringImplementationBuilder;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.spring

+org.apache.tuscany.sca.implementation.spring.SpringImplementationBuilder;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#implementation.spring

 

diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b04b952fae..880d6fade0 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 

 

 # Implementation class for the artifact processor extension

-org.apache.tuscany.sca.implementation.spring.xml.SpringImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.spring,model=org.apache.tuscany.sca.implementation.spring.SpringImplementation

+org.apache.tuscany.sca.implementation.spring.xml.SpringImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#implementation.spring,model=org.apache.tuscany.sca.implementation.spring.SpringImplementation

 

diff --git a/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml b/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
index d03e42a7a2..18e7b1e60a 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
@@ -20,9 +20,9 @@
 
 <!-- $Rev$ $Date$ -->
 
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+            xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
             
     <sca:implementationType type="sca:implementation.spring"  mayProvide="" alwaysProvides=""/>
diff --git a/sca-java-2.x/trunk/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder b/sca-java-2.x/trunk/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
index 7881092890..7e306cb9a0 100644
--- a/sca-java-2.x/trunk/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+++ b/sca-java-2.x/trunk/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the

 # specific language governing permissions and limitations

 # under the License. 

-org.apache.tuscany.sca.implementation.web.impl.WebImplementationBuilder;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.web

+org.apache.tuscany.sca.implementation.web.impl.WebImplementationBuilder;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#implementation.web

 

diff --git a/sca-java-2.x/trunk/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ee5f312b8f..89ef50ba58 100644
--- a/sca-java-2.x/trunk/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.web.xml.WebImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.web,model=org.apache.tuscany.sca.implementation.web.WebImplementation,factory=org.apache.tuscany.sca.implementation.web.WebImplementationFactory
+org.apache.tuscany.sca.implementation.web.xml.WebImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#implementation.web,model=org.apache.tuscany.sca.implementation.web.WebImplementation,factory=org.apache.tuscany.sca.implementation.web.WebImplementationFactory
 

diff --git a/sca-java-2.x/trunk/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite b/sca-java-2.x/trunk/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
index 864318b22e..1c5a439654 100644
--- a/sca-java-2.x/trunk/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
+++ b/sca-java-2.x/trunk/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	targetNamespace="http://sample/web"
 	xmlns:sc="http://sample/composite"
 	name="TestWeb">
diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 75816b1d36..2db916e2d3 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface JavaConstants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     String INTERFACE_JAVA = "interface.java";
     QName INTERFACE_JAVA_QNAME = new QName(SCA11_NS, "interface.java");
     String INTERFACE = "interface";
diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index 519ce7b36f..5faa8dfa03 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
@@ -67,7 +67,7 @@ import org.oasisopen.sca.annotation.Service;
  * @version $Rev$ $Date$
  */
 public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfaceContract>, JavaConstants {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     private JavaInterfaceFactory javaFactory;
     
 
diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7f133c0ba7..2cbda24dd8 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract
+org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract
 

diff --git a/sca-java-2.x/trunk/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-2.x/trunk/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index ffc38c7f04..927847c1c9 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	name="Calculator">
diff --git a/sca-java-2.x/trunk/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-2.x/trunk/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index bf58f29447..68793041e1 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/trunk/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
   <service name="CalculatorService">
         <interface.java interface="calculator.CalculatorService" />
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index f863ff696d..76d42f2f44 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
@@ -46,11 +46,11 @@ import org.apache.tuscany.sca.xsd.XSDFactory;
  * @version $Rev$ $Date$
  */
 public class WSDLInterfaceIntrospectorImpl {
-    private static final QName POLICY_REQUIRES 			= new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "requires");
-    private static final QName POLICY_CONVERSATIONAL 	= new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "conversational");
-    public  static final QName POLICY_END_CONVERSATION 	= new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "endsConversation");
+    private static final QName POLICY_REQUIRES 			= new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "requires");
+    private static final QName POLICY_CONVERSATIONAL 	= new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "conversational");
+    public  static final QName POLICY_END_CONVERSATION 	= new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "endsConversation");
     
-    private static final QName CALLBACK_ATTRIBUTE 		= new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "callback" );
+    private static final QName CALLBACK_ATTRIBUTE 		= new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "callback" );
     
     private WSDLFactory wsdlFactory;
     private XSDFactory xsdFactory;
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index 3612fa7756..ba9bff164c 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface WSDLConstants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     String INTERFACE_WSDL = "interface.wsdl";
     QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl");
     String INTERFACE = "interface";
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index 2b7b6f70b3..a9bd60f739 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
@@ -100,10 +100,10 @@ public class WSDLModelResolver implements ModelResolver {
         Arrays.asList(new QName[] {Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001});
     
     // ---- SCA Policy WSDL Attachments    
-    public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "requires");
-    public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "endsConversation");
+    public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "requires");
+    public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "endsConversation");
     // ---- SCA Callback WSDL Extension
-    public static final QName Q_CALLBACK_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "callback" );
+    public static final QName Q_CALLBACK_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "callback" );
     
     // ---- BPEL extension elements ---  Mike Edwards 01/05/2008
     public static final String ELEM_PLINKTYPE = "partnerLinkType";
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 08fa2b7474..68da288a8c 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
+org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
 

diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index fcdf69594b..a71e0a55f8 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index 35052dfd6d..eaf8d1b8ee 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">
 
   <service name="CalculatorService">
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
index 813d9e8291..86cbe39af9 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
@@ -21,7 +21,7 @@
     targetNamespace="http://example.com/stockquote.wsdl"
     xmlns:tns="http://example.com/stockquote.wsdl" 
     xmlns:xsd="http://example.com/stockquote.xsd"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns="http://schemas.xmlsoap.org/wsdl/">
 
     <types>
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
index b14b3516f6..b48c048000 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
@@ -18,7 +18,7 @@
 * under the License.    
 -->
 
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
               xmlns:c="http://calculator.dosgi">
     <deployable composite="c:CalculatorComposite" />
 </contribution>
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
index 0dc812c503..e7369833f9 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
@@ -18,7 +18,7 @@
 * under the License.
 -->
 <!-- A consumer-side service description file for RFC 119 -->
-<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
     <!-- Describe a remote OSGi service  -->
     <service-description>
         <provide interface="calculator.dosgi.operations.AddService" />
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
index bc9e4f6aaf..d58fb634aa 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
     <!-- The service elment defines an SCA view of the OSGi service -->
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
index 1ae44d0a0b..830c6867ed 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://calculator.dosgi" 
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
index 16a33f4f65..d24999ab3e 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
               xmlns:c="http://calculator.dosgi">
     <deployable composite="c:OperationsComposite" />
 </contribution>
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
index 72e2c339f1..2d2933f85b 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
 
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
index 253f7d0df1..c7250912b0 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://calculator.dosgi" 
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
index b14b3516f6..b48c048000 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
@@ -18,7 +18,7 @@
 * under the License.    
 -->
 
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
               xmlns:c="http://calculator.dosgi">
     <deployable composite="c:CalculatorComposite" />
 </contribution>
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
index 43f101e799..1be863568c 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://calculator.dosgi" 
diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
index 78f4fabb20..6d10935e52 100644
--- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
+++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
@@ -60,7 +60,7 @@ public class NodeConfigurationProcessor extends BaseStAXArtifactProcessor implem
     private static final QName BASE_URI = new QName(SCA11_TUSCANY_NS, "baseURI");
     private static final QName DEPLOYMENT_COMPOSITE = new QName(SCA11_TUSCANY_NS, "deploymentComposite");
 
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     private static final QName COMPOSITE = new QName(SCA11_NS, "composite");
 
     private StAXArtifactProcessor processor;
diff --git a/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
index aa7933630a..c8d0191c5e 100644
--- a/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ b/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
@@ -38,7 +38,7 @@ import org.junit.Test;
  */
 public class NodeImplTestCase {
     private static String composite =
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\""
+        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\""
             + " targetNamespace=\"http://sample/composite\""
             + " xmlns:sc=\"http://sample/composite\""
             + " name=\"HelloWorld2\">"
diff --git a/sca-java-2.x/trunk/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-2.x/trunk/modules/node-impl/src/test/resources/HelloWorld.composite
index efe43cbf2f..ca3c3eda7c 100644
--- a/sca-java-2.x/trunk/modules/node-impl/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/node-impl/src/test/resources/HelloWorld.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	targetNamespace="http://sample/composite"
 	xmlns:sc="http://sample/composite"
diff --git a/sca-java-2.x/trunk/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
index 1149eb5cbf..20627c3d2c 100644
--- a/sca-java-2.x/trunk/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
@@ -18,7 +18,7 @@
 * under the License.    
 -->
 
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
               xmlns:sc="http://sample/composite">
     <deployable composite="sc:HelloWorld" />
 </contribution>
diff --git a/sca-java-2.x/trunk/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml b/sca-java-2.x/trunk/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
index 5b2835c434..4afc52d73b 100644
--- a/sca-java-2.x/trunk/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
+++ b/sca-java-2.x/trunk/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.
 -->
-<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
     uri="http://sample/nodes/TestNode1"
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index ccd116e848..32ec5f0e2f 100644
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
 	targetNamespace="http://sample/composite"
 	xmlns:sc="http://sample/composite"
diff --git a/sca-java-2.x/trunk/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-2.x/trunk/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index 95c976ba49..5b38d041fd 100644
--- a/sca-java-2.x/trunk/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/sca-java-2.x/trunk/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
             targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1">
 
 	<!-- Policy Intents Defined by the SCA Runtime -->
diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index 8b0bbd54ff..c970704929 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
@@ -30,7 +30,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public class AuthorizationPolicy {
-    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     // private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
     public static final QName NAME = new QName(SCA11_NS, "authorization");
 
diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index 28ffcaf348..4a7e330a57 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public class SecurityIdentityPolicy {
-    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";    
+    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";    
     public static final QName NAME = new QName(SCA11_NS, "securityIdentity");
 
     private boolean useCallerIdentity;
diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cb284822ac..473c17f6ff 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,12 +16,12 @@
 # under the License. 

 

 # Implementation class for the artifact processor extension

-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

+org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

+org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

 org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

 org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy

 org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#basicAuthentication,model=org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy

diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index 9a02731e8d..21923b3a3b 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
     <!-- POLICY SETS -->
diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index f3af5bc964..45d4ebaf5e 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/sca-java-2.x/trunk/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
@@ -17,8 +17,8 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
     <intent name="identity" constrains="sca:implementation">
         <description>All invocations are must have an identity set</description>
diff --git a/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 0d8a5d5a9c..653f6d621c 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
@@ -44,7 +44,7 @@ import org.junit.Test;
  * @version $Rev$ $Date$
  */
 public class PolicyProcessorTestCase {
-    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
     private final static List<String> SEQ =
         Arrays.asList("permitAll",
                       "allow [r1, r2]",
diff --git a/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index acb47de243..c3ae568ee8 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/sca-java-2.x/trunk/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
@@ -17,8 +17,8 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
     <!-- POLICY SETS -->
     <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
diff --git a/sca-java-2.x/trunk/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java b/sca-java-2.x/trunk/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
index 09c988fff4..f5fb6e399d 100644
--- a/sca-java-2.x/trunk/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
@@ -42,15 +42,15 @@ import org.junit.Assert;
 public class WSPolicyProcessorTestCase extends TestCase {
 
     private static final String VALID_WS_POLICY =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<definitions xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\""
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<definitions xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\""
             + " targetNamespace=\"http://test\""
             + " xmlns:test=\"http://test\""
-            + " xmlns:sca=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\">"
+            + " xmlns:sca=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\">"
             + " "
             + " <policySet name=\"SecureWSPolicy\""
             + " provides=\"test:confidentiality\""
             + " appliesTo=\"sca:binding.ws\""
-            + " xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\""
+            + " xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\""
             + " xmlns:sp=\"http://schemas.xmlsoap.org/ws/2002/12/secext\""
             + " xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\">"
             + " <wsp:Policy>"
diff --git a/sca-java-2.x/trunk/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/trunk/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index a2e321068f..be20c72b6c 100644
--- a/sca-java-2.x/trunk/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/trunk/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
@@ -17,15 +17,15 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  			targetNamespace="http://test"
  			xmlns:test="http://test"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
 
 <policySet name="SecureWSPolicy"
  	provides="test:confidentiality"
  	appliesTo="sca:binding.ws"
- 	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
  	xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
  	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
 	<wsp:Policy>
diff --git a/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java b/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
index 261b9baaf1..22597c7b63 100644
--- a/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
+++ b/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
@@ -25,7 +25,7 @@ public interface Constants {
     /**
      * Namespace for intents.
      */
-    String SCA_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    String SCA_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
 
     /**
      * Prefix form of the namespace that can be prepended to intent declarations.
diff --git a/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java b/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
index 08eb0a8935..8c9101b2b4 100644
--- a/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
+++ b/sca-java-2.x/trunk/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
@@ -22,8 +22,8 @@ import java.lang.annotation.Target;
  * {@link javax.xml.namespace.QName#toString()}. Intents may be qualified with one or more
  * suffixes separated by a "." such as:
  * <ul>
- * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200903}confidentiality</li>
- * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200903}confidentiality.message</li>
+ * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200912}confidentiality</li>
+ * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200912}confidentiality.message</li>
  * </ul>
  * This annotation supports general purpose intents specified as strings.  Users may also define
  * specific intents using the {@link @org.oasisopen.sca.annotation.Intent} annotation.