You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/03/01 03:25:46 UTC

svn commit: r632536 - /incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java

Author: jsdelfino
Date: Fri Feb 29 18:25:39 2008
New Revision: 632536

URL: http://svn.apache.org/viewvc?rev=632536&view=rev
Log:
Use the artifact processor extension mechanism in ContributionInfoProcessor.

Modified:
    incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java

Modified: incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java?rev=632536&r1=632535&r2=632536&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java Fri Feb 29 18:25:39 2008
@@ -29,7 +29,6 @@
 import org.apache.tuscany.sca.contribution.scanner.ContributionScanner;
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.xml.ContributionMetadataDocumentProcessor;
 import org.apache.tuscany.sca.workspace.scanner.impl.DirectoryContributionScanner;
 import org.apache.tuscany.sca.workspace.scanner.impl.JarContributionScanner;
 
@@ -40,12 +39,12 @@
  * @version $Rev$ $Date$
  */
 public class ContributionInfoProcessor implements URLArtifactProcessor<Contribution>{
-    private ContributionMetadataDocumentProcessor metadataProcessor;
+    private URLArtifactProcessor<Object> artifactProcessor;
     private ContributionFactory contributionFactory;
 
-    public ContributionInfoProcessor(ContributionFactory contributionFactory, ContributionMetadataDocumentProcessor metadataProcessor) {
+    public ContributionInfoProcessor(ContributionFactory contributionFactory, URLArtifactProcessor<Object> artifactProcessor) {
         this.contributionFactory = contributionFactory;
-        this.metadataProcessor = metadataProcessor; 
+        this.artifactProcessor = artifactProcessor; 
     }
     
     public String getArtifactType() {
@@ -77,7 +76,7 @@
                                        Contribution.SCA_CONTRIBUTION_META}) {
             URL url = scanner.getArtifactURL(contributionURL, path);
             if (url != null) {
-                Contribution c = metadataProcessor.read(contributionURL, URI.create(path), url);
+                Contribution c = (Contribution)artifactProcessor.read(contributionURL, URI.create(path), url);
                 contribution.getImports().addAll(c.getImports());
                 contribution.getExports().addAll(c.getExports());
                 contribution.getDeployables().addAll(c.getDeployables());
@@ -88,7 +87,7 @@
     }
     
     public void resolve(Contribution contribution, ModelResolver resolver) throws ContributionResolveException {
-        metadataProcessor.resolve(contribution, resolver);
+        artifactProcessor.resolve(contribution, resolver);
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org