Some more Updates to binding-ws to use OASIS namespaces/schema

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

27 files changed, 55 insertions, 55 deletions

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 f1032515ea..bf709f3c50 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://www.osoa.org/xmlns/sca/1.0"

-		   xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 		   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 894216ac50..2a76226c28 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://www.osoa.org/xmlns/sca/1.0"

-		   xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 		   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 95b013fca3..ceb69856e1 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://www.osoa.org/xmlns/sca/1.0"

-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

            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 20eaf1c58d..c5f47dffd6 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 7923bad0bb..b7a94abdff 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 af3bb3c107..880561e939 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 1dd231af6c..20bcaec381 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 75158310ed..637c306747 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 b72140ebea..28aa1b1083 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 9ca0ff6438..cd0c8a7d5e 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://www.osoa.org/xmlns/sca/1.0"

-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

             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 03a16d9433..5bde1fb9ff 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://www.osoa.org/xmlns/sca/1.0"

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

 	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 d09c52bb9c..983a164c26 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

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

            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 8a33100be1..3d43227b94 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 117344d33a..bce8b0ae90 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 063cd0b3e6..23797dc357 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
@@ -18,9 +18,9 @@
  * under the License.    

 -->

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

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

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

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

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

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

 

  <!-- WS Security POLICY SETS -->

   <sca:policySet name="wsAuthenticationPolicy"

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 21ab1d8a47..faf5285cca 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
@@ -18,9 +18,9 @@
  * under the License.    

 -->

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

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

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

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

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

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

 

  <sca:intent name="wsAuthentication" 

  			 constrains="sca:binding.ws">

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 3bbf99f560..39ab864037 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://www.osoa.org/xmlns/sca/1.0"
-			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
 			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 3239d855b6..507a90be69 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
@@ -18,9 +18,9 @@
  * under the License.    
 -->
 <sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- 			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+ 			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
  			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+ 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
  <!-- WS Security POLICY SETS -->
   <sca:policySet name="wsAuthenticationPolicy"
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 fbf0da5585..def62e76a8 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

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

            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 be78b04dc0..9f331b9cdd 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 4832629dc9..a6c468c8c3 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

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

            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 2f43f6f484..b4ef457507 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
@@ -18,9 +18,9 @@
  * under the License.    

 -->

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

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

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

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

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

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

  

  <!-- WS Security POLICY SETS -->

  <!-- A policyset that uses WS Policy -->

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 5fe01d3fda..c8f9b53770 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://www.osoa.org/xmlns/sca/1.0"

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

            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 b966897ccd..9559c75af8 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://www.osoa.org/xmlns/sca/1.0"

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

  			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 d26fd4347a..af2b0f3608 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://www.osoa.org/xmlns/sca/1.0"
-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

 			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 e4330cb550..ca0598e325 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

 			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 d7fa33c937..17293cdc94 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://www.osoa.org/xmlns/sca/1.0"

-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

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

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

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

            name="QuestionMarkWSDLTests">