Author: jschneider
Date: Thu Jun 3 13:14:35 2010
New Revision: 950982
URL: http://svn.apache.org/viewvc?rev=950982&view=rev
Log:
Merged revert of IVYDE-212 (see also IVYDE-236).
Modified:
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
(contents, props changed)
Modified:
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java?rev=950982&r1=950981&r2=950982&view=diff
==============================================================================
---
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
(original)
+++
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
Thu Jun 3 13:14:35 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) {
Propchange:
ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jun 3 13:14:35 2010
@@ -0,0 +1 @@
+/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java:905370-950981
