svn commit: r945568 - in /tuscany/sca-java-2.x/trunk/modules/deployment/src: main/java/org/apache/tuscany/sca/deployment/ main/java/org/apache/tuscany/sca/deployment/impl/ test/java/org/apache/tuscany/sca/deployment/impl/

[antelder]

Author: antelder
Date: Tue May 18 09:54:21 2010
New Revision: 945568

URL: http://svn.apache.org/viewvc?rev=945568&view=rev
Log:
Update deployer to use a separate list of contributions to look at when looking 
for exports

Modified:
    
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
    
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
    
tuscany/sca-java-2.x/trunk/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java?rev=945568&r1=945567&r2=945568&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
 Tue May 18 09:54:21 2010
@@ -78,7 +78,7 @@ public interface Deployer extends LifeCy
      * @throws ContributionResolveException
      * @throws CompositeBuilderException
      */
-    Composite build(List<Contribution> contributions, Map<QName, List<String>> 
bindingBaseURIs, Monitor monitor)
+    Composite build(List<Contribution> contributions, List<Contribution> 
allContributions, Map<QName, List<String>> bindingBaseURIs, Monitor monitor)
         throws ContributionResolveException, CompositeBuilderException;
 
     /**

Modified: 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?rev=945568&r1=945567&r2=945568&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
 Tue May 18 09:54:21 2010
@@ -444,7 +444,7 @@ public class DeployerImpl implements Dep
         contribution.getDeployables().add(composite);
     }
 
-    public Composite build(List<Contribution> contributions, Map<QName, 
List<String>> bindingMap, Monitor monitor)
+    public Composite build(List<Contribution> contributions, 
List<Contribution> allContributions, Map<QName, List<String>> bindingMap, 
Monitor monitor)
         throws ContributionResolveException, CompositeBuilderException {
         init();
         List<Contribution> contributionList = new 
ArrayList<Contribution>(contributions);
@@ -504,8 +504,9 @@ public class DeployerImpl implements Dep
 
         // Build the contribution dependencies
         Set<Contribution> resolved = new HashSet<Contribution>();
+        
         for (Contribution contribution : contributionList) {
-            buildDependencies(contribution, contributionList, monitor);
+            buildDependencies(contribution, allContributions, monitor);
 
             // Resolve contributions
             for (Contribution dependency : contribution.getDependencies()) {

Modified: 
tuscany/sca-java-2.x/trunk/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java?rev=945568&r1=945567&r2=945568&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
 Tue May 18 09:54:21 2010
@@ -79,7 +79,7 @@ public class DeployerImplTestCase {
     public void testBuild() throws Exception {
         Monitor monitor = deployer.createMonitor();
         Contribution contribution = 
deployer.loadContribution(contributionURL.toURI(), contributionURL, monitor);
-        Composite composite = deployer.build(Arrays.asList(contribution), 
null, monitor);
+        Composite composite = deployer.build(Arrays.asList(contribution), 
Arrays.asList(contribution), null, monitor);
         assertTrue(composite != null);
     }