You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/04/07 00:44:58 UTC
svn commit: r526309 -
/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
Author: lresende
Date: Fri Apr 6 15:44:57 2007
New Revision: 526309
URL: http://svn.apache.org/viewvc?view=rev&rev=526309
Log:
Decouple ContributionService from the registries, now only relies on the processors.
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java?view=diff&rev=526309&r1=526308&r2=526309
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java Fri Apr 6 15:44:57 2007
@@ -39,6 +39,7 @@
import org.apache.tuscany.services.spi.contribution.ArtifactProcessorRegistry;
import org.apache.tuscany.services.spi.contribution.ArtifactResolverRegistry;
import org.apache.tuscany.services.spi.contribution.ContributionException;
+import org.apache.tuscany.services.spi.contribution.ContributionPackageProcessor;
import org.apache.tuscany.services.spi.contribution.ContributionPackageProcessorRegistry;
import org.apache.tuscany.services.spi.contribution.ContributionRepository;
import org.apache.tuscany.services.spi.contribution.ContributionService;
@@ -57,13 +58,13 @@
/**
* Registry of available package processors.
*/
- protected ContributionPackageProcessorRegistry packageProcessorRegistry;
+ protected ContributionPackageProcessor packageProcessor;
/**
* Registry of available artifact processors
*/
- protected ArtifactProcessorRegistry artifactProcessorRegistry;
+ protected ArtifactProcessor artifactProcessor;
/**
* xml factory used to create reader instance to load contribution metadata
@@ -83,13 +84,13 @@
protected ArtifactResolverRegistry resolverRegistry;
public ContributionServiceImpl(ContributionRepository repository,
- ContributionPackageProcessorRegistry packageProcessorRegistry,
- ArtifactProcessorRegistry artifactProcessorRegistry,
+ ContributionPackageProcessor packageProcessor,
+ ArtifactProcessor artifactProcessor,
ArtifactResolverRegistry resolverRegistry) {
super();
this.contributionRepository = repository;
- this.packageProcessorRegistry = packageProcessorRegistry;
- this.artifactProcessorRegistry = artifactProcessorRegistry;
+ this.packageProcessor = packageProcessor;
+ this.artifactProcessor = artifactProcessor;
this.resolverRegistry = resolverRegistry;
this.xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
@@ -244,14 +245,14 @@
contributionStream = sourceURL.openStream();
try {
// process the contribution
- contributionArtifacts = this.packageProcessorRegistry.getArtifacts(locationURL, contributionStream);
+ contributionArtifacts = this.packageProcessor.getArtifacts(locationURL, contributionStream);
} finally {
IOHelper.closeQuietly(contributionStream);
contributionStream = null;
}
} else {
// process the contribution
- contributionArtifacts = this.packageProcessorRegistry.getArtifacts(locationURL, contributionStream);
+ contributionArtifacts = this.packageProcessor.getArtifacts(locationURL, contributionStream);
}
//processReadPhase(contribution, contributionArtifacts);
@@ -265,8 +266,8 @@
private void processReadPhase(Contribution contribution, List<URI> artifacts) throws ContributionException,
MalformedURLException {
for (URI a : artifacts) {
- URL artifactURL = packageProcessorRegistry.getArtifactURL(contribution.getLocation(), a);
- Object model = ((ArtifactProcessor)this.artifactProcessorRegistry).read(artifactURL);
+ URL artifactURL = packageProcessor.getArtifactURL(contribution.getLocation(), a);
+ Object model = ((ArtifactProcessor)this.artifactProcessor).read(artifactURL);
if (model != null) {
URI artifactURI = contribution.getUri().resolve(a);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org