natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests: we need the url of the parent dir, not the url of the ivysettings... 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1375747 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nicolas Lalevee 2012-08-21 20:07:09 +00:00
parent 54fdc54dd2
commit 0ff7c09114
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/ivy/core/settings/IvySettings.java
View File

@ -478,6 +478,8 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P
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);

2
test/repositories/m2/ivysettings.xml
View File

@ -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]"/>