Author: gscokart
Date: Sun Jul 20 03:12:00 2008
New Revision: 678265
URL: http://svn.apache.org/viewvc?rev=678265&view=rev
Log:
FIX: Ivy causes IveDE to fail where a properties file is relative to
ivyconf.xml (IVY-573) (thank to Jamie Burns)
Added:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-properties-relative-to-ivyconf.xml
(with props)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=678265&r1=678264&r2=678265&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sun Jul 20 03:12:00 2008
@@ -21,6 +21,7 @@
Matthieu Brouillard
Carlton Brown
Mirko Bulovic
+ Jamie Burns
Kristian Cibulskis
Andrea Bernardo Ciddio
Archie Cobbs
@@ -161,6 +162,7 @@
- FIX: The Bundle-Version is 0.0.0 in the build artifacts (IVY-802)
- FIX: Fix the encoding used in XML reports (IVY-816)
- FIX: Properties tag in ivy conf do not support relative path (IVY-89)
+- FIX: Ivy causes IveDE to fail where a properties file is relative to
ivyconf.xml (IVY-573)
- DOCUMENTATION: Fixed more than a hundred (100+) obsolete "configuration"
references; replaced with "settings" (IVY-863) (thanks to Sakari Maaranen)
- DOCUMENTATION: Elaborated documentation of ivy files and deliver/publish
tasks (IVY-847) (thanks to Sakari Maaranen)
Modified:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java?rev=678265&r1=678264&r2=678265&view=diff
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
(original)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
Sun Jul 20 03:12:00 2008
@@ -475,6 +475,15 @@
}
+ public void testRelativePropertiesFile() throws Exception {
+ IvySettings settings = new IvySettings();
+ XmlSettingsParser parser = new XmlSettingsParser(settings);
+ parser.parse(XmlSettingsParser.class
+ .getResource("ivyconf-properties-relative-to-ivyconf.xml"));
+
+ assertEquals("lib", settings.getVariable("libraries.dir"));
+ }
+
public void testParser() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
Added:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-properties-relative-to-ivyconf.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-properties-relative-to-ivyconf.xml?rev=678265&view=auto
==============================================================================
---
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-properties-relative-to-ivyconf.xml
(added)
+++
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-properties-relative-to-ivyconf.xml
Sun Jul 20 03:12:00 2008
@@ -0,0 +1,50 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<ivysettings>
+ <!-- properties file is relative to ivyconf.xml - ie this file -->
+ <properties file="ivysettings.properties"/>
+
+ <conf defaultCache="mycache" defaultResolver="libraries"
validate="false"
+ checkUpToDate="false"
cacheIvyPattern="[module]/ivys/ivy-[revision].xml"
+ cacheArtifactPattern="[module]/[type]s/[artifact]-[revision].[ext]"/>
+
+ <latest-strategies>
+ <latest-revision name="mylatest-revision">
+ <specialMeaning name="PRE" value="-2"/>
+ <specialMeaning name="QA" value="4"/>
+ </latest-revision>
+ </latest-strategies>
+ <resolvers>
+ <chain name="internal">
+ <filesystem name="int1" latest="latest-time">
+ <ivy
pattern="${shared}/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <artifact
pattern="${shared}/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
+ </filesystem>
+ <ibiblio name="int2"/>
+ </chain>
+ <filesystem name="libraries" latest="latest-revision">
+ <ivy
pattern="${libraries.dir}/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <artifact
pattern="${libraries.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
+ </filesystem>
+ </resolvers>
+ <modules>
+ <module organisation="jayasoft" name="ivy*" matcher="glob"
resolver="int1"/>
+ <module organisation="jayasoft" name=".*" resolver="internal"/>
+ </modules>
+</ivysettings>
Propchange:
ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-properties-relative-to-ivyconf.xml
------------------------------------------------------------------------------
svn:eol-style = native
