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

12 files changed, 24 insertions, 24 deletions

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 449f3c46ae..961a40b841 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 	xmlns:x="http://x"

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

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 3ebb3a82e1..9a43d44377 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<constrainingType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<constrainingType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 	xmlns:calc="http://calc"
 	targetNamespace="http://calc"
 	name="CalculatorComponent">
diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index a1a12ae72f..2f4518a42c 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
 
   <service name="CalculatorService">
         <interface.java interface="calculator.CalculatorService" />
diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index 4ee201641f..d713a381f9 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.

 -->

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

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

            targetNamespace="http://temp" 

            name="composite1"> 

   <component name="data7"> 

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index bc838c7fa8..bf3676c585 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

 	name="Calculator">

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

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

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

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

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

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

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

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

 

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index f5b5326494..998a49226b 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
@@ -24,10 +24,10 @@
 	policySets="" requires=""
 	targetNamespace="http://calc"
 	xmlns:tns="http://calc"
-	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200712 http://docs.oasis-open.org/ns/opencsa/sca/200712 ">
+	xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200903 http://docs.oasis-open.org/ns/opencsa/sca/200903 ">
 	
   <include name="tns:CompleteDivide"/>
   
diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 459d0c9de0..9d5dcead7c 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
@@ -20,9 +20,9 @@
 

 <composite autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator" 

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

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

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

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

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

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

 

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index 5729038344..bb1f3118ce 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
@@ -19,7 +19,7 @@
 -->

 <sca:definitions xmlns="http://test"

  			targetNamespace="http://test"

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

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

 

 <!-- simple intent -->

  <sca:intent name="tuscanyIntent_1" 

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 310c3db825..6aa2ab4979 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 	xmlns:calc="http://localcalc"

 	xmlns:test="http://testlocal"

 	targetNamespace="http://localcalc"

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index 216cb29b0a..c59fb3537b 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

 

     <!-- Extension Types Metadata -->

     <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />

@@ -38,7 +38,7 @@
     </intent>

 

     <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"

-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

         <wsp:PolicyAttachment>

             <!-- policy expression and policy subject for

                  "basic authentication" -->

@@ -51,7 +51,7 @@
 

     <!-- POLICY SETS -->

     <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"

-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

         <wsp:PolicyAttachment>

             <!-- policy expression and policy subject for

                  "basic authentication" -->

@@ -63,7 +63,7 @@
     </policySet>

 

     <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"

-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

         <intentMap provides="test:confidentiality" default="transport">

             <qualifier name="transport">

                 <wsp:PolicyAttachment>

@@ -80,7 +80,7 @@
     </policySet>

 

     <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"

-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

         <intentMap provides="test:confidentiality" default="message">

             <qualifier name="message">

                 <wsp:PolicyAttachment>

@@ -99,13 +99,13 @@
     </policySet>

 

     <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"

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

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

         <policySetReference name="test:AuthenticationPolicies" />

         <policySetReference name="test:ConfidentialityPolicies" />

     </policySet>

 

     <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"

-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

         <wsp:PolicyAttachment>

             <!-- policy expression and policy subject for "basic

         authentication" -->

@@ -113,7 +113,7 @@
     </policySet>

 

     <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"

-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

         <intentMap provides="test:confidentiality" default="transport">

             <qualifier name="transport">

                 <wsp:PolicyAttachment>

@@ -133,7 +133,7 @@
     </policySet>

 

     <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"

-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"

+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"

         xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

         <wsp:Policy>

             <wsp:ExactlyOne>