From ea21f122ab7f20196ffe7e065fe5ac2b0d194df3 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 12 Jul 2001 13:02:47 +0000
Subject: [PATCH] Add vssver.scc to default excludes

PR: 2015

In some cases DirectoryScanner could miss included files/directories.

PR: 1415


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269333 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |   5 +
 docs/manual/dirtasks.html                     |   1 +
 .../org/apache/tools/ant/DesirableFilter.java |   5 +
 .../apache/tools/ant/DirectoryScanner.java    |  12 +-
 .../tools/ant/DirectoryScannerTest.java       | 112 ++++++++++++++++++
 5 files changed, 132 insertions(+), 3 deletions(-)
 create mode 100644 src/testcases/org/apache/tools/ant/DirectoryScannerTest.java

diff --git a/WHATSNEW b/WHATSNEW
index df82bd9aa..7d8f4c724 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -110,6 +110,8 @@ Other changes:
 
 * <apply> and <execon> have been merged into a single task.
 
+* added vssver.scc to the default excludes
+
 Fixed bugs:
 -----------
 
@@ -180,6 +182,9 @@ Fixed bugs:
 * <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
 ===========================================
 
diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html
index d8e8d12d3..db00e9bca 100644
--- a/docs/manual/dirtasks.html
+++ b/docs/manual/dirtasks.html
@@ -159,6 +159,7 @@ They are:</p>
      **/.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>
diff --git a/src/main/org/apache/tools/ant/DesirableFilter.java b/src/main/org/apache/tools/ant/DesirableFilter.java
index af348343e..92672ad0b 100644
--- a/src/main/org/apache/tools/ant/DesirableFilter.java
+++ b/src/main/org/apache/tools/ant/DesirableFilter.java
@@ -114,6 +114,11 @@ public class DesirableFilter implements FilenameFilter {
             return false;
         }
     
+        // Visual Source Save
+        if (name.equals("vssver.scc")) {
+            return false;
+        }
+
         // default
         return true;
     }
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index e86e73c74..ba6d9e7dd 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -149,7 +149,8 @@ public class DirectoryScanner implements FileScanner {
         "**/CVS/**",
         "**/.cvsignore",
         "**/SCCS",
-        "**/SCCS/**"
+        "**/SCCS/**",
+        "**/vssver.scc"
     };
 
     /**
@@ -708,7 +709,10 @@ strLoop:
         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 @@ strLoop:
                         }
                     } else {
                         dirsExcluded.addElement(name);
+                        if (fast && couldHoldIncluded(name)) {
+                            scandir(file, name+File.separator, fast);
+                        }
                     }
                 } else {
                     dirsNotIncluded.addElement(name);
@@ -841,7 +848,6 @@ strLoop:
     }
 
 
-
     /**
      * Get the names of the files that matched at least one of the include
      * patterns, and matched none of the exclude patterns.
diff --git a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
new file mode 100644
index 000000000..6b3ad3fec
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
@@ -0,0 +1,112 @@
+/*
+ * 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);
+
+    }
+
+}