ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r619946 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/core/install/InstallEngine.java test/java/org/apache/ivy/core/install/InstallTest.java test/repositories/1/orgfailure/modfailure/jars/modfailure-1.0.jar
Date Fri, 08 Feb 2008 17:17:11 GMT
Author: xavier
Date: Fri Feb  8 09:17:07 2008
New Revision: 619946

URL: http://svn.apache.org/viewvc?rev=619946&view=rev
Log:
FIX: ivy:install task not using validate attribute (IVY-728)

Added:
    ant/ivy/core/trunk/test/repositories/1/orgfailure/modfailure/jars/modfailure-1.0.jar 
 (with props)
Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=619946&r1=619945&r2=619946&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Feb  8 09:17:07 2008
@@ -78,6 +78,7 @@
 - IMPROVEMENT: Downgrade Ant version requirement to 1.6 to build Ivy (IVY-687)
 - IMPROVEMENT: In the ResolveReport class, add the possibility to filter the evicted module
while getting the list of DownloadArtifact (IVY-704) (thanks to Nicolas Lalevée)
 
+- FIX: ivy:install task not using validate attribute (IVY-728)
 - FIX: Bad conflict resolution leads to bad "configuration(s) not found" error (IVY-729)
 - FIX: Resolving for muyltiple configurations when one is not in the list of available configurations
does not abort the build (IVY-720)
 - FIX: Branch attribute considered as both a standard and extra attribute on module info
(IVY-726)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java?rev=619946&r1=619945&r2=619946&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java Fri Feb  8
09:17:07 2008
@@ -126,7 +126,9 @@
 
             Message.info(":: resolving dependencies ::");
             ResolveOptions options = new ResolveOptions()
-                                .setResolveId(resolveId).setConfs(new String[] {"default"});
+                                .setResolveId(resolveId)
+                                .setConfs(new String[] {"default"})
+                                .setValidate(validate);
             IvyNode[] dependencies = resolveEngine.getDependencies(md, options, report);
             report.setDependencies(Arrays.asList(dependencies), artifactFilter);
 

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java?rev=619946&r1=619945&r2=619946&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java Fri Feb  8 09:17:07
2008
@@ -41,6 +41,30 @@
         assertTrue(new File("build/test/install/org1/mod1.2/mod1.2-2.0.jar").exists());
     }
 
+    public void testValidate() throws Exception {
+        Ivy ivy = Ivy.newInstance();
+        ivy.configure(new File("test/repositories/ivysettings.xml"));
+
+        ivy.install(ModuleRevisionId.newInstance("orgfailure", "modfailure", "1.0"), ivy.getSettings()
+                .getDefaultResolver().getName(), "install", true, true, true, null,
+            PatternMatcher.EXACT);
+
+        assertFalse(new File("build/test/install/orgfailure/modfailure/ivy-1.0.xml").exists());
+        assertFalse(new File("build/test/install/orgfailure/modfailure/modfailure-1.0.jar").exists());
+    }
+
+    public void testNoValidate() throws Exception {
+        Ivy ivy = Ivy.newInstance();
+        ivy.configure(new File("test/repositories/ivysettings.xml"));
+
+        ivy.install(ModuleRevisionId.newInstance("orgfailure", "modfailure", "1.0"), ivy.getSettings()
+                .getDefaultResolver().getName(), "install", true, false, true, null,
+            PatternMatcher.EXACT);
+
+        assertTrue(new File("build/test/install/orgfailure/modfailure/ivy-1.0.xml").exists());
+        assertTrue(new File("build/test/install/orgfailure/modfailure/modfailure-1.0.jar").exists());
+    }
+
     public void testSimpleWithoutDefaultResolver() throws Exception {
         Ivy ivy = Ivy.newInstance();
         ivy.configure(new File("test/repositories/ivysettings-nodefaultresolver.xml"));

Added: ant/ivy/core/trunk/test/repositories/1/orgfailure/modfailure/jars/modfailure-1.0.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/1/orgfailure/modfailure/jars/modfailure-1.0.jar?rev=619946&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/1/orgfailure/modfailure/jars/modfailure-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message