peterreilly 2004/12/10 07:20:11
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
ClasspathUtils.java
Added: src/testcases/org/apache/tools/ant/util Tag: ANT_16_BRANCH
ClasspathUtilsTest.java
Log:
sync
Revision Changes Path
No revision
No revision
1.503.2.147 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.146
retrieving revision 1.503.2.147
diff -u -r1.503.2.146 -r1.503.2.147
--- WHATSNEW 7 Dec 2004 10:30:35 -0000 1.503.2.146
+++ WHATSNEW 10 Dec 2004 15:20:10 -0000 1.503.2.147
@@ -75,6 +75,10 @@
* Incorrect classloader parent in junittask when using with ant-junit.jar
and junit.jar
not in the project classloader. Bugzilla report 28474.
+* getResources() on the classloader returned by ClasspathUtils would see
each resource
+ twice - if the resource is in the project classpath and if the classloader
is requested
+ with a null path.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===================================
No revision
No revision
1.8.2.5 +7 -9
ant/src/main/org/apache/tools/ant/util/ClasspathUtils.java
Index: ClasspathUtils.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ClasspathUtils.java,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- ClasspathUtils.java 14 Apr 2004 15:42:41 -0000 1.8.2.4
+++ ClasspathUtils.java 10 Dec 2004 15:20:11 -0000 1.8.2.5
@@ -156,13 +156,13 @@
* 'ant.reuse.loader' this will try to reuse the perviously
* created loader with that id, and of course store it there upon
* creation.</p>
- * @param path Path object to be used as classpath for this classloader
- * @param loaderId identification for this Loader,
+ * @param path Path object to be used as classpath for this
classloader
+ * @param loaderId identification for this Loader,
* @param reverseLoader if set to true this new loader will take
- * precedence over it's parent (which is contra the regular
- * @param p Ant Project where the handled components are living in.
- * classloader behaviour)
- * @return ClassLoader that uses the Path as its classpath.
+ * precedence over it's parent (which is contra the
regular
+ * classloader behaviour)
+ * @param p Ant Project where the handled components are
living in.
+ * @return ClassLoader that uses the Path as its classpath.
*/
public static ClassLoader getClassLoaderForPath(
Project p, Path path, String loaderId, boolean reverseLoader,
@@ -205,9 +205,7 @@
Project p,
Path path,
boolean reverseLoader) {
-
- AntClassLoader acl = p.createClassLoader(path != null
- ? path :
Path.systemClasspath);
+ AntClassLoader acl = p.createClassLoader(path);
if (reverseLoader) {
acl.setParentFirst(false);
acl.addJavaLibraries();
No revision
No revision
1.1.2.1 +0 -0
ant/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java
Index: ClasspathUtilsTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
