svn commit: r897508 - in /ant/ivy/ivyde/trunk: CHANGES.txt org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java

[hi...@apache.org]

Author: hibou
Date: Sat Jan  9 18:19:22 2010
New Revision: 897508

URL: http://svn.apache.org/viewvc?rev=897508&view=rev
Log:
IVYDE-170:
 Whereas I was not capabale of reproducing the bug, I find some little difference between IvyCacheTask and IvyDE. So now IvyDE is having the exact same algorithm as IvyCacheTask. Hope it will fix the bug.

Modified:
    ant/ivy/ivyde/trunk/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java

Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=897508&r1=897507&r2=897508&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Sat Jan  9 18:19:22 2010
@@ -26,6 +26,7 @@
 - FIX: Errors are not reported when multiple resolve are launched (IVYDE-219)
 - FIX: Ivy settings file cannot be loaded via http url (IVYDE-218)
 - FIX: The workspace resolver doesn't resolve conflicts correctly (IVYDE-212)
+- FIX: dependency order not preserved causing failed builds (IVYDE-170)
 
   version 2.0.0 final
 ==========================

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java?rev=897508&r1=897507&r2=897508&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJobThread.java Sat Jan  9 18:19:22 2010
@@ -35,6 +35,7 @@
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.ivy.core.report.ArtifactDownloadReport;
+import org.apache.ivy.core.report.ConfigurationResolveReport;
 import org.apache.ivy.core.report.ResolveReport;
 import org.apache.ivy.core.resolve.IvyNode;
 import org.apache.ivy.core.resolve.ResolveData;
@@ -74,7 +75,7 @@
 
     private IClasspathEntry[] classpathEntries = null;
 
-    private LinkedHashSet all;
+    private LinkedHashSet/* <ArtifactDownloadReport> */all;
 
     private List problemMessages;
 
@@ -222,7 +223,18 @@
         resolveOption.setValidate(ivy.getSettings().doValidate());
         ResolveReport report = ivy.resolve(md, resolveOption);
         problemMessages = report.getAllProblemMessages();
-        all = new LinkedHashSet(Arrays.asList(report.getArtifactsReports(null, false)));
+
+        all = new LinkedHashSet();
+        for (int i = 0; i < confs.length; i++) {
+            ConfigurationResolveReport configurationReport = report.getConfigurationReport(confs[i]);
+            Set revisions = configurationReport.getModuleRevisionIds();
+            for (Iterator it = revisions.iterator(); it.hasNext();) {
+                ModuleRevisionId revId = (ModuleRevisionId) it.next();
+                ArtifactDownloadReport[] aReports = configurationReport.getDownloadReports(revId);
+                all.addAll(Arrays.asList(aReports));
+            }
+        }
+
         confs = report.getConfigurations();
         artifactsByDependency.putAll(getArtifactsByDependency(report));
         if (monitor.isCanceled()) {