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

4 files changed, 13 insertions, 13 deletions

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>