bodewig 2005/02/21 00:44:33
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Zip.java
Log:
merge
Revision Changes Path
No revision
No revision
1.503.2.180 +2 -2 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.179
retrieving revision 1.503.2.180
diff -u -r1.503.2.179 -r1.503.2.180
--- WHATSNEW 18 Feb 2005 13:16:47 -0000 1.503.2.179
+++ WHATSNEW 21 Feb 2005 08:44:32 -0000 1.503.2.180
@@ -204,8 +204,8 @@
connetced to, potentially leading to exceptions in commons-net.
Bugzilla Report 33618.
-* <zip>'s defaultexcludes attribute was ignored when an archive was
- updated. Bugzilla Report 33412.
+* <zip> would drop files matched by defaultexcludes during updates.
+ Bugzilla Report 33412.
* <zip> couldn't store files with size between 2GB and 4GB (the
upper limit set by the ZIP format itself). Bugzilla Report 33310.
No revision
No revision
1.116.2.14 +1 -2 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.116.2.13
retrieving revision 1.116.2.14
diff -u -r1.116.2.13 -r1.116.2.14
--- Zip.java 18 Feb 2005 12:29:51 -0000 1.116.2.13
+++ Zip.java 21 Feb 2005 08:44:32 -0000 1.116.2.14
@@ -482,8 +482,7 @@
ZipFileSet oldFiles = new ZipFileSet();
oldFiles.setProject(getProject());
oldFiles.setSrc(renamedFile);
- oldFiles.setDefaultexcludes(getImplicitFileSet()
- .getDefaultexcludes());
+ oldFiles.setDefaultexcludes(false);
for (int i = 0; i < addedFiles.size(); i++) {
PatternSet.NameEntry ne = oldFiles.createExclude();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
