Index: docs/index.html =================================================================== RCS file: /home/cvspublic/jakarta-ant/docs/index.html,v retrieving revision 1.94 diff -u -r1.94 index.html --- docs/index.html 2000/09/07 11:08:59 1.94 +++ docs/index.html 2000/09/08 21:08:34 @@ -828,6 +828,7 @@
  • AntStructure
  • Available
  • Chmod
    • +
  • Copy
  • Copydir
  • Copyfile
  • Cvs
    • @@ -848,6 +849,7 @@
  • Javac
  • Javadoc/Javadoc2
  • Mkdir
    • +
  • Move
  • Patch
  • Property
  • Rename
    • @@ -1097,6 +1099,88 @@ with id other.shared.sources get the same permissions.

    +

    Copy

    +

    Description

    +

    Copies a file or directory to a new file or directory. Files are +only copied if the source file is newer than the destination file, +or when the destination file does not exist. However, you can explicitly +overwrite files with the overwrite attribute.

    +

    FileSets are used to select files to copy. +To use a fileset, the todir attribute must be set.

    +

    Parameters

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    AttributeDescriptionRequired
    filethe file to copyOne of file or + dir are required, or a nested fileset element
    dirthe directory to copy
    tofilethe file to copy toWith the file attribute, + either tofile or todir can be used. With the dir + attribute and nested filesets, only todir is allowed.
    todirthe directory to copy to
    overwriteoverwrite existing files even if the destination + files are newer (default is false)No
    filteringindicates whether token filtering should take place during + the copyNo
    flattenignore directory structure of source directory, + copy all files into a single directory, specified by the todir + attribute (default is false).No
    +

    Examples

    +

    Copy a single file

    +
    +  <copy file="myfile.txt" tofile="mycopy.txt" />
+
    +

    Copy a file to a directory

    +
    +  <copy file="myfile.txt" todir="../some/dir/tree" />
+
    +

    Copy a directory to another directory

    +
    +  <copy dir="src_dir" todir="../new/dir" />
+
    +

    Copy a set of files to a directory

    +
    +  <copy todir="../dest/dir" >
+    <fileset dir="src_dir" >
+      <exclude name="**/*.java" />
+    </fileset>
+  </copy>
+
+  <copy todir="../dest/dir" >
+    <fileset dir="src_dir" excludes="**/*.java" />
+  </copy>
+
    +

    Copydir

    Description

    Copies a directory tree from the source to the destination.

    @@ -1311,21 +1395,9 @@

    Delete

    Description

    -

    Deletes either a single file or -all files in a specified directory and its sub-directories.

    -

    It is possible to refine the set of files that are being deleted. This can be -done with the includes, includesfile, excludes, excludesfile and defaultexcludes -attributes. With the includes or includesfile attribute you specify the files you want to -have included in the deletion process by using patterns. The exclude or excludesfile attribute is used to specify -the files you want to have excluded from the deletion process. This is also done with patterns. And -finally with the defaultexcludes attribute, you can specify whether you -want to use default exclusions or not. See the section on directory based tasks, on how the -inclusion/exclusion of files works, and how to write patterns.

    -

    This task forms an implicit FileSet and -supports all attributes of <fileset> as well as the -nested <include>, <exclude> and -<patternset> elements.

    +

    Deletes either a single file, all files in a specified directory and its +sub-directories, or a set of files specified by a FileSet. +When specifying a set of files, empty directories are not removed.

    Parameters

    @@ -1335,58 +1407,38 @@ - - + + - - - - - - - - - - - + - - - - - - - - - - - - - - - - +
    fileThe file to delete.at least one of the twothe file to deleteat least one of the two, or + at least one nested FileSet
    dirThe directory to delete files from.
    includesComma separated list of patterns of files that must be - deleted. All files are in the current directory - and any sub-directories are deleted when omitted.No
    includesfilethe name of a file. Each line of this file is - taken to be an include patternNothe directory to delete files from
    excludesComma separated list of patterns of files that must be - excluded from the deletion list. No files (except default excludes) are excluded when omitted.No
    excludesfilethe name of a file. Each line of this file is - taken to be an exclude patternNo
    defaultexcludesIndicates whether default excludes should be used or not - ("yes"/"no"). Default excludes are used when omitted.No
    verboseShow name of each deleted file ("true"/"false"). Default is "false" when omitted.show the name of each deleted file ("true"/"false"). + Default is "false". No

    Examples

    -
      <delete file="/lib/ant.jar" />
    +

    Delete a single file

    +
    +  <delete file="/lib/ant.jar" />
