Author: lresende
Date: Thu Mar 5 00:04:21 2009
New Revision: 750244
URL: http://svn.apache.org/viewvc?rev=750244&view=rev
Log:
Updates to contribution modules to use OASIS namespaces/schema
Modified:
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
Modified:
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
Thu Mar 5 00:04:21 2009
@@ -45,9 +45,9 @@
* @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";
Modified:
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
Thu Mar 5 00:04:21 2009
@@ -45,9 +45,9 @@
* @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";
Modified:
tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Thu Mar 5 00:04:21 2009
@@ -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
Modified:
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
(original)
+++
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
Thu Mar 5 00:04:21 2009
@@ -51,11 +51,11 @@
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;
Modified:
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
(original)
+++
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
Thu Mar 5 00:04:21 2009
@@ -50,11 +50,11 @@
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;
Modified:
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
Thu Mar 5 00:04:21 2009
@@ -46,8 +46,8 @@
*/
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;
Modified:
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
Thu Mar 5 00:04:21 2009
@@ -45,9 +45,9 @@
* @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";
Modified:
tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Thu Mar 5 00:04:21 2009
@@ -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
Modified:
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
(original)
+++
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
Thu Mar 5 00:04:21 2009
@@ -49,10 +49,10 @@
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;
Modified:
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
(original)
+++
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
Thu Mar 5 00:04:21 2009
@@ -52,11 +52,11 @@
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;
Modified:
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
(original)
+++
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
Thu Mar 5 00:04:21 2009
@@ -27,6 +27,6 @@
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";;
}
Modified:
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java?rev=750244&r1=750243&r2=750244&view=diff
==============================================================================
---
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
(original)
+++
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
Thu Mar 5 00:04:21 2009
@@ -307,9 +307,9 @@
*/
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 @@
}
// 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);
