Updating OASIS namespace to http://docs.oasis-open.org/ns/opencsa/sca/200903

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

30 files changed, 56 insertions, 56 deletions

diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 8986729df0..dd58b39a1c 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -139,7 +139,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/200712", "transport.jms");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "transport.jms");
     private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
 
     //Schema element names
diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index f85f982eca..da02d1033e 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/java/sca/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/200712";
+    public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     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/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index b98780d221..f8b5b2063c 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/java/sca/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/200712"

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

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

+<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"

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

             

     <sca:bindingType type="sca:binding.ws"  mayProvide="SOAP SOAP.1_1 SOAP.1_2 MTOM" alwaysProvides=""/>

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index bf709f3c50..37c9f336f9 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="HelloWorld">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
index 2a76226c28..471c9bf42c 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="HelloWorldNoWSDL">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
index ceb69856e1..85c26b78c1 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="endpoint1">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
index c5f47dffd6..1096b867e2 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="endpoint1">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
index b7a94abdff..0cf9a9ef90 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
index 880561e939..0c74144385 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="endpoint4">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
index 20bcaec381..5554b79216 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="HelloWorld">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index 637c306747..24594744e5 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="HelloWorldOM-Merged">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index 28aa1b1083..3d966117f4 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="HelloWorldOM">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
index cd0c8a7d5e..38509f9d2d 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
+++ b/java/sca/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/200712"

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

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

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

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

            name="HelloWorldPrec">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
index 5bde1fb9ff..3dcef5ab46 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
+++ b/java/sca/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/200712"

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

 	targetNamespace="http://filetransfer"

 	xmlns:hw="http://filetransfer"

     name="filetransferws">

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
index 983a164c26..60673ab103 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
+++ b/java/sca/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/200712"

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
index 3d43227b94..bc3107c388 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
+++ b/java/sca/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/200712"

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
index bce8b0ae90..ae07495cf3 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
+++ b/java/sca/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/200712"

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index 23797dc357..1eadd01b81 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ b/java/sca/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/200712"

+<sca: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/200712"

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

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

 

  <!-- WS Security POLICY SETS -->

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
index faf5285cca..778fb96128 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
+++ b/java/sca/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/200712"

+<sca: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/200712"

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

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

 

  <sca:intent name="wsAuthentication" 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
index 39ab864037..712948c77a 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
+++ b/java/sca/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/200712"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="endpoint3">
            
diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
index 507a90be69..fb08fee447 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
+++ b/java/sca/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/200712"
+<sca: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/200712"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
  <!-- WS Security POLICY SETS -->
diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
index def62e76a8..780130e699 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
+++ b/java/sca/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/200712"

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
index 9f331b9cdd..dd0a102476 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
+++ b/java/sca/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/200712"

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
index a6c468c8c3..904c0b469e 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
+++ b/java/sca/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/200712"

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index b4ef457507..12f4a6febd 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ b/java/sca/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/200712"

+<sca: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/200712"

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

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

  

  <!-- WS Security POLICY SETS -->

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
index c8f9b53770..f92c4356a8 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
+++ b/java/sca/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/200712"

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

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

            name="QuestionMarkWSDLImport">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
index 9559c75af8..73804b87ca 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
+++ b/java/sca/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/200712"

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

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

            name="QuestionMarkWSDLInclude">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index af2b0f3608..affedb23a8 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
+++ b/java/sca/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/200712"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"

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

 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="QuestionMarkWSDLTests">
 
diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
index ca0598e325..f7caa55fce 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
+++ b/java/sca/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/200712"

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

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

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

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

            name="HelloWorld">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
index 17293cdc94..6118743da3 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
+++ b/java/sca/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/200712"

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

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

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

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

            name="QuestionMarkWSDLTests">