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

213 files changed, 335 insertions, 335 deletions

diff --git a/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite b/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite
index f7305351be..309311e258 100644
--- a/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.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://callback"
 	name="CallBackApiTest">
  	      
diff --git a/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 4b3e8ff21c..6e049d603e 100644
--- a/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://callback"
     xmlns:t="http://callback">
     <deployable composite="t:CallBackApiTest" />
 </contribution>
\ No newline at end of file
diff --git a/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index add67bb498..87cde940e1 100644
--- a/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.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://callback"
 	name="CallBackBasicTest">
  	      
diff --git a/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index 6088a1d666..5816a12c70 100644
--- a/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://callback"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://callback"
     xmlns:t="http://callback">
     <deployable composite="t:CallBackBasicTest" />
 </contribution>
\ No newline at end of file
diff --git a/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 21b7946a98..2eea567fff 100644
--- a/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.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://callback"
 	name="CallBackCTypeTest">
  	      
diff --git a/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index 0d37198fce..af0b373472 100644
--- a/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.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="CallBackCTypeService">

      <interface.java interface="org.apache.tuscany.sca.test.CallBackCTypeService" 

diff --git a/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite b/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite
index f1bee66af0..a2b69afe69 100644
--- a/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.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://callback"
 	name="CallBackIdTest">
  	      
diff --git a/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3ed96dd215..ddf25b2578 100644
--- a/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/java/sca/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.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://callback"

 	name="CallbackMultiWireTest">

 

diff --git a/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index c20cf91b7d..a6e2c35761 100644
--- a/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/java/sca/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.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" targetNamespace="http://callback" name="CallBackSeparateThreadTest">

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://callback" name="CallBackSeparateThreadTest">

  	      

     <component name="CallBackSeparateThreadClient">

 		<implementation.java class="org.apache.tuscany.sca.itest.CallBackSeparateThreadClientImpl"/>

diff --git a/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 8165454ea8..274337fabc 100644
--- a/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.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://callback"
 	name="CallBackSetCallbackTest">
  	      
diff --git a/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index 15664b1231..831e488f1b 100644
--- a/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.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://callback"
 	name="CallBackSetCallbackConvTest">
  	      
diff --git a/java/sca/itest/component-type/src/main/resources/Calculator.composite b/java/sca/itest/component-type/src/main/resources/Calculator.composite
index 626e2a603b..1245792edb 100644
--- a/java/sca/itest/component-type/src/main/resources/Calculator.composite
+++ b/java/sca/itest/component-type/src/main/resources/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"

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="Calculator">

diff --git a/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index b3941440ba..78e169deb4 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/java/sca/itest/component-type/src/main/resources/calculator/AddServiceImpl.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="AddService">

      <interface.java interface="calculator.AddService"/> 

diff --git a/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 554847f0e0..5d66becedf 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/java/sca/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.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/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index adb0a3d490..22236ae0d0 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/java/sca/itest/component-type/src/main/resources/calculator/DivideServiceImpl.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="DivideService">

      <interface.java interface="calculator.DivideService"/> 

diff --git a/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 6d0915403a..2035d617e5 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/java/sca/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.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="MultiplyService">

      <interface.java interface="calculator.MultiplyService"/> 

diff --git a/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 2ce72b4d47..fe76f553be 100644
--- a/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/java/sca/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.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="SubtractService">

      <interface.java interface="calculator.SubtractService"/> 

diff --git a/java/sca/itest/conversations/src/main/resources/ConversationAge.composite b/java/sca/itest/conversations/src/main/resources/ConversationAge.composite
index cd82031453..6674c87d77 100644
--- a/java/sca/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/java/sca/itest/conversations/src/main/resources/ConversationAge.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"

 	name="ConversationalIdTest">

  	      

     <component name="ConversationAgeComponent">

diff --git a/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite b/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite
index 68070d7446..3fbffdc660 100644
--- a/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ b/java/sca/itest/conversations/src/main/resources/ConversationUniqueId.composite
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
     targetNamespace="http://conversations"
     name="ConversationUniqueIdTest">
 
diff --git a/java/sca/itest/conversations/src/main/resources/conversationId.composite b/java/sca/itest/conversations/src/main/resources/conversationId.composite
index 2abada3397..50ffdea701 100644
--- a/java/sca/itest/conversations/src/main/resources/conversationId.composite
+++ b/java/sca/itest/conversations/src/main/resources/conversationId.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"

 	name="ConversationalIdTest">

  	      

     <component name="ConversationIdComponent">

diff --git a/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite b/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite
index 4e994de7ce..538e2f63fd 100644
--- a/java/sca/itest/conversations/src/main/resources/conversationLifetime.composite
+++ b/java/sca/itest/conversations/src/main/resources/conversationLifetime.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://conversations"
 	name="conversationLifetimeTest">
 
diff --git a/java/sca/itest/conversations/src/main/resources/conversational.composite b/java/sca/itest/conversations/src/main/resources/conversational.composite
index abe13badb8..dba9cec03f 100644
--- a/java/sca/itest/conversations/src/main/resources/conversational.composite
+++ b/java/sca/itest/conversations/src/main/resources/conversational.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://conversations"

 	name="ConversationalITest">

  	      

diff --git a/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite b/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite
index 4c196247d3..d42866303e 100644
--- a/java/sca/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/java/sca/itest/exceptions/src/main/resources/ExceptionTest.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" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:foo="http://foo" targetNamespace="http://foo"
   name="ExceptionTest">
   <component name="main">
     <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl" />
diff --git a/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite b/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite
index ec5adc67e6..8b3d0e8f63 100644
--- a/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/java/sca/itest/interfaces/src/main/resources/InterfacesTest.composite
@@ -16,7 +16,7 @@
     * specific language governing permissions and limitations

     * under the License.

 -->

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

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

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

 

     <component name="LocalClientComponent">

diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index f5935ca16a..090bc49a41 100644
--- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
@@ -18,10 +18,10 @@
  * under the License.    
  -->
 <composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
            xmlns:foo="http://foo" 
            xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           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" 
            name="TotalComposite1Auto"
            targetNamespace="http://foo" 
            local="true" 
diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index 00f55085be..8c1a9a2f72 100644
--- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
@@ -18,10 +18,10 @@
  * under the License.    
  -->
 <composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
            xmlns:foo="http://foo" 
            xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           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" 
            name="TotalComposite2Auto"
            targetNamespace="http://foo" 
            local="true" 
diff --git a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 3b7d40cbc0..884a8b0a96 100644
--- a/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/java/sca/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
@@ -18,10 +18,10 @@
  * under the License.    
  -->
 <composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
            xmlns:foo="http://foo" 
            xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-           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" 
            name="TotalComposite3Auto"
            targetNamespace="http://foo" 
            local="true" 
