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

44 files changed, 86 insertions, 86 deletions

diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
index b44d30002b..0d6743bfe2 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
@@ -27,8 +27,8 @@ import javax.xml.namespace.QName;
  * @version $Rev: 695374 $ $Date: 2008-09-15 09:07:58 +0100 (Mon, 15 Sep 2008) $

  */

 public class Axis2TokenAuthenticationPolicy {

-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

-    public static final QName AXIS2_TOKEN_AUTHENTICATION_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "axis2TokenAuthentication");

+    private static final String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";

+    public static final QName AXIS2_TOKEN_AUTHENTICATION_POLICY_QNAME = new QName(SCA11_TUSCANY_NS, "axis2TokenAuthentication");

     public static final String AXIS2_TOKEN_AUTHENTICATION_TOKEN_NAME = "tokenName";

 

     private QName tokenName;

diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
index 7dde20af87..61624bb346 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
@@ -41,7 +41,7 @@ import org.apache.tuscany.sca.monitor.Monitor;
  * @version $Rev: 695374 $ $Date: 2008-09-15 09:07:58 +0100 (Mon, 15 Sep 2008) $

  */

 public class Axis2TokenAuthenticationPolicyProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Axis2TokenAuthenticationPolicy> {

-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

+    private static final String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";

     

     public QName getArtifactType() {

         return Axis2TokenAuthenticationPolicy.AXIS2_TOKEN_AUTHENTICATION_POLICY_QNAME;

@@ -89,7 +89,7 @@ public class Axis2TokenAuthenticationPolicyProcessor extends BaseStAXArtifactPro
         writer.writeStartElement(prefix, 

                                  getArtifactType().getLocalPart(),

                                  getArtifactType().getNamespaceURI());

-        writer.writeNamespace("tuscany", SCA10_TUSCANY_NS);

+        writer.writeNamespace("tuscany", SCA11_TUSCANY_NS);

 

         if ( policy.getTokenName() != null ) {

             writer.writeStartElement(prefix, 

diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
index 41682c29b1..0046d3d6ca 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.policy.PolicySet;
 

 /**

  * Policy handler to handle PolicySet related to Logging with the QName

- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy

+ * {http://tuscany.apache.org/xmlns/sca/1.1/impl/java}LoggingPolicy

  *

  * @version $Rev: 698457 $ $Date: 2008-09-24 09:13:02 +0100 (Wed, 24 Sep 2008) $

  */

diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
index e02aa52b79..cf081e1121 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
@@ -35,7 +35,7 @@ import org.apache.tuscany.sca.policy.security.SecurityUtil;
 

 /**

  * Policy handler to handle PolicySet related to Logging with the QName

- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy

+ * {http://tuscany.apache.org/xmlns/sca/1.1/impl/java}LoggingPolicy

  *

  * @version $Rev: 721811 $ $Date: 2008-11-30 13:46:51 +0000 (Sun, 30 Nov 2008) $

  */

diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
index 50388aef28..f25bd8c0cc 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
@@ -27,8 +27,8 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public class Axis2HeaderPolicy {
-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    public static final QName AXIS2_HEADER_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "axis2Header");
+    private static final String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
+    public static final QName AXIS2_HEADER_POLICY_QNAME = new QName(SCA11_TUSCANY_NS, "axis2Header");
     public static final String AXIS2_HEADER_NAME = "headerName";
 
     private QName headerName;
diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
index b6962ff243..70afbd22ee 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
@@ -40,7 +40,7 @@ import org.apache.tuscany.sca.monitor.Monitor;
  * @version $Rev$ $Date$
  */
 public class Axis2HeaderPolicyProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Axis2HeaderPolicy> {
-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    private static final String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
     
     public QName getArtifactType() {
         return Axis2HeaderPolicy.AXIS2_HEADER_POLICY_QNAME;
@@ -88,7 +88,7 @@ public class Axis2HeaderPolicyProcessor extends BaseStAXArtifactProcessor implem
         writer.writeStartElement(prefix, 
                                  getArtifactType().getLocalPart(),
                                  getArtifactType().getNamespaceURI());
-        writer.writeNamespace("tuscany", SCA10_TUSCANY_NS);
+        writer.writeNamespace("tuscany", SCA11_TUSCANY_NS);
 
         if ( policy.getHeaderName() != null ) {
             writer.writeStartElement(prefix, 
diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
index 78adfae484..35c8a68be2 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
  * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
+ * {http://tuscany.apache.org/xmlns/sca/1.1/impl/java}LoggingPolicy
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
index 860678a4e4..c6758aea48 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
  * Policy handler to handle PolicySet related to Logging with the QName
- * {http://tuscany.apache.org/xmlns/sca/1.0/impl/java}LoggingPolicy
+ * {http://tuscany.apache.org/xmlns/sca/1.1/impl/java}LoggingPolicy
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index 85fb8dd20c..325bd3a09b 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
@@ -58,16 +58,16 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters;
  * @version $Rev$ $Date$
  */
 public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
-    private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+    private final static String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
 
     public static final QName QNAME_WSA_FROM =
         new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_FROM,
                   AddressingConstants.WSA_DEFAULT_PREFIX);
     public static final String TUSCANY_PREFIX = "tuscany";
     public static final QName CALLBACK_ID_REFPARM_QN =
-        new QName(SCA10_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
+        new QName(SCA11_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
     public static final QName CONVERSATION_ID_REFPARM_QN =
-        new QName(SCA10_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
+        new QName(SCA11_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
     
     private Axis2ServiceClient serviceClient;
     private QName wsdlOperationName;
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 ae67fa8a80..8986729df0 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://www.osoa.org/xmlns/sca/1.0", "transport.jms");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "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 13e32b0bfd..f85f982eca 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,12 +34,12 @@ import org.apache.tuscany.sca.policy.PolicySubject;
  */
 public class AxisPolicyHelper {
 
-    public static final String XMLNS_SCA_1_0 = "http://www.osoa.org/xmlns/sca/1.0";
-    public static final QName AUTHENTICATION_INTENT = new QName(XMLNS_SCA_1_0, "authentication");
-    public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_1_0, "confidentiality");
-    public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_1_0, "integrity");
-    public static final QName MTOM_INTENT = new QName(XMLNS_SCA_1_0, "MTOM");
-    public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_1_0, "SOAP12");
+    public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    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");
+    public static final QName MTOM_INTENT = new QName(XMLNS_SCA_11, "MTOM");
+    public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_11, "SOAP12");
 
     public static PolicySet getPolicySet(Binding wsBinding, QName intentName) {
         PolicySet returnPolicySet = null;
diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/java/sca/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 32b042402b..9f9d98d861 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
@@ -17,4 +17,4 @@
 # 

 # PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

 # handler classname;qname=<policy intent addressed>;model=<policy model class>

-org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#wsAuthentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

+org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.1#wsAuthentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

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

 

diff --git a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
index fa078d59e9..21c52c432f 100644
--- a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
+++ b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
@@ -59,7 +59,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://www.osoa.org/xmlns/sca/1.0", "SOAP.1_2");
+    private static final QName SOAP12_INTENT = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "SOAP.1_2");
 
     public static boolean printWSDL;     // external code sets this to print generated WSDL
 
diff --git a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index b74358a0a1..f79d70dd83 100644
--- a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/java/sca/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://www.osoa.org/xmlns/sca/1.0", "transport.jms");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "transport.jms");
     private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
     private static final String ADDRESS = "Address";
 
diff --git a/java/sca/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/java/sca/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
index 55644c27e5..5fefb6d4b5 100644
--- a/java/sca/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
+++ b/java/sca/modules/implementation-node-runtime/src/test/resources/TestComposite.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:tuscany="http://tuscany.apache.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"
 	targetNamespace="http://sample/composite"
 	xmlns:sc="http://sample/composite"
 	name="TestComposite">
diff --git a/java/sca/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/java/sca/modules/implementation-node-runtime/src/test/resources/TestNode.composite
index d4dc62a42d..90c0c9b8b1 100644
--- a/java/sca/modules/implementation-node-runtime/src/test/resources/TestNode.composite
+++ b/java/sca/modules/implementation-node-runtime/src/test/resources/TestNode.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:tuscany="http://tuscany.apache.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"
 	targetNamespace="http://sample/node"
 	xmlns:sc="http://sample/composite"
 	name="TestNode">
diff --git a/java/sca/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/java/sca/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index 0608e70ca5..df35935fd5 100644
--- a/java/sca/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/java/sca/modules/node-launcher-equinox/src/test/resources/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:tuscany="http://tuscany.apache.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"

 	targetNamespace="http://sample/composite"

 	xmlns:sc="http://sample/composite"

 	name="HelloWorld">