+

    deletes the file /lib/ant.jar.

    -
      <delete dir="lib" />
    -

    deletes all files in the /lib directory.

    -
      <delete dir="."
-          includes="**/*.bak"
-  />
+
    Delete a directory
    
+
    +  <delete dir="lib" />
+
    
+
    deletes all files in the lib directory, and the 
+directory itself.
    
+
    Delete a set of files
    
+
    +  <delete >
+    <fileset dir="." includes="**/*.bak" />
+  </delete>
 
    
 
    deletes all files with the extension ".bak" from the current directory 
 and any sub-directories.
    
@@ -2954,6 +3006,88 @@
 
    creates a directory ${dist}.
    
 
    <mkdir dir="${dist}/lib" />
    
 
    creates a directory ${dist}/lib.
    
+
    
+
    Move
    
+
    Description
    
+
    Moves a file or directory to a new file or directory, or sets of files to
+a new directory.  By default, the
+destination file is overwritten if it already exists.  When overwrite is
+turned off, then files are only moved if the source file is newer than
+the destination file, or when the destination file does not exist.
    
+
    FileSets are used to select sets of files
+to move to the todir directory.
    
+
    Parameters
    
+
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+
    AttributeDescriptionRequired
    filethe file to moveOne of file or 
+    dir are required, or at least one nested fileset element
    dirthe directory to move
    tofilethe file to move toWith the file attribute, 
+    either tofile or todir can be used.  With the dir
+    attribute or a nested fileset, only todir is allowed.
    todirthe directory to move to
    overwriteoverwrite existing files even if the destination
+      files are newer (default is "true")No
    filteringindicates whether token filtering should take place during
+      the move.  See the filter task for a description of
+      how filters work.No
    flattenignore directory structure of source directory,
+      copy all files into a single directory, specified by the todir
+      attribute (default is "false").No
    
+
    Examples
    
+
    Move a single file
    
+
    +  <move file="file.orig" tofile="file.moved" />
+
    
+
    Move a single file to a directory
    
+
    +  <move file="file.orig" todir="dir/to/move/to" />
+
    
+
    Move a directory to a new directory
    
+
    +  <move dir="src/dir" todir="new/dir/to/move/to" />
+
    
+
    Note that the directory src/dir will be removed.
    
+
    Move a set of files to a new directory
    
+
    +  <move todir="some/new/dir" >
+    <fileset dir="my/src/dir" >
+      <include name="**/*.jar" />
+      <exclude name="**/ant.jar" />
+    </fileset>
+  </move>
+
    
 
    
 
    Patch
    
 
    Description
    
Index: src/main/org/apache/tools/ant/taskdefs/Delete.java
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
retrieving revision 1.6
diff -u -r1.6 Delete.java
--- src/main/org/apache/tools/ant/taskdefs/Delete.java	2000/07/06 16:48:14	1.6
+++ src/main/org/apache/tools/ant/taskdefs/Delete.java	2000/09/08 21:08:37
@@ -54,26 +54,35 @@
 package org.apache.tools.ant.taskdefs;
 
 import org.apache.tools.ant.*;
+import org.apache.tools.ant.types.*;
 import java.io.*;
+import java.util.*;
 
 /**
- * Deletes a single file or a set of files defined by a pattern.
+ * Deletes a file or directory, or set of files defined by a fileset.
+ * The original delete task would delete a file, or a set of files 
+ * using the include/exclude syntax.  The deltree task would delete a 
+ * directory tree.  This task combines the functionality of these two
+ * originally distinct tasks.
  * 
  * @author stefano@apache.org
  * @author Tom Dimock tad1@cornell.edu
+ * @author Glenn McAllister glennm@ca.ibm.com
  */
