svn commit: r750234 - in /tuscany/java/sca/modules/contribution-xml/src: main/java/org/apache/tuscany/sca/contribution/xml/ main/resources/META-INF/services/ test/java/org/apache/tuscany/sca/contribution/xml/

[lresende]

Author: lresende
Date: Wed Mar  4 23:47:00 2009
New Revision: 750234

URL: http://svn.apache.org/viewvc?rev=750234&view=rev
Log:
Updates to contribution-xml to process contribution metadata using OASIS 
namespaces/schema

Modified:
    
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
    
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    
tuscany/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java

Modified: 
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java?rev=750234&r1=750233&r2=750234&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
 Wed Mar  4 23:47:00 2009
@@ -51,11 +51,10 @@
  * @version $Rev$ $Date$
  */
 public class ContributionMetadataProcessor extends BaseStAXArtifactProcessor 
implements StAXArtifactProcessor<ContributionMetadata> {
+    private static final String SCA11_NS = 
"http://docs.oasis-open.org/ns/opencsa/sca/200712";;
     
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
-    
-    private static final QName CONTRIBUTION_QNAME = new QName(SCA10_NS, 
"contribution");
-    private static final QName DEPLOYABLE_QNAME = new QName(SCA10_NS, 
"deployable");
+    private static final QName CONTRIBUTION_QNAME = new QName(SCA11_NS, 
"contribution");
+    private static final QName DEPLOYABLE_QNAME = new QName(SCA11_NS, 
"deployable");
     
     private final AssemblyFactory assemblyFactory;
     private final ContributionFactory contributionFactory;

Modified: 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=750234&r1=750233&r2=750234&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
 (original)
+++ 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
 Wed Mar  4 23:47:00 2009
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.contribution.xml.ContributionMetadataProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
+org.apache.tuscany.sca.contribution.xml.ContributionMetadataProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
 
org.apache.tuscany.sca.contribution.processor.xml.AnyElementProcessor;qname=http://www.w3.org/2001/XMLSchema#anyElement,model=java.lang.Object

Modified: 
tuscany/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java?rev=750234&r1=750233&r2=750234&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
 (original)
+++ 
tuscany/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
 Wed Mar  4 23:47:00 2009
@@ -54,13 +54,13 @@
 public class ContributionMetadataProcessorTestCase {
 
     private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution 
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"; xmlns:ns=\"http://ns\";>"
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution 
xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\"; 
xmlns:ns=\"http://ns\";>"
             + "<deployable composite=\"ns:Composite1\"/>"
             + "<deployable composite=\"ns:Composite2\"/>"
             + "</contribution>";
 
     private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution 
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"; xmlns:ns=\"http://ns\";>"
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<contribution 
xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200712\"; 
xmlns:ns=\"http://ns\";>"
             + "<deployable composite=\"ns:Composite1\"/>"
             + "<deployable/>"
             + "</contribution>";