svn commit: r942711 - in /ant/ivy/ivyde/trunk: CHANGES.txt org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java

[hi...@apache.org]

Author: hibou
Date: Mon May 10 11:44:00 2010
New Revision: 942711

URL: http://svn.apache.org/viewvc?rev=942711&view=rev
Log:
IVYDE-236: revert the fix done for IVYDE-212 which was not actually a fix, the real issue was in the main ivysettings.xml

Modified:
    ant/ivy/ivyde/trunk/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java

Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=942711&r1=942710&r2=942711&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Mon May 10 11:44:00 2010
@@ -25,7 +25,6 @@
 - FIX: conf attributes must not be null (IVYDE-209) (thanks to Ivica Loncar)
 - 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)
 - FIX: Can not add a project specific property file when adding a library (IVYDE-228)
 - FIX: IvyDE fail on project close to trigger resolve on dependent project (IVYDE-229)

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java?rev=942711&r1=942710&r2=942711&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java Mon May 10 11:44:00 2010
@@ -18,7 +18,6 @@
 package org.apache.ivyde.eclipse.workspaceresolver;
 
 import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.apache.ivy.core.resolve.ResolveOptions;
 import org.apache.ivy.core.settings.IvySettings;
 import org.apache.ivy.plugins.resolver.ChainResolver;
 import org.apache.ivy.plugins.resolver.DependencyResolver;
@@ -31,7 +30,6 @@ public class WorkspaceIvySettings extend
     public WorkspaceIvySettings(IJavaProject javaProject) {
         this.javaProject = javaProject;
         setDefaultLatestStrategy(new IvyDEStrategy());
-        setDefaultResolveMode(ResolveOptions.RESOLVEMODE_DYNAMIC);
     }
 
     public DependencyResolver getResolver(ModuleRevisionId mrid) {