tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r1373885 - in /tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl: DeployedComposite.java NodeImpl.java
Date Thu, 16 Aug 2012 15:35:59 GMT
Author: antelder
Date: Thu Aug 16 15:35:59 2012
New Revision: 1373885

URL: http://svn.apache.org/viewvc?rev=1373885&view=rev
Log:
Update to add the Node to the CompositeContext

Modified:
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java?rev=1373885&r1=1373884&r2=1373885&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
Thu Aug 16 15:35:59 2012
@@ -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) {

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java?rev=1373885&r1=1373884&r2=1373885&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
Thu Aug 16 15:35:59 2012
@@ -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);
             }



Mime
View raw message