Update to add the Node to the CompositeContext

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1373885 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 8 insertions, 3 deletions

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
index fb40980d04..f91fa1fa64 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
@@ -27,6 +27,7 @@ import java.util.Map;
 
 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 @@ public class DeployedComposite {
     private ExtensionPointRegistry extensionPointRegistry;
     private List<String> usedContributionURIs;
     private boolean endpointsIncludeDomainName;
+    private Node node;
 
     public DeployedComposite(Composite composite,
                              Contribution contribution,
@@ -67,7 +69,8 @@ public class DeployedComposite {
                              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 @@ public class DeployedComposite {
         this.domainRegistry = domainRegistry;
         this.extensionPointRegistry = extensionPointRegistry;
         this.endpointsIncludeDomainName = endpointsIncludeDomainName;
+        this.node = node;
         
         try {
             build();
@@ -123,7 +127,8 @@ public class DeployedComposite {
                                                 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/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
index c5ae8277a5..d5d5c23404 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
@@ -381,7 +381,7 @@ public class NodeImpl implements Node {
                 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);
             }