diff --git a/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index c766523e1b..46cc6fa8da 100644
--- a/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
@@ -16,7 +16,7 @@
     * specific language governing permissions and limitations

     * under the License.

 -->

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

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

     name="AutowireReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">

 

     <service name="AComponent" promote="AComponent">

diff --git a/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite b/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
index 30af4621ed..02ee7dd3f7 100644
--- a/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
@@ -16,7 +16,7 @@
     * specific language governing permissions and limitations

     * under the License.

 -->

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

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

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

 

     <service name="AComponent" promote="AComponent">

diff --git a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index 8b243e280d..084b86a3b1 100644
--- a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
@@ -16,7 +16,7 @@
     * specific language governing permissions and limitations
     * under the License.
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:foo="http://foo" targetNamespace="http://foo"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:foo="http://foo" targetNamespace="http://foo"
     name="ManualWiredReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">
 
     <service name="AComponent" promote="AComponent">
diff --git a/java/sca/itest/scopes/src/main/resources/scopes.composite b/java/sca/itest/scopes/src/main/resources/scopes.composite
index 6e706ca485..ac6de1b8bc 100644
--- a/java/sca/itest/scopes/src/main/resources/scopes.composite
+++ b/java/sca/itest/scopes/src/main/resources/scopes.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"

        name="Scopes">

 

     <!-- Components used to test scopes. -->

diff --git a/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml
index 60b8a9c931..a3c87f60c7 100644
--- a/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/itest/services/src/main/resources/META-INF/sca-contribution.xml
@@ -17,6 +17,6 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://foo" xmlns:foo="http://foo">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://foo" xmlns:foo="http://foo">
     <deployable composite="foo:InnerServicesTest" />
 </contribution>
\ No newline at end of file
diff --git a/java/sca/itest/services/src/main/resources/ServicesTest.composite b/java/sca/itest/services/src/main/resources/ServicesTest.composite
index 14cc7ba860..9b7a30d850 100644
--- a/java/sca/itest/services/src/main/resources/ServicesTest.composite
+++ b/java/sca/itest/services/src/main/resources/ServicesTest.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" xmlns:foo="http://foo" targetNamespace="http://foo"

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

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

 

     <component name="AComponent1">

diff --git a/java/sca/itest/wires/src/main/resources/WireTest.composite b/java/sca/itest/wires/src/main/resources/WireTest.composite
index 5f68a84eeb..fc8f61f459 100644
--- a/java/sca/itest/wires/src/main/resources/WireTest.composite
+++ b/java/sca/itest/wires/src/main/resources/WireTest.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" targetNamespace="http://wires" name="WireTest">

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://wires" name="WireTest">

 

     <component name="WireClient">

         <implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/>

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index b952ea363f..ce8b461a27 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface Constants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
     
     String COMPONENT_TYPE = "componentType";
