More changes to switch SCA namespace from osoa version to oasis one

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

5 files changed, 7 insertions, 7 deletions

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 82d18ca319..1b3066911a 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,9 +26,9 @@ import javax.xml.namespace.QName;
  * @version $Rev$ $Date$
  */
 public interface WSDLConstants {
-    String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
     String INTERFACE_WSDL = "interface.wsdl";
-    QName INTERFACE_WSDL_QNAME = new QName(SCA10_NS, "interface.wsdl");
+    QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl");
     String INTERFACE = "interface";
     String CALLBACK_INTERFACE = "callbackInterface";
     String WSDL_LOCATION = "wsdlLocation";
diff --git a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index d40aac9434..8145ba3f8f 100644
--- a/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
@@ -160,7 +160,7 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa
     
     public void write(WSDLInterfaceContract wsdlInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
         // Write an <interface.wsdl>
-        writer.writeStartElement(WSDLConstants.SCA10_NS, INTERFACE_WSDL);
+        writer.writeStartElement(WSDLConstants.SCA11_NS, INTERFACE_WSDL);
 
         // Write interface name
         WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface();
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 5fd26ca953..d2f73bac61 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://www.osoa.org/xmlns/sca/1.0", "requires");
-    public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://www.osoa.org/xmlns/sca/1.0", "endsConversation");
+    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");
     
     // ---- 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 9666a6dbd8..839fae1d96 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://www.osoa.org/xmlns/sca/1.0#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/200712#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
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 7cdf801692..89bc7a3a78 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://www.osoa.org/xmlns/sca/1.0"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
     xmlns="http://schemas.xmlsoap.org/wsdl/">
 
     <types>