bodewig 2003/04/09 05:46:17
Modified: src/main/org/apache/tools/ant/taskdefs MatchingTask.java
Log:
Don't defer setting of default excludes for the implicit fileset,
thereby making <tar basedir="..."> and <zip basedir="..."> honor this
attribute.
PR: 18637
Revision Changes Path
1.33 +1 -3
ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
Index: MatchingTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- MatchingTask.java 7 Mar 2003 11:23:02 -0000 1.32
+++ MatchingTask.java 9 Apr 2003 12:46:17 -0000 1.33
@@ -96,7 +96,6 @@
public abstract class MatchingTask extends Task implements SelectorContainer
{
- protected boolean useDefaultExcludes = true;
protected FileSet fileset = new FileSet();
/**
@@ -214,7 +213,7 @@
* shouldn't be used.
*/
public void setDefaultexcludes(boolean useDefaultExcludes) {
- this.useDefaultExcludes = useDefaultExcludes;
+ fileset.setDefaultexcludes(useDefaultExcludes);
}
/**
@@ -222,7 +221,6 @@
*/
protected DirectoryScanner getDirectoryScanner(File baseDir) {
fileset.setDir(baseDir);
- fileset.setDefaultexcludes(useDefaultExcludes);
return fileset.getDirectoryScanner(getProject());
}
