diff --git a/WHATSNEW b/WHATSNEW index 9738198f7..d5827d00b 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -28,6 +28,10 @@ Changes that could break older environments: a check is made to see if there is another overloaded method that takes in some other type of argument. If there is one such method, then the method that takes in String as an argument is not selected by the Introspector. + +* The pattern definition **/._* has been included into the Default + Excludes list. + Fixed bugs: ----------- diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html index 566b5113a..b9a4420fe 100644 --- a/docs/manual/dirtasks.html +++ b/docs/manual/dirtasks.html @@ -26,7 +26,7 @@ time:

the include patterns, and don't match the exclude patterns, are used.

Patterns can be specified inside the buildfile via task attributes or nested elements and via external files. Each line of the external file -is taken as a pattern that is added to the list of include or exclude +is taken as a pattern that is added to the list of include or exclude patterns.

Patterns

As described earlier, patterns are used for the inclusion and exclusion. @@ -125,11 +125,11 @@ For example, mypackage/test/ is interpreted as if it were way to select just the files you want.

Examples

-
  
+
 <copy todir="${dist}">
-  <fileset dir="${src}" 
-           includes="**/images/*" 
-           excludes="**/*.gif" 
+  <fileset dir="${src}"
+           includes="**/images/*"
+           excludes="**/*.gif"
   />
 </copy>

This copies all files in directories called images that are @@ -154,6 +154,7 @@ They are:

**/#*# **/.#* **/%*% + **/._* **/CVS **/CVS/** **/.cvsignore @@ -161,10 +162,10 @@ They are:

**/SCCS/** **/vssver.scc
-

If you do not want these default excludes applied, you may disable them with the +

If you do not want these default excludes applied, you may disable them with the defaultexcludes="no" attribute.


-

Copyright © 2001 Apache Software Foundation. All rights +

Copyright © 2001-2002 Apache Software Foundation. All rights Reserved.

diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index d6a4cfef5..ec4b953ce 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2001 The Apache Software Foundation. All rights + * Copyright (c) 2000-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -151,6 +151,7 @@ public class DirectoryScanner implements FileScanner { "**/#*#", "**/.#*", "**/%*%", + "**/._*", "**/CVS", "**/CVS/**", "**/.cvsignore",