Updates to contribution modules to use OASIS namespaces/schema

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

12 files changed, 25 insertions, 25 deletions

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 0560d54a39..5997aee015 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,9 +45,9 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class JavaExportProcessor implements StAXArtifactProcessor<JavaExport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
     
-    private static final QName EXPORT_JAVA = new QName(SCA10_NS, "export.java");
+    private static final QName EXPORT_JAVA = new QName(SCA11_NS, "export.java");
     
     private static final String PACKAGE = "package";
     
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 199941ef0d..e272c60058 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,9 +45,9 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class JavaImportProcessor  implements StAXArtifactProcessor<JavaImport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
     
-    private static final QName IMPORT_JAVA = new QName(SCA10_NS, "import.java");
+    private static final QName IMPORT_JAVA = new QName(SCA11_NS, "import.java");
 
     private static final String PACKAGE = "package";
     private static final String LOCATION = "location";
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 ac1fa9aade..1a8fd93a60 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://www.osoa.org/xmlns/sca/1.0#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
-org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#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/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
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 a91996b0c1..0620647da3 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://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\"/>";
+            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" 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://www.osoa.org/xmlns/sca/1.0\"/>";
+            + "<export.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\"/>";
 
     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 290656c3fa..f3a6caf2b6 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://www.osoa.org/xmlns/sca/1.0\" 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/200712\" 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://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
+            + "<import.java  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" 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 01e3140b68..44a4c5eb63 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,8 +46,8 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  */
 public class NamespaceExportProcessor implements StAXArtifactProcessor<NamespaceExport> {
 
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    private static final QName EXPORT = new QName(SCA10_NS, "export");
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    private static final QName EXPORT = new QName(SCA11_NS, "export");
     private static final String NAMESPACE = "namespace";
     
     private final NamespaceImportExportFactory factory;
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 8ed6d1d501..7206f391c3 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,9 +45,9 @@ import org.apache.tuscany.sca.monitor.Problem.Severity;
  * @version $Rev$ $Date$
  */
 public class NamespaceImportProcessor  implements StAXArtifactProcessor<NamespaceImport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
     
-    private static final QName IMPORT = new QName(SCA10_NS, "import");
+    private static final QName IMPORT = new QName(SCA11_NS, "import");
 
     private static final String NAMESPACE = "namespace";
     private static final String LOCATION = "location";
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 86f199368b..7f01dd6a0a 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://www.osoa.org/xmlns/sca/1.0#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
-org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#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/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
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 dc0b05df3c..81e55309db 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://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" namespace=\"http://foo\"/>";
+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\" namespace=\"http://foo\"/>";
 
     private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\"/>";
+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<export xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" 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 e3d96dc70f..e6c2430282 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://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" namespace=\"http://foo\" location=\"sca://contributions/001\"/>";
+            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" 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://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
+            + "<import  xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
 
     private static XMLInputFactory inputFactory;
     private static StAXArtifactProcessor<Object> staxProcessor;
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 14131a9806..0db008ecb9 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 SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
+	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+    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 f23797a831..92af57b007 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,9 +307,9 @@ public abstract class BaseStAXArtifactProcessor {
      */
     public static class XAttr {
         
-        private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+        private static final String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
 
-        private String uri = SCA10_NS;
+        private String uri = SCA11_NS;
         private String name;
         private Object value;
 
@@ -501,7 +501,7 @@ public abstract class BaseStAXArtifactProcessor {
             }
 
             // Write the attribute
-            if (uri != null && !uri.equals(SCA10_NS)) {
+            if (uri != null && !uri.equals(SCA11_NS)) {
                 writer.writeAttribute(uri, name, str);
             } else {
                 writer.writeAttribute(name,str);