bodewig 2002/07/17 00:36:51
Modified: . WHATSNEW
src/main/org/apache/tools/ant/filters/util
ChainReaderHelper.java
Log:
Merge from the 1.5 branch.
PR: 10875
Revision Changes Path
1.277 +9 -2 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- WHATSNEW 16 Jul 2002 23:32:48 -0000 1.276
+++ WHATSNEW 17 Jul 2002 07:36:51 -0000 1.277
@@ -15,13 +15,19 @@
* The sh wrapper script could fail if you started Ant from a directory
with whitespace in its name.
+* ant -diagnostics was not working properly when the task dependency
+ was missing and was just printing the missing dependency.
+
+* The ExpandProperties filter threw NPEs when defined using
+ the <filterreader> format.
+
Other changes:
--------------
* <echoproperties> can now create XML output.
* <echoproperties> has a new srcfile attribute that can make it read
-properties files and output them instead of Ant's properties.
+ properties files and output them instead of Ant's properties.
* <filterset> will now resolve filters recursively.
@@ -29,7 +35,8 @@
* All tasks can be used outside of <target>s
-* Appendix E of Java Development with Ant (Loughran/Hatcher) contributed to
the docs
+* Appendix E of Java Development with Ant (Loughran/Hatcher)
+ contributed to the docs
Changes from Ant 1.5beta3 to Ant 1.5
====================================
1.5 +5 -0
jakarta-ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
Index: ChainReaderHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChainReaderHelper.java 12 Apr 2002 13:26:50 -0000 1.4
+++ ChainReaderHelper.java 17 Jul 2002 07:36:51 -0000 1.5
@@ -196,6 +196,11 @@
final Reader[] rdr = {instream};
instream =
(Reader)
constructors[j].newInstance(rdr);
+ if (project != null &&
+ instream instanceof
BaseFilterReader) {
+ ((BaseFilterReader)
+ instream).setProject(project);
+ }
if
(Parameterizable.class.isAssignableFrom(clazz)) {
final Parameter[] params =
filter.getParams();
((Parameterizable)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
