svn commit: r544965 - in /incubator/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/ant/IvyRetrieve.java test/java/org/apache/ivy/ant/IvyRetrieveTest.java

[ma...@apache.org]

Author: maartenc
Date: Wed Jun  6 14:37:11 2007
New Revision: 544965

URL: http://svn.apache.org/viewvc?view=rev&rev=544965
Log:
FIX: Retrieve Ant task ignores resolveId attribute (IVY-522)

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

Modified: incubator/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=544965&r1=544964&r2=544965
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Wed Jun  6 14:37:11 2007
@@ -56,6 +56,7 @@
 - IMPROVEMENT: Remove @author tags (thanks to Stephane Bailliez)
 - IMPROVEMENT: Remove use of deprecated elements in ivysettings.xml (IVY-505) (with contribution from Jan Materne)
 
+- FIX: Retrieve Ant task ignores resolveId attribute (IVY-522)
 - FIX: The deprecated "keep" attribute on post resolve tasks causes an error (IVY-517)
 - FIX: Some circular dependencies not retrieved (IVY-400)
 - FIX: ${version} property not recognized in poms (IVY-512)

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java?view=diff&rev=544965&r1=544964&r2=544965
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java Wed Jun  6 14:37:11 2007
@@ -54,7 +54,8 @@
                 new RetrieveOptions().setConfs(splitConfs(getConf())).setCache(
                     CacheManager.getInstance(getIvyInstance().getSettings(), getCache()))
                         .setDestIvyPattern(_ivypattern).setArtifactFilter(artifactFilter).setSync(
-                            _sync).setUseOrigin(isUseOrigin()).setMakeSymlinks(_symlink));
+                            _sync).setUseOrigin(isUseOrigin()).setMakeSymlinks(_symlink)
+                        .setResolveId(getResolveId()));
             boolean haveTargetsBeenCopied = targetsCopied > 0;
             getProject().setProperty("ivy.nb.targets.copied", String.valueOf(targetsCopied));
             getProject().setProperty("ivy.targets.copied", String.valueOf(haveTargetsBeenCopied));

Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java?view=diff&rev=544965&r1=544964&r2=544965
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java Wed Jun  6 14:37:11 2007
@@ -175,6 +175,28 @@
             "mod1.2", "jar", "jar")).exists());
     }
 
+    public void testWithAPreviousResolveAndResolveId() throws Exception {
+        // first we do a resolve in another project
+        Project project = new Project();
+        project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+        project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
+        IvyResolve resolve = new IvyResolve();
+        resolve.setProject(project);
+        resolve.setCache(_cache);
+        resolve.setResolveId("testWithAPreviousResolveAndResolveId");
+        resolve.execute();
+
+        // then we do a retrieve with the correct module information
+        _retrieve.setOrganisation("apache");
+        _retrieve.setModule("resolve-simple");
+        _retrieve.setConf("default");
+        _retrieve.setResolveId("testWithAPreviousResolveAndResolveId");
+        _retrieve.execute();
+
+        assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.0",
+            "mod1.2", "jar", "jar")).exists());
+    }
+
     public void testUseOrigin() throws Exception {
         // test case for IVY-304
         // first we do a resolve with useOrigin=true in another project