Author: maartenc
Date: Fri Apr 25 14:29:14 2008
New Revision: 651702
URL: http://svn.apache.org/viewvc?rev=651702&view=rev
Log:
FIX: Using ivy:settings with the "id" attribute not behaving as expected
(IVY-809)
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/IvyAntSettingsBuildFile.xml
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=651702&r1=651701&r2=651702&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Apr 25 14:29:14 2008
@@ -79,6 +79,7 @@
- IMPROVEMENT: Change allownomd and skipbuildwithoutivy into a more
semantically correct name (IVY-297)
- IMPROVEMENT: Smarter determination if an expression is exact or not for
RegexpPatternMatcher and GlobPatternMatcher
+- FIX: Using ivy:settings with the "id" attribute not behaving as expected
(IVY-809)
- FIX: onMissingDescriptor doesn't work due to == comparison (IVY-805) (thanks
to Ben Hale)
- FIX: revision token is not set in report outputpattern (IVY-272)
- FIX: Ivy uses the first set of configurations it sees when resolving
multiple versions of a module (IVY-681)
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=651702&r1=651701&r2=651702&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
Apr 25 14:29:14 2008
@@ -288,6 +288,7 @@
resolve.setValidate(isValidate());
resolve.setKeep(isKeep());
resolve.setLog(getLog());
+ resolve.setSettingsRef(getSettingsRef());
return resolve;
}
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml?rev=651702&r1=651701&r2=651702&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFile.xml
Fri Apr 25 14:29:14 2008
@@ -34,4 +34,9 @@
<ivy:settings id="test2" file="test/repositories/ivysettings.xml"
override="false" />
<ivy:resolve settingsRef="test2"
file="test/java/org/apache/ivy/ant/ivy-simple.xml" />
</target>
+
+ <target name="testUnnecessaryDefaultIvyInstance">
+ <ivy:settings id="testUnnecessaryDefaultIvyInstance"
file="test/repositories/ivysettings.xml" override="true" />
+ <ivy:cachepath settingsRef="testUnnecessaryDefaultIvyInstance"
file="test/java/org/apache/ivy/ant/ivy-simple.xml" pathid="ptest" />
+ </target>
</project>
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java?rev=651702&r1=651701&r2=651702&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
Fri Apr 25 14:29:14 2008
@@ -41,5 +41,10 @@
assertFalse(report.hasError());
assertEquals(1, report.getDependencies().size());
}
-
+
+ public void testUnnecessaryDefaultIvyInstance() {
+ executeTarget("testUnnecessaryDefaultIvyInstance");
+ assertNull("Default ivy.instance settings shouldn't have been loaded",
+ getProject().getReference("ivy.instance"));
+ }
}
