You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/10/28 16:27:42 UTC
svn commit: r589378 - in /incubator/ivy/core/trunk: CHANGES.txt
src/java/org/apache/ivy/ant/IvyAntSettings.java
Author: xavier
Date: Sun Oct 28 09:27:41 2007
New Revision: 589378
URL: http://svn.apache.org/viewvc?rev=589378&view=rev
Log:
FIX: ivy:settings and ivy:retrieve with explicit id causes unwarranted DEPRECATED warning (thanks to Jacob Grydholt Jensen)
Modified:
incubator/ivy/core/trunk/CHANGES.txt
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java
Modified: incubator/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?rev=589378&r1=589377&r2=589378&view=diff
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Sun Oct 28 09:27:41 2007
@@ -64,6 +64,7 @@
- FIX: cachepath based on a resolve done in a previous build broken (IVY-583)
- FIX: Resolving dynamic version fails when using multiple patterns if only one pattern find a revision and others don't (IVY-602)
- FIX: Invalid character in IvyRetrieveTest causing most tests to fail (IVY-604)
+- FIX: ivy:settings and ivy:retrieve with explicit id causes unwarranted DEPRECATED warning (thanks to Jacob Grydholt Jensen)
- IMPROVEMENT: Adding option 'cp', which makes it possible for main to be loaded from file (IVY-543) (thanks to Tjeerd Verhagen)
- IMPROVEMENT: BasicURLHandler should use method=head for getURLInfo (IVY-611) (thanks to Jim Bonanno)
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java?rev=589378&r1=589377&r2=589378&view=diff
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java Sun Oct 28 09:27:41 2007
@@ -288,15 +288,18 @@
*/
private void defineDefaultSettingFile(IvyVariableContainer variableContainer) {
String settingsFileName = variableContainer.getVariable("ivy.conf.file");
- if (settingsFileName != null) {
+ if (settingsFileName != null
+ && !settingsFileName.equals(variableContainer.getVariable("ivy.settings.file"))) {
Message.deprecated("'ivy.conf.file' is deprecated, use 'ivy.settings.file' instead");
} else {
settingsFileName = variableContainer.getVariable("ivy.settings.file");
}
File[] settingsLocations = new File[] {
new File(getProject().getBaseDir(), settingsFileName),
- new File(getProject().getBaseDir(), "ivyconf.xml"), new File(settingsFileName),
- new File("ivyconf.xml") };
+ new File(getProject().getBaseDir(), "ivyconf.xml"),
+ new File(settingsFileName),
+ new File("ivyconf.xml")
+ };
for (int i = 0; i < settingsLocations.length; i++) {
file = settingsLocations[i];
Message.verbose("searching settings file: trying " + file);