From 4d98161f40fb1b67a605f0f73b028057efe3acd3 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 11 Oct 2011 08:05:10 +0000
Subject: 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
---
 .../src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3