ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant DirectoryScanner.java
Date Mon, 20 Jan 2003 08:20:44 GMT
bodewig     2003/01/20 00:20:44

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               docs/manual Tag: ANT_15_BRANCH dirtasks.html
               src/main/org/apache/tools/ant Tag: ANT_15_BRANCH
                        DirectoryScanner.java
  Log:
  Merge fix fro Bug 11880 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.113 +2 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.112
  retrieving revision 1.263.2.113
  diff -u -r1.263.2.112 -r1.263.2.113
  --- WHATSNEW	17 Jan 2003 14:46:50 -0000	1.263.2.112
  +++ WHATSNEW	20 Jan 2003 08:20:43 -0000	1.263.2.113
  @@ -76,6 +76,8 @@
     jarsigner tool to be specified. The jarsigner from the JDK's JAVA_HOME bin
     dir is now used rather than the first jarsigner on the path.
   
  +* **/.DS_Store has been added to the list of default pattern excludes.
  +
   Changes from Ant 1.5.1Beta1 to 1.5.1
   ====================================
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.3  +2 -1      jakarta-ant/docs/manual/dirtasks.html
  
  Index: dirtasks.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/dirtasks.html,v
  retrieving revision 1.13.2.2
  retrieving revision 1.13.2.3
  diff -u -r1.13.2.2 -r1.13.2.3
  --- dirtasks.html	4 Jul 2002 06:41:48 -0000	1.13.2.2
  +++ dirtasks.html	20 Jan 2003 08:20:43 -0000	1.13.2.3
  @@ -163,11 +163,12 @@
        **/vssver.scc
        **/.svn
        **/.svn/**
  +     **/.DS_Store
   </pre>
   <p>If you do not want these default excludes applied, you may disable them with the
   <code>defaultexcludes=&quot;no&quot;</code> attribute.</p>
   <hr>
  -<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All
rights
  +<p align="center">Copyright &copy; 2000-2003 Apache Software Foundation. All
rights
   Reserved.</p>
   
   </body>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.25.2.5  +26 -10    jakarta-ant/src/main/org/apache/tools/ant/DirectoryScanner.java
  
  Index: DirectoryScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
  retrieving revision 1.25.2.4
  retrieving revision 1.25.2.5
  diff -u -r1.25.2.4 -r1.25.2.5
  --- DirectoryScanner.java	4 Dec 2002 17:02:27 -0000	1.25.2.4
  +++ DirectoryScanner.java	20 Jan 2003 08:20:43 -0000	1.25.2.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -159,19 +159,31 @@
        * @see #addDefaultExcludes()
        */
       protected static final String[] DEFAULTEXCLUDES = {
  +        // Miscellaneous typical temporary files
           "**/*~",
           "**/#*#",
           "**/.#*",
           "**/%*%",
           "**/._*",
  +
  +        // CVS
           "**/CVS",
           "**/CVS/**",
           "**/.cvsignore",
  +
  +        // SCCS
           "**/SCCS",
           "**/SCCS/**",
  +
  +        // Visual SourceSafe
           "**/vssver.scc",
  +
  +        // Subversion
           "**/.svn",
  -        "**/.svn/**"
  +        "**/.svn/**",
  +
  +        // Mac
  +        "**/.DS_Store"
       };
   
       /** The base directory to be scanned. */
  @@ -855,11 +867,13 @@
       }
   
       /**
  -     * Returns the names of the files which were selected. The names
  -     * are relative to the base directory. This involves performing
  -     * a slow scan if one has not already been completed.
  +     * <p>Returns the names of the files which were selected out and
  +     * therefore not ultimately included.</p>
  +     *
  +     * <p>The names are relative to the base directory. This involves
  +     * performing a slow scan if one has not already been completed.</p>
        *
  -     * @return the names of the files which were selected.
  +     * @return the names of the files which were deselected.
        *
        * @see #slowScan
        */
  @@ -932,11 +946,13 @@
       }
   
       /**
  -     * Returns the names of the directories which were selected. The names
  -     * are relative to the base directory. This involves performing a
  -     * slow scan if one has not already been completed.
  +     * <p>Returns the names of the directories which were selected out and
  +     * therefore not ultimately included.</p>
  +     *
  +     * <p>The names are relative to the base directory. This involves
  +     * performing a slow scan if one has not already been completed.</p>
        *
  -     * @return the names of the directories which were selected.
  +     * @return the names of the directories which were deselected.
        *
        * @see #slowScan
        */
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message