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

43 files changed, 71 insertions, 71 deletions

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"