summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-10-11 08:05:10 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-10-11 08:05:10 +0000
commit4d98161f40fb1b67a605f0f73b028057efe3acd3 (patch)
tree0ec38bed73bb5d585df8103e74bacc03d64ce503 /sca-java-2.x/trunk
parentb95b478b0c02506d33bfd5f688bb7cccf2a999e4 (diff)
Include all the contributions as dependencies so that dependent contributions get resolved correctly
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1181651 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java4
1 files changed, 3 insertions, 1 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 ade7284628..fb40980d04 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
@@ -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