Author: hibou
Date: Tue Aug 21 20:07:09 2012
New Revision: 1375747
URL: http://svn.apache.org/viewvc?rev=1375747&view=rev
Log:
Fix tests: we need the url of the parent dir, not the url of the ivysettings...
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java?rev=1375747&r1=1375746&r2=1375747&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
Tue Aug 21 20:07:09 2012
@@ -478,6 +478,8 @@ public class IvySettings implements Sort
setDeprecatedVariable("ivy.conf.file", "ivy.settings.file");
setVariable("ivy.settings.url",
settingsFile.toURI().toURL().toExternalForm());
setDeprecatedVariable("ivy.conf.url", "ivy.settings.url");
+ setVariable("ivy.settings.dir.url", new
File(settingsFile.getAbsolutePath())
+ .getParentFile().toURI().toURL().toExternalForm());
} catch (MalformedURLException e) {
IllegalArgumentException iae = new IllegalArgumentException(
"given file cannot be transformed to url: " +
settingsFile);
Modified: ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml?rev=1375747&r1=1375746&r2=1375747&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml (original)
+++ ant/ivy/core/trunk/test/repositories/m2/ivysettings.xml Tue Aug 21 20:07:09
2012
@@ -20,7 +20,7 @@
<settings defaultCache="${ivy.basedir}/build/cache"
defaultResolver="m2"/>
<resolvers>
<ibiblio name="m2" m2compatible="true" useMavenMetadata="true"
- root="${ivy.settings.url}" />
+ root="${ivy.settings.dir.url}" />
<filesystem name="IVY-1324">
<ivy
pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[artifact]-[revision].[ext]"/>
<artifact
pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[originalname].[ext]"/>
