Author: maartenc
Date: Fri Mar 23 15:44:49 2007
New Revision: 521927
URL: http://svn.apache.org/viewvc?view=rev&rev=521927
Log:
Fixed bug and added extra junit test for IVY-366.
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?view=diff&rev=521927&r1=521926&r2=521927
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
Fri Mar 23 15:44:49 2007
@@ -151,7 +151,7 @@
}
protected ResolveReport getResolvedReport() {
- return getResolvedReport(getOrganisation(),
isInline()?getModule()+"-caller":getModule());
+ return getResolvedReport(getOrganisation(),
isInline()?getModule()+"-caller":getModule(), _resolveId);
}
public String getType() {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java?view=diff&rev=521927&r1=521926&r2=521927
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java Fri Mar
23 15:44:49 2007
@@ -236,11 +236,16 @@
return reference;
}
- protected ResolveReport getResolvedReport(String org, String module) {
- return getResolvedReport(org, module, false);
- }
- protected ResolveReport getResolvedReport(String org, String module,
boolean strict) {
- return (ResolveReport) getReference("ivy.resolved.report", org,
module, strict);
+ protected ResolveReport getResolvedReport(String org, String module,
String resolveId) {
+ ResolveReport result = null;
+
+ if (resolveId == null) {
+ result = (ResolveReport)
getReference("ivy.resolved.report", org, module, false);
+ } else {
+ result = (ResolveReport)
getReference("ivy.resolved.report." + resolveId, null, null, false);
+ }
+
+ return result;
}
protected IvyResolve createResolve(boolean haltOnFailure, boolean
useOrigin) {
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java?view=diff&rev=521927&r1=521926&r2=521927
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
(original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
Fri Mar 23 15:44:49 2007
@@ -155,6 +155,34 @@
fail("failure raised an exception with haltonfailure set to
false");
}
}
+
+ public void testWithResolveId() throws Exception {
+ IvyResolve resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new
File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setResolveId("withResolveId");
+ resolve.execute();
+
+ // resolve another ivy file
+ resolve = new IvyResolve();
+ resolve.setProject(_project);
+ resolve.setCache(_cache);
+ resolve.setFile(new
File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
+ resolve.execute();
+
+ _path.setResolveId("withResolveId");
+ _path.setPathid("withresolveid-pathid");
+ _path.execute();
+
+ Object ref = _project.getReference("withresolveid-pathid");
+ assertNotNull(ref);
+ assertTrue(ref instanceof Path);
+ Path p = (Path)ref;
+ assertEquals(1, p.size());
+ assertEquals(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2",
"jar", "jar").getAbsolutePath(),
+ new File(p.list()[0]).getAbsolutePath());
+ }
private File getArchiveFileInCache(String organisation, String module,
String revision, String artifact, String type, String ext) {
return TestHelper.getArchiveFileInCache(_path.getIvyInstance(),
_cache,
