peterreilly 2004/03/22 07:55:42
Modified: src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
Project.java
. Tag: ANT_16_BRANCH WHATSNEW CONTRIBUTORS
Log:
sync with head
Revision Changes Path
No revision
No revision
1.154.2.8 +6 -1 ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.154.2.7
retrieving revision 1.154.2.8
diff -u -r1.154.2.7 -r1.154.2.8
--- Project.java 9 Mar 2004 17:01:29 -0000 1.154.2.7
+++ Project.java 22 Mar 2004 15:55:42 -0000 1.154.2.8
@@ -137,6 +137,11 @@
private Hashtable targets = new Hashtable();
/** Set of global filters. */
private FilterSet globalFilterSet = new FilterSet();
+ {
+ // Initialize the globalFileSet's project
+ globalFilterSet.setProject(this);
+ }
+
/**
* Wrapper around globalFilterSet. This collection only ever
* contains one FilterSet, but the wrapper is needed in order to
No revision
No revision
1.503.2.62 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.61
retrieving revision 1.503.2.62
diff -u -r1.503.2.61 -r1.503.2.62
--- WHATSNEW 15 Mar 2004 15:32:40 -0000 1.503.2.61
+++ WHATSNEW 22 Mar 2004 15:55:42 -0000 1.503.2.62
@@ -100,6 +100,8 @@
* Ant 1.6.0 cannot run build scripts in directories with non-ASCII names.
Bugzilla Report 26642.
+* filterset used by filtertask doesn't respect loglevel. Bugzilla Report
27568.
+
Other changes:
--------------
1.1.2.2 +2 -2 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CONTRIBUTORS 9 Mar 2004 17:27:24 -0000 1.1.2.1
+++ CONTRIBUTORS 22 Mar 2004 15:55:42 -0000 1.1.2.2
@@ -104,6 +104,7 @@
Ludovic Claude
Magesh Umasankar
Maneesh Sahu
+Marcel Schutte
Marcus Börger
Mariusz Nowostawski
Martijn Kruithof
@@ -162,8 +163,7 @@
Sean Egan
Sean P. Kane
Shiraz Kanga
-skanthak
-slo
+Sebastian Kantha
Stefan Bodewig
Stefano Mazzocchi
Stephane Bailliez
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
