Update to add the Node to the CompositeContext
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk@1373885 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java b/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
index fb40980..f91fa1f 100644
--- a/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
+++ b/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
@@ -27,6 +27,7 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.sca.Node;
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
@@ -59,6 +60,7 @@
private ExtensionPointRegistry extensionPointRegistry;
private List<String> usedContributionURIs;
private boolean endpointsIncludeDomainName;
+ private Node node;
public DeployedComposite(Composite composite,
Contribution contribution,
@@ -67,7 +69,8 @@
CompositeActivator compositeActivator,
DomainRegistry domainRegistry,
ExtensionPointRegistry extensionPointRegistry,
- boolean endpointsIncludeDomainName) throws ValidationException, ActivationException {
+ boolean endpointsIncludeDomainName,
+ Node node) throws ValidationException, ActivationException {
this.composite = composite;
this.contribution = contribution;
this.dependedOnContributions = dependedOnContributions;
@@ -76,6 +79,7 @@
this.domainRegistry = domainRegistry;
this.extensionPointRegistry = extensionPointRegistry;
this.endpointsIncludeDomainName = endpointsIncludeDomainName;
+ this.node = node;
try {
build();
@@ -123,7 +127,8 @@
builtComposite,
null, // nothing appears to use the domain name in CompositeContext
null, // don't need node uri
- deployer.getSystemDefinitions());
+ deployer.getSystemDefinitions(),
+ node);
usedContributionURIs = new ArrayList<String>();
usedContributionURIs.add(contribution.getURI());
for (Contribution dc : dependedOnContributions) {
diff --git a/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
index c5ae827..d5d5c23 100644
--- a/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
+++ b/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
@@ -381,7 +381,7 @@
Contribution contribution = loadContribution(cd);
Composite composite = contribution.getArtifactModel(compositeURI);
List<Contribution> dependentContributions = calculateDependentContributions(cd);
- dc = new DeployedComposite(composite, contribution, dependentContributions, deployer, compositeActivator, domainRegistry, extensionPointRegistry, endpointsIncludeDomainName);
+ dc = new DeployedComposite(composite, contribution, dependentContributions, deployer, compositeActivator, domainRegistry, extensionPointRegistry, endpointsIncludeDomainName, this);
dc.start();
startedComposites.put(key, dc);
}
