diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-05 00:04:21 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-05 00:04:21 +0000 |
commit | cd5460e68a6dfdedce80429f3d447e5d515c7bea (patch) | |
tree | f9e54fb15fd3bb0afbc56fdab401376920ef609b /java/sca/modules/contribution-namespace | |
parent | 96d84290c1fd84fb99dc3aa7ffdf0cea6df71f32 (diff) |
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
Diffstat (limited to '')
5 files changed, 10 insertions, 10 deletions
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; |