diff --git a/WHATSNEW b/WHATSNEW index b02c0fc54..f6ee4de53 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -10,6 +10,8 @@ Changes that could break older environments: rmic to use a new compiler a lot easier but may break custom versions of this task that rely on the old implementation. +* can now work on s + Other changes: -------------- diff --git a/docs/manual/CoreTasks/touch.html b/docs/manual/CoreTasks/touch.html index 7bb503d9f..6393813f8 100644 --- a/docs/manual/CoreTasks/touch.html +++ b/docs/manual/CoreTasks/touch.html @@ -10,7 +10,9 @@

Touch

Description

Changes the modification time of a file and possibly creates it at -the same time.

+the same time. In addition to working with a single file, this Task +can also work a Fileset (which +also includes directories).

For JDK 1.1 only the creation of new files with a modification time of now works, all other cases will emit a warning.

Parameters

@@ -23,7 +25,8 @@ of now works, all other cases will emit a warning.

file the name of the file - Yes + unless a nested fileset element + has been specified. millis @@ -48,6 +51,11 @@ modification time to the current time.

creates myfile if it doesn't exist and changes the modification time to Jun, 28 2000 2:02 pm (14:02 for those used to 24 hour times).

+
  <touch datetime="09/10/1974 4:30 pm">
+    <fileset dir="src_dir"/>
+  </touch>
+

changes the modification time to Oct, 09 1974 4:30 pm of all files and directories + found in src_dir.

Copyright © 2000,2001 Apache Software Foundation. All rights Reserved.

diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java index 44effac94..537cb0788 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -55,6 +55,8 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.*; +import org.apache.tools.ant.types.*; +import org.apache.tools.ant.util.*; import java.io.File; import java.io.FileOutputStream; @@ -64,25 +66,33 @@ import java.lang.reflect.Method; import java.text.DateFormat; import java.text.ParseException; import java.util.Date; +import java.util.Enumeration; import java.util.Locale; +import java.util.Vector; /** - * Touch a file - corresponds to the Unix touch command. + * Touch a file and/or fileset(s) -- corresponds to the Unix touch command. * *

If the file to touch doesn't exist, an empty one is - * created. Setting the modification time of files is not supported in - * JDK 1.1. + * created.

* - * @author Stefan Bodewig + *

Note: Setting the modification time of files is not supported in + * JDK 1.1.

+ * + * @author Stefan Bodewig + * @author Michael J. Sikorsky + * @author Robert Shaw */ public class Touch extends Task { private File file; // required private long millis = -1; private String dateTime; + private Vector filesets = new Vector(); /** - * The name of the file to touch. + * Sets a single source file to touch. If the file does not exist + * an empty file will be created. */ public void setFile(File file) { this.file = file; @@ -103,18 +113,25 @@ public class Touch extends Task { } /** - * Do the work. - * - * @exception BuildException Thrown in unrecoverable error. + * Adds a set of files (nested fileset attribute). + */ + public void addFileset(FileSet set) { + filesets.addElement(set); + } + + /** + * Execute the touch operation. */ public void execute() throws BuildException { - if (file.exists() && project.getJavaVersion() == Project.JAVA_1_1) { - log("Cannot change the modification time of " - + file + " in JDK 1.1", - Project.MSG_WARN); - return; + if (file == null && filesets.size() == 0) { + throw + new BuildException("Specify at least one source - a file or a fileset."); } - + + if (file != null && file.exists() && file.isDirectory()) { + throw new BuildException("Use a fileset to touch directories."); + } + if (dateTime != null) { DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, @@ -126,30 +143,54 @@ public class Touch extends Task { } } - if (millis >= 0 && project.getJavaVersion() == Project.JAVA_1_1) { - log(file + " will be created but its modification time cannot be set in JDK 1.1", - Project.MSG_WARN); - } - touch(); } /** * Does the actual work. Entry point for Untar and Expand as well. */ - void touch() throws BuildException { - if (!file.exists()) { - log("Creating "+file, Project.MSG_INFO); - try { - FileOutputStream fos = new FileOutputStream(file); - fos.write(new byte[0]); - fos.close(); - } catch (IOException ioe) { - throw new BuildException("Could not create "+file, ioe, - location); + protected void touch() throws BuildException { + if (file != null) { + if (!file.exists()) { + log("Creating "+file, Project.MSG_INFO); + try { + FileOutputStream fos = new FileOutputStream(file); + fos.write(new byte[0]); + fos.close(); + } catch (IOException ioe) { + throw new BuildException("Could not create "+file, ioe, + location); + } } + touch(file); } + if (millis >= 0 && project.getJavaVersion() == Project.JAVA_1_1) { + log("modification time of files cannot be set in JDK 1.1", + Project.MSG_WARN); + return; + } + + // deal with the filesets + for (int i=0; i < filesets.size(); i++) { + FileSet fs = (FileSet) filesets.elementAt(i); + DirectoryScanner ds = fs.getDirectoryScanner(project); + File fromDir = fs.getDir(project); + + String[] srcFiles = ds.getIncludedFiles(); + String[] srcDirs = ds.getIncludedDirectories(); + + for(int j=0; j < srcFiles.length ; j++) { + touch(new File(fromDir, srcFiles[j])); + } + + for(int j=0; j < srcDirs.length ; j++) { + touch(new File(fromDir, srcDirs[j])); + } + } + } + + protected void touch(File file) { if (project.getJavaVersion() == Project.JAVA_1_1) { return; }