-public class Delete extends MatchingTask {
-    private File delDir = null;
+public class Delete extends Task {
+    protected File file = null;
+    protected File dir = null;
+    protected Vector filesets = new Vector();
+
     private int verbosity = Project.MSG_VERBOSE;
-    private File f = null;
 
     /**
      * Set the name of a single file to be removed.
      * 
      * @param file the file to be deleted
      */
-    public void setFile(String file) {
-        f = project.resolveFile(file);
+    public void setFile(File file) {
+        this.file = file;
     } 
 
     /**
@@ -81,8 +90,8 @@
      * 
      * @param dir the directory path.
      */
-    public void setDir(String dir) {
-        delDir = project.resolveFile(dir);
+    public void setDir(File dir) {
+        this.dir = dir;
     } 
 
     /**
@@ -90,67 +99,96 @@
      * 
      * @param verbose "true" or "on"
      */
-    public void setVerbose(String verbose) {
-        if ("true".equalsIgnoreCase(verbose.trim()) || "on".equalsIgnoreCase(verbose.trim())) {
+    public void setVerbose(boolean verbose) {
+        if (verbose) {
             this.verbosity = Project.MSG_INFO;
         } else {
             this.verbosity = Project.MSG_VERBOSE;
         } 
     } 
 
+    /**
+     * Adds a set of files (nested fileset attribute).
+     */
+    public void addFileset(FileSet set) {
+        filesets.addElement(set);
+    }
+
     /**
-     * Make it so.  Delete the file(s).
+     * Delete the file(s).
      * 
      * @throws BuildException
      */
     public void execute() throws BuildException {
-        if (f == null && delDir == null) {
-            throw new BuildException(" or  attribute must be set!");
+        if (file == null && dir == null && filesets.size() == 0) {
+            throw new BuildException("At least one of the file or dir attributes, or a fileset element, must be set.");
         } 
 
-        // old  functionality must still work
-        if (f != null) {
-            if (f.exists()) {
-                if (f.isDirectory()) {
-                    log("Directory: " + f.getAbsolutePath() + " cannot be removed with delete.  Use Deltree instead.");
+        // delete the single file
+        if (file != null) {
+            if (file.exists()) {
+                if (file.isDirectory()) {
+                    log("Directory " + file.getAbsolutePath() + " cannot be removed using the file attribute.  Use dir instead.");
                 } else {
-                    log("Deleting: " + f.getAbsolutePath());
+                    log("Deleting: " + file.getAbsolutePath());
 
-                    if (!f.delete()) {
-                        throw new BuildException("Unable to delete file " + f.getAbsolutePath());
+                    if (!file.delete()) {
+                        throw new BuildException("Unable to delete file " + file.getAbsolutePath());
                     } 
                 } 
-            } 
-        } 
-
-        // now we'll do the fancy pattern-driven deletes
-        if (delDir == null) {
-            return;
-        } 
-
-        if (!delDir.exists()) {
-            throw new BuildException("dir does not exist!");
-        } 
-
-        DirectoryScanner ds = super.getDirectoryScanner(delDir);
-        String[] files = ds.getIncludedFiles();
-
-        if (files.length > 0) {
-            log("Deleting " + files.length + " files from " + delDir.getAbsolutePath());
-
-            for (int i = 0; i < files.length; i++) {
-                File f = new File(delDir, files[i]);
-
-                if (f.exists()) {
-                    log("Deleting: " + f.getAbsolutePath(), verbosity);
-
+            } else {
+                log("Could not find file " + file.getAbsolutePath() + " to delete.");
+            }
+        }
+
+        // delete the directory
+        if (dir != null) {
+            log("Deleting directory " + dir.getAbsolutePath());
+            removeDir(dir);
+        }
+
+        // delete the files in the filesets
+        for (int i=0; i 0) {
+                log("Deleting " + files.length + " files from " + fs.getDir(project));
+                for (int j=0; j