svn commit: r744087 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/ant/IvyPostResolveTask.java test/java/org/apache/ivy/ant/IvyRetrieveTest.java

[maartenc]

Author: maartenc
Date: Fri Feb 13 11:39:48 2009
New Revision: 744087

URL: http://svn.apache.org/viewvc?rev=744087&view=rev
Log:
FIX: Ivy retrieve does not honor validate="false" from ivysettings (IVY-992)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=744087&r1=744086&r2=744087&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Feb 13 11:39:48 2009
@@ -95,6 +95,7 @@
 - IMPROVEMENT: Error message is not clear when specifying an invalid value for 
checksums (IVY-977)
 - IMPROVEMENT: catch AccessControlException on System.getProperties() 
(IVY-1015)
 
+- FIX: Ivy retrieve does not honor validate="false" from ivysettings (IVY-992)
 - FIX: Snapshot issues when using ibiblio resolver with m2compatible is false 
(IVY-1028)
 - FIX: Ivy Standalone hangs after publishing to SSH resolver (IVY-1009)
 - FIX: overwrite='false' completely prevents publishing into url repositories 
(IVY-1007)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?rev=744087&r1=744086&r2=744087&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java 
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Fri 
Feb 13 11:39:48 2009
@@ -288,7 +288,7 @@
         resolve.setProject(getProject());
         resolve.setHaltonfailure(haltOnFailure);
         resolve.setUseOrigin(useOrigin);
-        resolve.setValidate(isValidate());
+        resolve.setValidate(doValidate(getSettings()));
         resolve.setKeep(isKeep());
         resolve.setRefresh(isRefresh());
         resolve.setLog(getLog());

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java?rev=744087&r1=744086&r2=744087&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java 
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java Fri 
Feb 13 11:39:48 2009
@@ -80,6 +80,16 @@
             "mod3.2", "jar", "jar", "private")).exists());
     }
 
+    public void testValidateInIvySettings() throws Exception {
+        // cfr IVY-992
+        project.setProperty("ivy.dep.file", 
"test/java/org/apache/ivy/ant/ivy-latest-extra.xml");
+        retrieve.getSettings().setValidate(false);
+        retrieve.execute();
+        
+        assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, 
"org1", "mod1.2", "2.2",
+            "mod1.2", "jar", "jar", "default")).exists());
+    }
+    
     public void testInline() throws Exception {
         // we first resolve another ivy file
         IvyResolve resolve = new IvyResolve();