diff --git a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index aae6bfa3ff..1da30f637c 100644
--- a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,6 +16,6 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#componentType,model=org.apache.tuscany.sca.assembly.ComponentType
-org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
-org.apache.tuscany.sca.assembly.xml.CompositeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#composite,model=org.apache.tuscany.sca.assembly.Composite
+org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#componentType,model=org.apache.tuscany.sca.assembly.ComponentType
+org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
+org.apache.tuscany.sca.assembly.xml.CompositeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#composite,model=org.apache.tuscany.sca.assembly.Composite
diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
index 5c7617e145..a4f0da5ae9 100644
--- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
+++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
@@ -49,8 +49,8 @@ public class ReadWriteAnyAttributeTestCase {
     private static final QName EXTENDED_ATTRIBUTE = new QName("http://test", "customAttribute");
     
     private static final String XML = "<?xml version='1.0' encoding='UTF-8'?>"+
-		 	 "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" " +
-		 	            "xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" " +
+		 	 "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" " +
+		 	            "xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" " +
 		 	            "targetNamespace=\"http://calc\" " +
 		 	            "name=\"Calculator\">"+
  	 	 	    "<component name=\"AddServiceComponent\" xmlns:test=\"http://test\" test:customAttribute=\"customValue\">"+
diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
index 575a853faf..256c706035 100644
--- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
+++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
@@ -43,7 +43,7 @@ import org.junit.Test;
 public class ReadWriteAnyElementTestCase {
     private static final String XML_RECURSIVE_EXTENDED_ELEMENT =
         "<?xml version='1.0' encoding='UTF-8'?>" +
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" targetNamespace=\"http://temp\" name=\"RecursiveExtendedElement\">" +
+        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://temp\" name=\"RecursiveExtendedElement\">" +
          "<unknownElement>" +
            "<subUnknownElement1 attribute=\"anyAttribute\" />" +
            "<subUnknownElement2 />" +
@@ -52,7 +52,7 @@ public class ReadWriteAnyElementTestCase {
 
     private static final String XML_UNKNOWN_IMPL =
         "<?xml version='1.0' encoding='UTF-8'?>" + 
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
+        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
          "<component name=\"unknownImpl\">" +
            "<implementation.unknown class=\"raymond\" />" +
            "<service name=\"service\">" +
@@ -63,7 +63,7 @@ public class ReadWriteAnyElementTestCase {
 
     private static final String XML_UNKNOWN_IMPL_WITH_INVALID_ATTRIBUTE =
         "<?xml version='1.0' encoding='UTF-8'?>" + 
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
+        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://temp\" name=\"aaaa\" autowire=\"false\">" +
          "<component name=\"unknownImpl\">" +
            "<implementation.unknown class=\"raymond\" />" +
            "<service name=\"service\" requires=\"\">" +
diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index e18e436d28..6c8aa9acc9 100644
--- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
+++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
@@ -52,7 +52,7 @@ public class ReadWriteLocalCompositeTestCase {
     private ExtensibleStAXArtifactProcessor staxProcessor;

 

     private static final String LOCAL_COMPOSITE_XML = "<?xml version='1.0' encoding='UTF-8'?>"+

-    "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" targetNamespace=\"http://localcalc\" name=\"LocalCalculator\" local=\"true\">"+

+    "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://localcalc\" name=\"LocalCalculator\" local=\"true\">"+

     "</composite>";

     

     @Before

diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index c1e0692724..d41881dc37 100644
--- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
@@ -155,7 +155,7 @@ public class TestSCABindingImpl implements SCABinding, OptimizableBinding, Polic
     }
     
     private class TestSCABindingType implements ExtensionType {
-        private QName name = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712","binding");
+        private QName name = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903","binding");
         public QName getBaseType() {
             return BINDING_BASE;
         }
diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index 8aab70b58d..1877470cd3 100644
--- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
@@ -152,7 +152,7 @@ public class WriteAllTestCase {
         assertEquals(composite.getProperties().get(1).getName(),"prop2");
         assertEquals(composite.getProperties().get(1).isMustSupply(), true);
         assertEquals(composite.getProperties().get(0).getXSDType(), new QName("http://foo", "MyComplexType"));
-        assertEquals(composite.getProperties().get(1).getXSDElement(), new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "MyComplexPropertyValue1"));
+        assertEquals(composite.getProperties().get(1).getXSDElement(), new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "MyComplexPropertyValue1"));
     }
 
 }
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>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-schema-200803.xsd
index f2fb26c373..baa6317ef9 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-schema-200803.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    

    <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>

 

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-schema-200803.xsd
index 4c0384fc45..6a9f3910a0 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-schema-200803.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    elementFormDefault="qualified">

 

    <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-schema-200803.xsd
index ec63e7daed..eea0020a38 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-schema-200803.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    elementFormDefault="qualified">

 

    <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
index 0769e33a5f..ce2771d371 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema"

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

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

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

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

 	elementFormDefault="qualified">

 

 	<include schemaLocation="sca-contribution-1.1-schema-200803.xsd" />

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1-1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1-1-cd02.xsd
index c92ac47580..bf43db5800 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1-1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1-1-cd02.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema"

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

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

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

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

 	elementFormDefault="qualified">

 

 	<include schemaLocation="sca-contribution-1.1-schema-200803.xsd" />

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-schema-200803.xsd
index 285d7645cb..97d90db1c3 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-core-1.1-schema-200803.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 

      OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    elementFormDefault="qualified">

 

    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-schema-200803.xsd
index 5ecd364e19..c4796b4b0c 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-schema-200803.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. 

      OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    elementFormDefault="qualified">

    

    <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
index 9adfca6f55..b9269f7c20 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema"

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

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

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

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

 	elementFormDefault="qualified">

 

 	<include schemaLocation="sca-core-1.1-schema-200803.xsd" />

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-schema-200803.xsd
index 32113e31b8..f8b6e2e024 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-schema-200803.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    elementFormDefault="qualified">

 

    <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
index 18732d5e6a..e2b8c63b80 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema"

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

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

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

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

 	elementFormDefault="qualified">

 

 	<include schemaLocation="sca-core-1.1-schema-200803.xsd" />

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-schema-200803.xsd
index f261febcf7..9d6494c826 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-schema-200803.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    elementFormDefault="qualified">

    

    <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
index 6f1a006a44..ed681093f7 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema"

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

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

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

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

 	elementFormDefault="qualified">

 

 	<include schemaLocation="sca-core-1.1-schema-200803.xsd" />

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
index 4f8da099d6..6583db00b6 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema"

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

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

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

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

 	elementFormDefault="qualified">

 

 	<include schemaLocation="sca-core-1.1-schema-200803.xsd" />

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-schema-200803.xsd
index 5dbdd0ca7d..05197c1310 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-schema-200803.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    elementFormDefault="qualified">

    

    <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-schema-200803.xsd
index dad1f1a42a..40fa99daaa 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-schema-200803.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- Copyright(C) OASIS(R) 2005,2008. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema" 

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

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

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

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

    elementFormDefault="qualified">

    

    <include schemaLocation="sca-core-1.1-schema-200803.xsd"/>

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-schema-200803.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-schema-200803.xsd
index 0d29fbae35..ff9b43e53b 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-schema-200803.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-schema-200803.xsd
@@ -2,8 +2,8 @@
 <!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 

      OASIS trademark, IPR and other policies apply.  -->

 <schema xmlns="http://www.w3.org/2001/XMLSchema"

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

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

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

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

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

 	elementFormDefault="qualified">

 

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
index e357e212d3..6c3d45c4d4 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="binding.dwr" type="t:DWRBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
index 19cd511ad3..8c1efcbb63 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="binding.http" type="t:HTTPBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
index 292ccfef34..c6a653f178 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
index b008494c0f..dbb50cfd2d 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="binding.rmi" type="t:RMIBinding"/>
     
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
index 1b8bca1e30..20cb1565a8 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-node.xsd
@@ -19,11 +19,11 @@
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-core-1.1-schema-200803.xsd"/>
 
     <element name="implementation.node" type="t:NodeImplementation"/>
     	
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index 27e8760bb5..f64930e788 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
@@ -22,7 +22,7 @@
     
     <import namespace="http://www.w3.org/2004/08/wsdl-instance" schemaLocation="wsdli.xsd"/>
     
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-1.1-schema-200803.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-schema-200803.xsd"/>
     
     <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
index 124b8b05af..ceeef8f983 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
@@ -54,7 +54,7 @@ import org.apache.tuscany.sca.policy.PolicySubject;
  * @version $Rev$ $Date$
  */
 public abstract class BaseBuilderImpl implements CompositeBuilder {
-    protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    protected static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     protected static final String BINDING_SCA = "binding.sca";
     protected static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA);
 
diff --git a/java/sca/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType b/java/sca/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
index 225eef119d..6def6715fd 100644
--- a/java/sca/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
+++ b/java/sca/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <service name="HelloWorldService">
         <interface.java interface="helloworld.HelloWorldService"/>
     </service>
diff --git a/java/sca/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType b/java/sca/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
index 02a209a538..5a68cdde8d 100644
--- a/java/sca/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/java/sca/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
     <service name="HelloWorldRmiService">
         <interface.java interface="helloworld.HelloWorldRmiService"/>
diff --git a/java/sca/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite b/java/sca/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
index 64b2554dbd..b71d789c74 100644
--- a/java/sca/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
+++ b/java/sca/modules/binding-rmi-runtime/src/test/resources/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"
            name="HelloWorldRmiComposite">
 
diff --git a/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
index 92581b6e0f..372abb5fb3 100644
--- a/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
+++ b/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
@@ -49,7 +49,7 @@ public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding> {
 	private static final String NAME = "name";
 	private static final String URI = "uri";
 	
-	private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+	private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     private static final String BINDING_SCA = "binding.sca";
     private static final QName BINDING_SCA_QNAME = new QName(SCA11_NS, BINDING_SCA);
     
diff --git a/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ea688c96b8..9d522c352c 100644
--- a/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding
+org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding
diff --git a/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index 8b1bc21277..f25ced7f8f 100644
--- a/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
@@ -66,7 +66,7 @@ public class WriteTestCase {
         assertNotNull(componentType);
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\"><service name=\"CalculatorService\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><reference name=\"addService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></reference></componentType>",
+        assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\"><service name=\"CalculatorService\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><reference name=\"addService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></reference></componentType>",
         		     bos.toString());
         }
 
@@ -78,7 +78,7 @@ public class WriteTestCase {
         assertNotNull(composite);
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?><composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" targetNamespace=\"http://calc\" name=\"Calculator\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><component name=\"CalculatorServiceComponent\"><implementation.java class=\"calculator.CalculatorServiceImpl\" /><reference name=\"addService\" target=\"AddServiceComponent\"><binding.sca /></reference><reference name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference name=\"divideService\" target=\"DivideServiceComponent\" /></component><component name=\"AddServiceComponent\"><implementation.java class=\"calculator.AddServiceImpl\" /><service name=\"AddService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></service></component><component name=\"SubtractServiceComponent\"><implementation.java class=\"calculator.SubtractServiceImpl\" /></component><component name=\"MultiplyServiceComponent\"><implementation.java class=\"calculator.MultiplyServiceImpl\" /></component><component name=\"DivideServiceComponent\"><implementation.java class=\"calculator.DivideServiceImpl\" /></component></composite>",
+        assertEquals("<?xml version='1.0' encoding='UTF-8'?><composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns1=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://calc\" name=\"Calculator\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><component name=\"CalculatorServiceComponent\"><implementation.java class=\"calculator.CalculatorServiceImpl\" /><reference name=\"addService\" target=\"AddServiceComponent\"><binding.sca /></reference><reference name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference name=\"divideService\" target=\"DivideServiceComponent\" /></component><component name=\"AddServiceComponent\"><implementation.java class=\"calculator.AddServiceImpl\" /><service name=\"AddService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></service></component><component name=\"SubtractServiceComponent\"><implementation.java class=\"calculator.SubtractServiceImpl\" /></component><component name=\"MultiplyServiceComponent\"><implementation.java class=\"calculator.MultiplyServiceImpl\" /></component><component name=\"DivideServiceComponent\"><implementation.java class=\"calculator.DivideServiceImpl\" /></component></composite>",
                      bos.toString());
     }
 
diff --git a/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite b/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite
index 09a90ac54c..c404b3bcd4 100644
--- a/java/sca/modules/binding-sca-xml/src/test/resources/Calculator.composite
+++ b/java/sca/modules/binding-sca-xml/src/test/resources/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:calc="http://calc"
         targetNamespace="http://calc"
         name="Calculator">
diff --git a/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
index f43bcec7b8..85535842be 100644
--- a/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
+++ b/java/sca/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.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/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/java/sca/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 5578f597e8..c00df2ef35 100644
--- a/java/sca/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/java/sca/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
  			
 	<sca:bindingType type="sca:binding.sca"  mayProvide="" alwaysProvides=""/>	 		
diff --git a/java/sca/modules/binding-sca/src/test/resources/Calculator.composite b/java/sca/modules/binding-sca/src/test/resources/Calculator.composite
index aea7e62afc..509a320943 100644
--- a/java/sca/modules/binding-sca/src/test/resources/Calculator.composite
+++ b/java/sca/modules/binding-sca/src/test/resources/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:calc="http://calc"

     targetNamespace="http://calc"

     name="Calculator">

diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 8986729df0..dd58b39a1c 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -139,7 +139,7 @@ public class Axis2ServiceProvider {
         new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.EPR_REFERENCE_PARAMETERS);
 
     private static final QName TRANSPORT_JMS_QUALIFIED_INTENT =
-        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "transport.jms");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "transport.jms");
     private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
 
     //Schema element names
diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index f85f982eca..da02d1033e 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
@@ -34,7 +34,7 @@ import org.apache.tuscany.sca.policy.PolicySubject;
  */
 public class AxisPolicyHelper {
 
-    public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    public static final String XMLNS_SCA_11 = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     public static final QName AUTHENTICATION_INTENT = new QName(XMLNS_SCA_11, "authentication");
     public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_11, "confidentiality");
     public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_11, "integrity");
diff --git a/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index b98780d221..f8b5b2063c 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
@@ -20,9 +20,9 @@
 

 <!-- $Rev$ $Date$ -->

 

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

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

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

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

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

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

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

             

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

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
index bf709f3c50..37c9f336f9 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="HelloWorld">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
index 2a76226c28..471c9bf42c 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="HelloWorldNoWSDL">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
index ceb69856e1..85c26b78c1 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="endpoint1">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
index c5f47dffd6..1096b867e2 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="endpoint1">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
index b7a94abdff..0cf9a9ef90 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
index 880561e939..0c74144385 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="endpoint4">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
index 20bcaec381..5554b79216 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="HelloWorld">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
index 637c306747..24594744e5 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="HelloWorldOM-Merged">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
index 28aa1b1083..3d966117f4 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="HelloWorldOM">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
index cd0c8a7d5e..38509f9d2d 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
@@ -20,8 +20,8 @@
 

 <!-- $Rev$ $Date$ -->

 

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

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

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

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

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

            name="HelloWorldPrec">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
index 5bde1fb9ff..3dcef5ab46 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.compositeOFF
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

 	targetNamespace="http://filetransfer"

 	xmlns:hw="http://filetransfer"

     name="filetransferws">

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
index 983a164c26..60673ab103 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite.OFF
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
index 3d43227b94..bc3107c388 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
index bce8b0ae90..ae07495cf3 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
index 23797dc357..1eadd01b81 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

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

 

  <!-- WS Security POLICY SETS -->

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
index faf5285cca..778fb96128 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

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

 

  <sca:intent name="wsAuthentication" 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
index 39ab864037..712948c77a 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite.OFF
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="endpoint3">
            
diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
index 507a90be69..fb08fee447 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
  			targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
  <!-- WS Security POLICY SETS -->
diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
index def62e76a8..780130e699 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite.OFF
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
index 9f331b9cdd..dd0a102476 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
index a6c468c8c3..904c0b469e 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite.OFF
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

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

            name="endpoint3">

            

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index b4ef457507..12f4a6febd 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

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

  

  <!-- WS Security POLICY SETS -->

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
index c8f9b53770..f92c4356a8 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

            name="QuestionMarkWSDLImport">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
index 9559c75af8..73804b87ca 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

            name="QuestionMarkWSDLInclude">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
index af2b0f3608..affedb23a8 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
-			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"

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

 			targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2"
            name="QuestionMarkWSDLTests">
 
diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
index ca0598e325..f7caa55fce 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="HelloWorld">

 

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
index 17293cdc94..6118743da3 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite.OFF
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

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

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

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

            name="QuestionMarkWSDLTests">

 

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 21c52c432f..b391a66c20 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://docs.oasis-open.org/ns/opencsa/sca/200712", "SOAP.1_2");
+    private static final QName SOAP12_INTENT = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "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 f79d70dd83..6d11febc5b 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://docs.oasis-open.org/ns/opencsa/sca/200712", "transport.jms");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "transport.jms");
     private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
     private static final String ADDRESS = "Address";
 
