Author: antelder
Date: Tue Oct 11 08:05:10 2011
New Revision: 1181651
URL: http://svn.apache.org/viewvc?rev=1181651&view=rev
Log:
Include all the contributions as dependencies so that dependent contributions
get resolved correctly
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.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=1181651&r1=1181650&r2=1181651&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
Tue Oct 11 08:05:10 2011
@@ -92,6 +92,8 @@ public class DeployedComposite {
contributions.add(contribution);
contributions.get(0).getDeployables().clear();
contributions.get(0).getDeployables().add(composite);
+
+ contributions.addAll(dependedOnContributions);
Map<QName, List<String>> bs = new HashMap<QName, List<String>>();
if (endpointsIncludeDomainName) {
@@ -99,7 +101,7 @@ public class DeployedComposite {
}
Monitor monitor = deployer.createMonitor();
- builtComposite = deployer.build(contributions,
dependedOnContributions, bs, monitor);
+ builtComposite = deployer.build(contributions, contributions, bs,
monitor);
monitor.analyzeProblems();
// TODO: Ideally deployer.build would set the name and uri to what
this needs
