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/testcases/org/apache/tools/ant DirectoryScannerTest.java
Date Thu, 12 Jul 2001 13:02:49 GMT
bodewig     01/07/12 06:02:48

  Modified:    .        WHATSNEW
               docs/manual dirtasks.html
               src/main/org/apache/tools/ant DesirableFilter.java
                        DirectoryScanner.java
  Added:       src/testcases/org/apache/tools/ant DirectoryScannerTest.java
  Log:
  Add vssver.scc to default excludes
  
  PR: 2015
  
  In some cases DirectoryScanner could miss included files/directories.
  
  PR: 1415
  
  Revision  Changes    Path
  1.129     +5 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- WHATSNEW	2001/07/12 12:05:59	1.128
  +++ WHATSNEW	2001/07/12 13:02:32	1.129
  @@ -110,6 +110,8 @@
   
   * <apply> and <execon> have been merged into a single task.
   
  +* added vssver.scc to the default excludes
  +
   Fixed bugs:
   -----------
   
  @@ -179,6 +181,9 @@
   
   * <apply> and <execon> do now execute the command only once, if you
     specify the parallel attribute - instead of once per fileset.
  +
  +* directory based tasks and fileset could miss some included files in
  +  directories that have been excluded
   
   Changes from Ant 1.2 to Ant 1.3
   ===========================================
  
  
  
  1.5       +1 -0      jakarta-ant/docs/manual/dirtasks.html
  
  Index: dirtasks.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/dirtasks.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- dirtasks.html	2001/03/29 10:29:46	1.4
  +++ dirtasks.html	2001/07/12 13:02:37	1.5
  @@ -159,6 +159,7 @@
        **/.cvsignore
        **/SCCS
        **/SCCS/**
  +     **/vssver.scc
   </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>
  
  
  
  1.5       +5 -0      jakarta-ant/src/main/org/apache/tools/ant/DesirableFilter.java
  
  Index: DesirableFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DesirableFilter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DesirableFilter.java	2001/05/08 09:35:28	1.4
  +++ DesirableFilter.java	2001/07/12 13:02:41	1.5
  @@ -114,6 +114,11 @@
               return false;
           }
       
  +        // Visual Source Save
  +        if (name.equals("vssver.scc")) {
  +            return false;
  +        }
  +
           // default
           return true;
       }
  
  
  
  1.15      +9 -3      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DirectoryScanner.java	2001/05/17 09:52:32	1.14
  +++ DirectoryScanner.java	2001/07/12 13:02:42	1.15
  @@ -149,7 +149,8 @@
           "**/CVS/**",
           "**/.cvsignore",
           "**/SCCS",
  -        "**/SCCS/**"
  +        "**/SCCS/**",
  +        "**/vssver.scc"
       };
   
       /**
  @@ -708,7 +709,10 @@
           dirsNotIncluded.copyInto(notIncl);
   
           for (int i=0; i<excl.length; i++) {
  -            scandir(new File(basedir, excl[i]), excl[i]+File.separator, false);
  +            if (!couldHoldIncluded(excl[i])) {
  +                scandir(new File(basedir, excl[i]), 
  +                        excl[i]+File.separator, false);
  +            }
           }
           
           for (int i=0; i<notIncl.length; i++) {
  @@ -766,6 +770,9 @@
                           }
                       } else {
                           dirsExcluded.addElement(name);
  +                        if (fast && couldHoldIncluded(name)) {
  +                            scandir(file, name+File.separator, fast);
  +                        }
                       }
                   } else {
                       dirsNotIncluded.addElement(name);
  @@ -839,7 +846,6 @@
           }
           return false;
       }
  -
   
   
       /**
  
  
  
  1.1                  jakarta-ant/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
  
  Index: DirectoryScannerTest.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant;
  
  import junit.framework.TestCase;
  import junit.framework.AssertionFailedError;
  import java.io.File;
  import java.util.*;
  
  /**
   * JUnit 3 testcases for org.apache.tools.ant.DirectoryScanner
   *
   * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
   */
  public class DirectoryScannerTest extends TestCase {
  
      public DirectoryScannerTest(String name) {super(name);}
  
      /**
       * Test inspired by Bug#1415.
       */
      public void testChildrenOfExcludedDirectory() {
          File dir = new File("src/main/org/apache/tools");
          DirectoryScanner ds = new DirectoryScanner();
          ds.setBasedir(dir);
          ds.setExcludes(new String[] {"ant/**"});
          ds.scan();
  
          boolean haveZipPackage = false;
          boolean haveTaskdefsPackage = false;
          String[] included = ds.getIncludedDirectories();
          for (int i=0; i<included.length; i++) {
              if (included[i].equals("zip")) {
                  haveZipPackage = true;
              } else if (included[i].equals("ant/taskdefs")) {
                  haveTaskdefsPackage = true;
              }
          }
          assert("(1) zip package included", haveZipPackage);
          assert("(1) taskdefs package not included", !haveTaskdefsPackage);
  
          ds = new DirectoryScanner();
          ds.setBasedir(dir);
          ds.setExcludes(new String[] {"ant"});
          ds.scan();
          haveZipPackage = false;
          included = ds.getIncludedDirectories();
          for (int i=0; i<included.length; i++) {
              if (included[i].equals("zip")) {
                  haveZipPackage = true;
              } else if (included[i].equals("ant/taskdefs")) {
                  haveTaskdefsPackage = true;
              }
          }
          assert("(2) zip package included", haveZipPackage);
          assert("(2) taskdefs package included", haveTaskdefsPackage);
  
      }
  
  }
  
  
  

Mime
View raw message