diff --git a/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index 9706ef1771..46330c13f5 100644
--- a/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface WebServiceConstants {
-	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
 	
     String BINDING_WS = "binding.ws";
     QName BINDING_WS_QNAME = new QName(SCA11_NS, BINDING_WS);
diff --git a/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6f5623f543..351e436807 100644
--- a/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding
+org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding
diff --git a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
index 0d337c7eb3..5019278210 100644
--- a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
+++ b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

     xmlns:calc="http://sample.calculator"

     targetNamespace="http://calc"

     xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"

diff --git a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index a4d05cc0ec..1952d83755 100644
--- a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 	xmlns:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index 09410fdc37..6d36198124 100644
--- a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">
 
   <service name="CalculatorService">
diff --git a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
index da55dfc7b9..b1e3b11e99 100644
--- a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
+++ b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 	xmlns:calc="http://sample.calculator"

 	targetNamespace="http://calc"

 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"

diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index 5997aee015..6decc004a6 100644
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
@@ -45,7 +45,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class JavaExportProcessor implements StAXArtifactProcessor<JavaExport> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     
     private static final QName EXPORT_JAVA = new QName(SCA11_NS, "export.java");
     
diff --git a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index e272c60058..48a1698bf4 100644
--- a/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
@@ -45,7 +45,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class JavaImportProcessor  implements StAXArtifactProcessor<JavaImport> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     
     private static final QName IMPORT_JAVA = new QName(SCA11_NS, "import.java");
 
diff --git a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1a8fd93a60..5f7bff394b 100644
--- a/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License. 
 
-org.apache.tuscany.sca.contribution.java.impl.JavaImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
-org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport
+org.apache.tuscany.sca.contribution.java.impl.JavaImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
+org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport
diff --git a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index 0620647da3..c6bd430e96 100644
--- a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
@@ -51,11 +51,11 @@ public class JavaExportProcessorTestCase {
 
     private static final String VALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\"/>";
+            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\"/>";
 
     private static final String INVALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\"/>";
+            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
diff --git a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index f3a6caf2b6..7bcafd6c48 100644
--- a/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
@@ -50,11 +50,11 @@ public class JavaImportProcessorTestCase {
 
     private static final String VALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\" location=\"sca://contributions/001\"/>";
+            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\" location=\"sca://contributions/001\"/>";
 
     private static final String INVALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
+            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
diff --git a/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index 44a4c5eb63..55f58b8328 100644
--- a/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
@@ -46,7 +46,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  */
 public class NamespaceExportProcessor implements StAXArtifactProcessor<NamespaceExport> {
 
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     private static final QName EXPORT = new QName(SCA11_NS, "export");
     private static final String NAMESPACE = "namespace";
     
diff --git a/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index 7206f391c3..4c9129a0e4 100644
--- a/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
@@ -45,7 +45,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class NamespaceImportProcessor  implements StAXArtifactProcessor<NamespaceImport> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     
     private static final QName IMPORT = new QName(SCA11_NS, "import");
 
diff --git a/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7f01dd6a0a..4eefa684db 100644
--- a/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License. 
 
-org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
-org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#export,model=org.apache.tuscany.sca.contribution.namespace.NamespaceExport
+org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
+org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#export,model=org.apache.tuscany.sca.contribution.namespace.NamespaceExport
diff --git a/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index 81e55309db..109fa59855 100644
--- a/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
@@ -49,10 +49,10 @@ import org.junit.Test;
 public class NamespaceExportProcessorTestCase {
 
     private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\" namespace=\"http://foo\"/>";
+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" namespace=\"http://foo\"/>";
 
     private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\"/>";
+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
diff --git a/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index e6c2430282..3ac25d4016 100644
--- a/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
@@ -52,11 +52,11 @@ public class NamespaceImportProcessorTestCase {
 
     private static final String VALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\" namespace=\"http://foo\" location=\"sca://contributions/001\"/>";
+            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" namespace=\"http://foo\" location=\"sca://contributions/001\"/>";
 
     private static final String INVALID_XML =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
+            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
diff --git a/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index da1982e4f7..804af17719 100644
--- a/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
@@ -51,7 +51,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class ContributionMetadataProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<ContributionMetadata> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     
     private static final QName CONTRIBUTION_QNAME = new QName(SCA11_NS, "contribution");
     private static final QName DEPLOYABLE_QNAME = new QName(SCA11_NS, "deployable");
diff --git a/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cc09b15d5b..4c7416d38e 100644
--- a/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.contribution.xml.ContributionMetadataProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
+org.apache.tuscany.sca.contribution.xml.ContributionMetadataProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
 org.apache.tuscany.sca.contribution.processor.xml.AnyElementProcessor;qname=http://www.w3.org/2001/XMLSchema#anyElement,model=java.lang.Object
diff --git a/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index a7b73aa55e..35e8b57136 100644
--- a/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
@@ -54,13 +54,13 @@ import org.junit.Test;
 public class ContributionMetadataProcessorTestCase {
 
     private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\">"
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\">"
             + "<deployable composite=\"ns:Composite1\"/>"
             + "<deployable composite=\"ns:Composite2\"/>"
             + "</contribution>";
 
     private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\">"
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:ns=\"http://ns\">"
             + "<deployable composite=\"ns:Composite1\"/>"
             + "<deployable/>"
             + "</contribution>";
diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
index 0db008ecb9..5fb021b523 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
@@ -27,6 +27,6 @@ package org.apache.tuscany.sca.contribution;
 public interface Constants {
     String XMLSCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
     
-	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
 }
diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index 92af57b007..158b3d7e64 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
@@ -307,7 +307,7 @@ public abstract class BaseStAXArtifactProcessor {
      */
     public static class XAttr {
         
-        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
 
         private String uri = SCA11_NS;
         private String name;
diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
index 37b413027a..9633262116 100644
--- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
+++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
@@ -38,7 +38,7 @@ import org.oasisopen.sca.CallableReference;
 public class XMLStreamReader2CallableReference extends BaseTransformer<XMLStreamReader, CallableReference>

             implements PullTransformer<XMLStreamReader, CallableReference> {

 

-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";

+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";

     private static final String COMPOSITE = "composite";

     private static final QName COMPOSITE_QNAME = new QName(SCA11_NS, COMPOSITE);

     

diff --git a/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java b/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
index 701d80711c..7b80a750d2 100644
--- a/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
+++ b/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
@@ -58,7 +58,7 @@ public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements S
     private DefinitionsFactory definitionsFactory;
     private Monitor monitor;
 
-    public static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    public static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     public static final String BINDING = "binding";
     public static final String IMPLEMENTATION = "implementation";
     public static final String DEFINITIONS = "definitions";
diff --git a/java/sca/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7768f11565..024953e255 100644
--- a/java/sca/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.definitions.xml.DefinitionsProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#definitions,model=org.apache.tuscany.sca.definitions.Definitions
+org.apache.tuscany.sca.definitions.xml.DefinitionsProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#definitions,model=org.apache.tuscany.sca.definitions.Definitions
diff --git a/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
index def310861a..cc36cd69ec 100644
--- a/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
+++ b/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
@@ -60,7 +60,7 @@ public class ReadDocumentTestCase {
     private static Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();

     private static Map<QName, BindingType> bindingTypesTable = new Hashtable<QName, BindingType>();

     private static Map<QName, ImplementationType> implTypesTable = new Hashtable<QName, ImplementationType>();

-    public static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200712";

+    public static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200903";

     public static final String namespace = "http://test";

 

     private static final QName secureWsPolicy = new QName(namespace, "SecureWSPolicy");

diff --git a/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
index 216cb29b0a..c59fb3537b 100644
--- a/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
+++ b/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/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>

diff --git a/java/sca/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/java/sca/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 5578f597e8..c00df2ef35 100644
--- a/java/sca/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/java/sca/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
  			
 	<sca:bindingType type="sca:binding.sca"  mayProvide="" alwaysProvides=""/>	 		
diff --git a/java/sca/modules/endpoint/src/test/resources/Calculator.composite b/java/sca/modules/endpoint/src/test/resources/Calculator.composite
index 20064d6362..cd17d6b0fb 100644
--- a/java/sca/modules/endpoint/src/test/resources/Calculator.composite
+++ b/java/sca/modules/endpoint/src/test/resources/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:calc="http://calc"
     targetNamespace="http://calc"
     name="Calculator">
diff --git a/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index 138dfa8201..57e7a0b6fa 100644
--- a/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
@@ -65,7 +65,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  *  @version $Rev$ $Date$
  */
 public class BPELImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<BPELImplementation> {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     private static final String PROCESS = "process";
     private static final String IMPLEMENTATION_BPEL = "implementation.bpel";
     private static final QName IMPLEMENTATION_BPEL_QNAME = new QName(SCA11_NS, IMPLEMENTATION_BPEL);
diff --git a/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 58eef6eb4b..c5eaf6418e 100644
--- a/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.bpel.xml.BPELImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation
\ No newline at end of file
+org.apache.tuscany.sca.implementation.bpel.xml.BPELImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation
\ No newline at end of file
diff --git a/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index 5541150262..00a70fcb54 100644
--- a/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
@@ -46,7 +46,7 @@ public class BPELImplementationProcessorTestCase extends TestCase {
 
     private static final String COMPOSITE =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
+        + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
             + " <component name=\"BPELHelloWorldComponent\">"
             + "   <implementation.bpel process=\"hns:HelloWorld\" />"
             + " </component>"
@@ -54,7 +54,7 @@ public class BPELImplementationProcessorTestCase extends TestCase {
 
     private static final String COMPOSITE_INVALID =
         "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
+            + "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" xmlns:hns=\"http://tuscany.apache.org/implementation/bpel/example/helloworld\" targetNamespace=\"http://bpel\" name=\"bpel\">"
             + " <component name=\"BPELHelloWorldComponent\">"
             + "   <implementation.bpel/>"
             + " </component>"
diff --git a/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 7dca0af475..3537dc97cf 100644
--- a/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface JavaImplementationConstants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     String IMPLEMENTATION_JAVA = "implementation.java";
     QName IMPLEMENTATION_JAVA_QNAME = new QName(SCA11_NS, "implementation.java");
     String CLASS = "class";
diff --git a/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e13682384f..85f38f04f4 100644
--- a/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation
+org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation
diff --git a/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index c7806cfe78..f4182679bc 100644
--- a/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/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:calc="http://sample.calculator"
 	requires="cns:tuscanyIntent_1"
 	targetNamespace="http://sample.calculator"
diff --git a/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index 7af59d8eb9..cad25f1f73 100644
--- a/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/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/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 781afe1241..00319950c6 100644
--- a/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

 

     <!-- simple intent -->

     <sca:intent name="tuscanyIntent_1" constrains="sca:binding sca:implementation.java">

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 5fefb6d4b5..b8f6dcceb9 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,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://sample/composite"
 	xmlns:sc="http://sample/composite"
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 90c0c9b8b1..3e719ef6ab 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,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://sample/node"
 	xmlns:sc="http://sample/composite"
diff --git a/java/sca/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 6ded321b08..57c77a2029 100644
--- a/java/sca/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.node.xml.NodeImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#implementation.node,model=org.apache.tuscany.sca.implementation.node.NodeImplementation,factory=org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
-org.apache.tuscany.sca.implementation.node.xml.ConfiguredNodeImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#implementation.node.configured,model=org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation,factory=org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
\ No newline at end of file
+org.apache.tuscany.sca.implementation.node.xml.NodeImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.node,model=org.apache.tuscany.sca.implementation.node.NodeImplementation,factory=org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
+org.apache.tuscany.sca.implementation.node.xml.ConfiguredNodeImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.node.configured,model=org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation,factory=org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
\ No newline at end of file
diff --git a/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
index 5fefb6d4b5..b8f6dcceb9 100644
--- a/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
+++ b/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.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://sample/composite"
 	xmlns:sc="http://sample/composite"
diff --git a/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
index d6d23a6935..ef096fe5ae 100644
--- a/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
+++ b/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.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://sample/node"
 	xmlns:sc="http://sample/composite"
diff --git a/java/sca/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1811e5e7d7..94bc8b5bdf 100644
--- a/java/sca/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.web.xml.WebImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#implementation.web,model=org.apache.tuscany.sca.implementation.web.WebImplementation,factory=org.apache.tuscany.sca.implementation.web.WebImplementationFactory
+org.apache.tuscany.sca.implementation.web.xml.WebImplementationProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementation.web,model=org.apache.tuscany.sca.implementation.web.WebImplementation,factory=org.apache.tuscany.sca.implementation.web.WebImplementationFactory
diff --git a/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite b/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
index 6ad02e9962..dddcaf0a23 100644
--- a/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
+++ b/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.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://sample/web"

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

 	name="TestWeb">

diff --git a/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 2c0fb7b364..5e8cf6a433 100644
--- a/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface JavaConstants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     String INTERFACE_JAVA = "interface.java";
     QName INTERFACE_JAVA_QNAME = new QName(SCA11_NS, "interface.java");
     String INTERFACE = "interface";
diff --git a/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index dec635083f..35bc5e8f57 100644
--- a/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
@@ -46,7 +46,7 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfaceContract>, JavaConstants {
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     private JavaInterfaceFactory javaFactory;
     private Monitor monitor;
 
diff --git a/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bca46e7e71..15e027cb2a 100644
--- a/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract
+org.apache.tuscany.sca.interfacedef.java.xml.JavaInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract
diff --git a/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index 9db875f611..ffc38c7f04 100644
--- a/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/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:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	name="Calculator">
diff --git a/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
index ac9f3cb0df..af9c11f341 100644
--- a/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
+++ b/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/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/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index eeb3843842..bf58f29447 100644
--- a/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/java/sca/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/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/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index 1b3066911a..b1c431c19d 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface WSDLConstants {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     String INTERFACE_WSDL = "interface.wsdl";
     QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl");
     String INTERFACE = "interface";
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index d2f73bac61..8c77acc93d 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
@@ -92,8 +92,8 @@ public class WSDLModelResolver implements ModelResolver {
     
     // ---- Policy WSDL Attachments
     
-    public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "requires");
-    public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "endsConversation");
+    public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "requires");
+    public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "endsConversation");
     
     // ---- Stuff added for BPEL extension elements ---  Mike Edwards 01/05/2008
     public static final String ELEM_PLINKTYPE = "partnerLinkType";
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 839fae1d96..b2c8535138 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
+org.apache.tuscany.sca.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index 2301e1ae2d..fcdf69594b 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/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:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
index 7c4c33922e..5e6ae68e11 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/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"
     xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index 2f961caa09..35052dfd6d 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/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"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">
 
   <service name="CalculatorService">
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl b/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
index 89bc7a3a78..813d9e8291 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
+++ b/java/sca/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
@@ -21,7 +21,7 @@
     targetNamespace="http://example.com/stockquote.wsdl"
     xmlns:tns="http://example.com/stockquote.wsdl" 
     xmlns:xsd="http://example.com/stockquote.xsd"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
     xmlns="http://schemas.xmlsoap.org/wsdl/">
 
     <types>
diff --git a/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index 5b1e162003..955d1cf642 100644
--- a/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
@@ -43,9 +43,9 @@ import org.apache.tuscany.sca.xsd.XSDFactory;
  * @version $Rev$ $Date$
  */
 public class WSDLInterfaceIntrospectorImpl {
-    private static final QName POLICY_REQUIRES = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "requires");
-    private static final QName POLICY_CONVERSATIONAL = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "conversational");
-    public static final QName POLICY_END_CONVERSATION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "endsConversation");
+    private static final QName POLICY_REQUIRES = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "requires");
+    private static final QName POLICY_CONVERSATIONAL = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "conversational");
+    public static final QName POLICY_END_CONVERSATION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "endsConversation");
     
     private XSDFactory xsdFactory;
     private PolicyFactory policyFactory;
diff --git a/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
index ad995f8efc..dc0f37b987 100644
--- a/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ b/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
@@ -34,7 +34,7 @@ import org.junit.Test;
  */
 public class NodeImplTestCase {
     private static String composite =
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\""
+        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\""
             + " targetNamespace=\"http://sample/composite\""
             + " xmlns:sc=\"http://sample/composite\""
             + " name=\"HelloWorld2\">"
diff --git a/java/sca/modules/node-impl/src/test/resources/HelloWorld.composite b/java/sca/modules/node-impl/src/test/resources/HelloWorld.composite
index e44e2e2be4..27ddcb94a8 100644
--- a/java/sca/modules/node-impl/src/test/resources/HelloWorld.composite
+++ b/java/sca/modules/node-impl/src/test/resources/HelloWorld.composite
@@ -17,8 +17,8 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

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

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

 	targetNamespace="http://sample/composite"

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

 	name="HelloWorld">

diff --git a/java/sca/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/java/sca/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
index 2304b8a424..1149eb5cbf 100644
--- a/java/sca/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ b/java/sca/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
@@ -18,7 +18,7 @@
 * under the License.    
 -->
 
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" 
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
               xmlns:sc="http://sample/composite">
     <deployable composite="sc:HelloWorld" />
 </contribution>
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 df35935fd5..e232226fd3 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,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://sample/composite"

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

diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index 8644cd5f40..8b0bbd54ff 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
@@ -30,7 +30,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public class AuthorizationPolicy {
-    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     // private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
     public static final QName NAME = new QName(SCA11_NS, "authorization");
 
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index d946adb812..28ffcaf348 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public class SecurityIdentityPolicy {
-    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";    
+    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";    
     public static final QName NAME = new QName(SCA11_NS, "securityIdentity");
 
     private boolean useCallerIdentity;
diff --git a/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 47d57d225e..24b1e5841d 100644
--- a/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,12 +16,12 @@
 # under the License. 

 

 # Implementation class for the artifact processor extension

-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

+org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy

+org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

+org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

 org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy

 org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy

 org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#basicAuthentication,model=org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy

diff --git a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index 5e4e72620c..84ff597e15 100644
--- a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
     <!-- POLICY SETS -->
diff --git a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index 4f271d1f86..2881a5a56d 100644
--- a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_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://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.1">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
 
     <intent name="identity" constrains="sca:implementation.java 
                                         sca:implementation.spring">
diff --git a/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index cdde178645..a1b790dbb4 100644
--- a/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
@@ -43,7 +43,7 @@ import org.junit.Test;
  * @version $Rev$ $Date$
  */
 public class PolicyProcessorTestCase {
-    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     private final static List<String> SEQ =
         Arrays.asList("permitAll",
                       "allow [r1, r2]",
diff --git a/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index 95765676e4..acb47de243 100644
--- a/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_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://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
 
     <!-- POLICY SETS -->
     <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
diff --git a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
index 7a88caccd2..907a50984c 100644
--- a/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
+++ b/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessorTestCase.java
@@ -40,15 +40,15 @@ public class WSPolicyProcessorTestCase extends TestCase {
 	
 	private static final String VALID_WS_POLICY = 
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		    + "<definitions xmlns=\"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/200712\">"
+ 			+ " xmlns:sca=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\">"
             + " "
             + " <policySet name=\"SecureWSPolicy\""
             + " provides=\"test:confidentiality\""
  	        + " appliesTo=\"sca:binding.ws\""
- 	        + " xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\""
+ 	        + " 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>"
diff --git a/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index c3db1d50ae..a2e321068f 100644
--- a/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
@@ -17,15 +17,15 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="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/200712">
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
 
 <policySet name="SecureWSPolicy"
  	provides="test:confidentiality"
  	appliesTo="sca:binding.ws"
- 	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+ 	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>
diff --git a/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 9c77e2dd25..7d63440e23 100644
--- a/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
 public interface PolicyConstants {

     String WHITE_SPACE = " ";

     String COLON = ":";

-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";

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

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

     String INTENT = "intent";

     String POLICY_SET = "policySet";

diff --git a/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 21d50ec544..a64b22dc2a 100644
--- a/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,7 +16,7 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#bindingType,model=org.apache.tuscany.sca.policy.BindingType
-org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#implementationType,model=org.apache.tuscany.sca.policy.ImplementationType
-org.apache.tuscany.sca.policy.xml.IntentProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#intent,model=org.apache.tuscany.sca.policy.Intent
-org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#policySet,model=org.apache.tuscany.sca.policy.PolicySet
+org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#bindingType,model=org.apache.tuscany.sca.policy.BindingType
+org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#implementationType,model=org.apache.tuscany.sca.policy.ImplementationType
+org.apache.tuscany.sca.policy.xml.IntentProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#intent,model=org.apache.tuscany.sca.policy.Intent
+org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#policySet,model=org.apache.tuscany.sca.policy.PolicySet
diff --git a/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java b/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
index c9976a93b4..e954f1ebe4 100644
--- a/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
+++ b/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
@@ -103,7 +103,7 @@ public class PolicyXPathFunctionResolverTestCase {
 
     private static class NamespaceContextImpl implements NamespaceContext {
 
-        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
 
         public String getNamespaceURI(String prefix) {
             if ("sca".equals(prefix)) {
diff --git a/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 34e7e44939..0d0f945e43 100644
--- a/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
@@ -70,13 +70,13 @@ public class ReadDocumentTestCase {
     private Monitor monitor;
 
     private static final QName elementToProcess =
-        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "implementationType");
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "implementationType");
 
     private Map<QName, Intent> intentTable = new Hashtable<QName, Intent>();
     private Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
     private Map<QName, BindingType> bindingTypesTable = new Hashtable<QName, BindingType>();
     private Map<QName, ImplementationType> implTypesTable = new Hashtable<QName, ImplementationType>();
-    private static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     private static final String namespace = "http://test";
 
     private static final QName confidentiality = new QName(namespace, "confidentiality");
diff --git a/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite b/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
index 733a7333ba..3ade69523c 100644
--- a/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
+++ b/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/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"

            targetNamespace="http://sample"

            xmlns:sample="http://sample"

            name="Calculator">

diff --git a/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index b46ac57e5f..911833550f 100644
--- a/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/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>

@@ -96,13 +96,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" -->

@@ -110,7 +110,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>

@@ -130,7 +130,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>

diff --git a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
index 828d0a9966..e7a93c8907 100644
--- a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
+++ b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
@@ -27,8 +27,8 @@ import javax.xml.namespace.QName;
  * Definition of extension type: binding or implementation
  */
 public interface ExtensionType {
-    QName BINDING_BASE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "binding");
-    QName IMPLEMENTATION_BASE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "implementation");
+    QName BINDING_BASE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "binding");
+    QName IMPLEMENTATION_BASE = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "implementation");
 
     /**
      * The name of the extension type (binding or implementation). The extension type name 
diff --git a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
index 90f2371a72..fe61ce707c 100644
--- a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
@@ -67,7 +67,7 @@ public class PolicyComputationUtils {
     private static final String APPLICABLE_POLICYSET_ATTR = "applicablePolicySets";
     private static final String POLICY_SETS_ATTR = "policySets";
     private static final String APPLICABLE_POLICYSET_ATTR_PREFIX = "tuscany";
-    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
 
     /**
      * This method unconditionally adds intents from the source list to the target list.
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
index 264d123ac2..44045a404d 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
@@ -14,7 +14,7 @@ public interface Constants {
     /**
      * Namespace for intents.
      */
-    String SCA_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    String SCA_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
 
     /**
      * Prefix form of the namespace that can be prepended to intent declarations.
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
index 14c273411f..d90eb5512d 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
@@ -25,8 +25,8 @@ import java.lang.annotation.Target;
  * {@link javax.xml.namespace.QName#toString()}. Intents may be qualified with one or more
  * suffixes separated by a "." such as:
  * <ul>
- * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200712}confidentiality</li>
- * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200712}confidentiality.message</li>
+ * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200903}confidentiality</li>
+ * <li>{http://docs.oasis-open.org/ns/opencsa/sca/200903}confidentiality.message</li>
  * </ul>
  * This annotation supports general purpose intents specified as strings.  Users may also define
  * specific intents using the {@link @org.oasisopen.sca.annotation.Intent} annotation.
diff --git a/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite b/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite
index 05f798a546..29dd7e3b6f 100644
--- a/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite
+++ b/java/sca/samples/binding-ws-calculator/src/main/resources/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"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">
diff --git a/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
index d3f7401173..27a1ee74e4 100644
--- a/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
               xmlns:sample="http://sample">
    <deployable composite="sample:Calculator"/>
 </contribution>
\ No newline at end of file
diff --git a/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite b/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite
index 411b5d1240..9450558145 100644
--- a/java/sca/samples/calculator-equinox/src/main/resources/Calculator.composite
+++ b/java/sca/samples/calculator-equinox/src/main/resources/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"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">
diff --git a/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite b/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite
index 411b5d1240..9450558145 100644
--- a/java/sca/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/java/sca/samples/calculator-osgi/src/main/resources/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"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">
diff --git a/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index d28843c4a3..a5510954e0 100644
--- a/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/java/sca/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.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://sample"

            xmlns:sample="http://sample"

diff --git a/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index f0c37252f1..02614ad6e1 100644
--- a/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/java/sca/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.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://sample"

            xmlns:sample="http://sample"

diff --git a/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml b/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
index f23e9e3905..10140b7bc1 100644
--- a/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/samples/calculator-rmi-service/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:Calculator"/>

 </contribution>
\ No newline at end of file
diff --git a/java/sca/samples/calculator/src/main/resources/Calculator.composite b/java/sca/samples/calculator/src/main/resources/Calculator.composite
index 59cd0d3664..f67b212d99 100644
--- a/java/sca/samples/calculator/src/main/resources/Calculator.composite
+++ b/java/sca/samples/calculator/src/main/resources/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"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">
diff --git a/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml b/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
index f23e9e3905..10140b7bc1 100644
--- a/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/samples/calculator/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://sample">

    <deployable composite="sample:Calculator"/>

 </contribution>
\ No newline at end of file
diff --git a/java/sca/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/java/sca/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
index 9cc8d435e6..8378a15824 100644
--- a/java/sca/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/java/sca/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

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

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

               xmlns:sample="http://bpel">

    <deployable composite="sample:bpel"/>

 </contribution>
\ No newline at end of file
diff --git a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.composite b/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.composite
index 40113d351e..603cc17af9 100644
--- a/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/java/sca/samples/helloworld-bpel/src/main/resources/helloworld.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://bpel"
       xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
       name="bpel">
diff --git a/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite b/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite
index 411b5d1240..9450558145 100644
--- a/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite
+++ b/java/sca/samples/implementation-java-calculator/src/main/resources/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"
            targetNamespace="http://sample"
            xmlns:sample="http://sample"
            name="Calculator">
diff --git a/java/sca/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/java/sca/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index d68ced7fd2..56ed55b2d5 100644
--- a/java/sca/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/java/sca/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.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://samples"

            name="Helloworld">

diff --git a/java/sca/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/java/sca/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index d68ced7fd2..56ed55b2d5 100644
--- a/java/sca/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/java/sca/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.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://samples"

            name="Helloworld">

diff --git a/java/sca/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite b/java/sca/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
index 29a2165933..f0609d9eb9 100644
--- a/java/sca/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
+++ b/java/sca/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.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://samples"

            name="Helloworld">