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 2007/05/07 05:33:06 UTC
svn commit: r535723 - in /incubator/tuscany/java/sca/modules:
contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/
host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/
Author: jsdelfino
Date: Sun May 6 20:33:05 2007
New Revision: 535723
URL: http://svn.apache.org/viewvc?view=rev&rev=535723
Log:
Ported SCADomain and runtime to the changes in Contribution service.
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/DefaultSCADomain.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntime.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java?view=diff&rev=535723&r1=535722&r2=535723
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/service/impl/ContributionServiceImpl.java Sun May 6 20:33:05 2007
@@ -92,7 +92,6 @@
public ContributionServiceImpl(ContributionRepository repository,
PackageProcessor packageProcessor,
URLArtifactProcessor artifactProcessor,
- ModelResolver artifactResolver,
AssemblyFactory assemblyFactory,
ContributionFactory contributionFactory,
XMLInputFactory xmlFactory) {
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/DefaultSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/DefaultSCADomain.java?view=diff&rev=535723&r1=535722&r2=535723
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/DefaultSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/DefaultSCADomain.java Sun May 6 20:33:05 2007
@@ -37,6 +37,7 @@
import org.apache.tuscany.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.contribution.Contribution;
import org.apache.tuscany.contribution.DeployedArtifact;
+import org.apache.tuscany.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.contribution.service.ContributionException;
import org.apache.tuscany.contribution.service.ContributionService;
import org.apache.tuscany.contribution.service.util.FileHelper;
@@ -98,7 +99,8 @@
}
try {
- contribution = contributionService.contribute(location, contributionURL, false);
+ DefaultModelResolver modelResolver = new DefaultModelResolver(applicationClassLoader);
+ contribution = contributionService.contribute(location, contributionURL, modelResolver, false);
} catch (ContributionException e) {
throw new ServiceRuntimeException(e);
} catch (IOException e) {
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntime.java?view=diff&rev=535723&r1=535722&r2=535723
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntime.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntime.java Sun May 6 20:33:05 2007
@@ -83,7 +83,7 @@
PolicyFactory policyFactory = new DefaultPolicyFactory();
// Create a contribution service
- contributionService = ReallySmallRuntimeBuilder.createContributionService(registry, assemblyFactory, policyFactory, mapper, classLoader);
+ contributionService = ReallySmallRuntimeBuilder.createContributionService(registry, assemblyFactory, policyFactory, mapper);
// Create a composite activator
compositeActivator = ReallySmallRuntimeBuilder.createCompositeActivator(registry, assemblyFactory, mapper, workContext, workManager);
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java?view=diff&rev=535723&r1=535722&r2=535723
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java Sun May 6 20:33:05 2007
@@ -137,8 +137,7 @@
public static ContributionService createContributionService(ExtensionPointRegistry registry,
AssemblyFactory assemblyFactory,
PolicyFactory policyFactory,
- InterfaceContractMapper mapper,
- ClassLoader classLoader) throws ActivationException {
+ InterfaceContractMapper mapper) throws ActivationException {
XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
@@ -181,13 +180,11 @@
throw new ActivationException(e);
}
- //FIXME move artifact resolver to each contribution
- DefaultModelResolver artifactResolver = new DefaultModelResolver(classLoader);
ContributionFactory contributionFactory = new ContributionFactoryImpl();
ExtensibleURLArtifactProcessor documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
ContributionService contributionService = new ContributionServiceImpl(
repository, packageProcessor,
- documentProcessor, artifactResolver,
+ documentProcessor,
assemblyFactory,
contributionFactory,
xmlFactory);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org