Author: antelder
Date: Fri Mar 4 11:08:36 2011
New Revision: 1077875
URL: http://svn.apache.org/viewvc?rev=1077875&view=rev
Log:
Update deployer to support passing in the system contribution so that that may
be reused as cloning it each time can be slow
Modified:
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java?rev=1077875&r1=1077874&r2=1077875&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
Fri Mar 4 11:08:36 2011
@@ -83,6 +83,9 @@ public interface Deployer extends LifeCy
Composite build(List<Contribution> contributions, List<Contribution>
allContributions, Map<QName, List<String>> bindingBaseURIs, Monitor monitor)
throws ContributionResolveException, CompositeBuilderException;
+ Composite build(List<Contribution> contributions, List<Contribution>
allContributions, Contribution systemContribution, Map<QName, List<String>>
bindingBaseURIs, Monitor monitor)
+ throws ContributionResolveException, CompositeBuilderException;
+
/**
* Load an artifact from the given location
* @param uri
@@ -204,4 +207,6 @@ public interface Deployer extends LifeCy
* @throws CompositeBuilderException
*/
void resolve(Contribution c, List<Contribution> dependentContributions,
Monitor monitor) throws ContributionResolveException, CompositeBuilderException;
+
+ public Contribution cloneSystemContribution(Monitor monitor);
}
Modified:
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?rev=1077875&r1=1077874&r2=1077875&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
Fri Mar 4 11:08:36 2011
@@ -79,7 +79,6 @@ import org.apache.tuscany.sca.core.Exten
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl;
import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.definitions.DefinitionsFactory;
import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
@@ -374,7 +373,7 @@ public class DeployerImpl implements Dep
}
}
- protected Contribution cloneSystemContribution(Monitor monitor) {
+ public Contribution cloneSystemContribution(Monitor monitor) {
init();
Contribution contribution = contributionFactory.createContribution();
contribution.setURI(systemContribution.getURI());
@@ -472,10 +471,17 @@ public class DeployerImpl implements Dep
public Composite build(List<Contribution> contributions,
List<Contribution> allContributions, Map<QName, List<String>> bindingMap,
Monitor monitor)
throws ContributionResolveException, CompositeBuilderException {
+ return build(contributions, allContributions, null, bindingMap,
monitor);
+ }
+
+ public Composite build(List<Contribution> contributions,
List<Contribution> allContributions, Contribution systemContribution,
Map<QName, List<String>> bindingMap, Monitor monitor)
+ throws ContributionResolveException, CompositeBuilderException {
init();
List<Contribution> contributionList = new
ArrayList<Contribution>(contributions);
- Contribution systemContribution = cloneSystemContribution(monitor);
+ if (systemContribution == null) {
+ systemContribution = cloneSystemContribution(monitor);
+ }
Definitions systemDefinitions =
systemContribution.getArtifacts().get(0).getModel();
// Build an aggregated SCA definitions model. Must be done before we
try and
// resolve any contributions or composites as they may depend on the
full
