ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sbaill...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Ant.java AntStructure.java Available.java CallTarget.java Chmod.java CompileTask.java Copy.java Copydir.java Copyfile.java Cvs.java CVSPass.java Definer.java Delete.java Deltree.java DependSet.java Ear.java Echo.java Exec.java ExecTask.java Execute.java ExecuteJava.java ExecuteOn.java Exit.java Expand.java Filter.java FixCRLF.java GenerateKey.java Get.java GUnzip.java GZip.java Jar.java Java.java Javac.java JavacOutputStream.java Javadoc.java Jikes.java JikesOutputParser.java KeySubst.java LogStreamHandler.java Manifest.java ManifestException.java MatchingTask.java Mkdir.java Move.java Parallel.java Patch.java PathConvert.java Property.java Recorder.java RecorderEntry.java Replace.java Rmic.java SendEmail.java Sequential.java SignJar.java SQLExec.java Tar.java TaskOutputStream.java Touch.java Tstamp.java Untar.java UpToDate.java War.java XSLTProcess.java Zip.java
Date Sun, 28 Oct 2001 21:26:31 GMT
sbailliez    01/10/28 13:26:31

  Modified:    src/main/org/apache/tools/ant/taskdefs Ant.java
                        AntStructure.java Available.java CallTarget.java
                        Chmod.java CompileTask.java Copy.java Copydir.java
                        Copyfile.java Cvs.java CVSPass.java Definer.java
                        Delete.java Deltree.java DependSet.java Ear.java
                        Echo.java Exec.java ExecTask.java Execute.java
                        ExecuteJava.java ExecuteOn.java Exit.java
                        Expand.java Filter.java FixCRLF.java
                        GenerateKey.java Get.java GUnzip.java GZip.java
                        Jar.java Java.java Javac.java
                        JavacOutputStream.java Javadoc.java Jikes.java
                        JikesOutputParser.java KeySubst.java
                        LogStreamHandler.java Manifest.java
                        ManifestException.java MatchingTask.java Mkdir.java
                        Move.java Parallel.java Patch.java PathConvert.java
                        Property.java Recorder.java RecorderEntry.java
                        Replace.java Rmic.java SendEmail.java
                        Sequential.java SignJar.java SQLExec.java Tar.java
                        TaskOutputStream.java Touch.java Tstamp.java
                        Untar.java UpToDate.java War.java XSLTProcess.java
                        Zip.java
  Log:
  Code clean up:
   - removed useless/duplicate imports
   - added explicit imports rather than *
   - changed specifiers order to be conform to JLS.
  
  Revision  Changes    Path
  1.30      +13 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Ant.java	2001/10/23 12:15:46	1.29
  +++ Ant.java	2001/10/28 21:26:28	1.30
  @@ -54,10 +54,20 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildListener;
  +import org.apache.tools.ant.DefaultLogger;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.ProjectHelper;
   import org.apache.tools.ant.util.FileUtils;
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.PrintStream;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +import java.util.Vector;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
   
   /**
    * Call Ant in a sub-project
  
  
  
  1.15      +9 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
  
  Index: AntStructure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AntStructure.java	2001/09/30 13:21:53	1.14
  +++ AntStructure.java	2001/10/28 21:26:28	1.15
  @@ -56,7 +56,7 @@
   
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.IntrospectionHelper;
  -import org.apache.tools.ant.Project;
  +
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.TaskContainer;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  @@ -64,14 +64,20 @@
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Vector;
  -import java.io.*;
  +import java.io.File;
  +import java.io.PrintWriter;
  +import java.io.OutputStreamWriter;
  +import java.io.FileOutputStream;
  +import java.io.UnsupportedEncodingException;
  +import java.io.FileWriter;
  +import java.io.IOException;
   
   /**
    * Creates a partial DTD for Ant from the currently known tasks.
    *
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    *
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   
   public class AntStructure extends Task {
  
  
  
  1.25      +8 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java
  
  Index: Available.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Available.java	2001/08/03 16:38:20	1.24
  +++ Available.java	2001/10/28 21:26:28	1.25
  @@ -54,11 +54,15 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  +import java.io.File;
  +
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.condition.Condition;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
   
   /**
    * Will set the given property if the requested resource is available at runtime.
  
  
  
  1.10      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
  
  Index: CallTarget.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CallTarget.java	2001/07/22 15:29:10	1.9
  +++ CallTarget.java	2001/10/28 21:26:29	1.10
  @@ -54,7 +54,8 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Call another target in the same project.
  
  
  
  1.16      +6 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java
  
  Index: Chmod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Chmod.java	2001/05/23 16:57:34	1.15
  +++ Chmod.java	2001/10/28 21:26:29	1.16
  @@ -54,11 +54,13 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.PatternSet;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
  +
   
   /**
    * Chmod equivalent for unix-like environments.
  
  
  
  1.5       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CompileTask.java
  
  Index: CompileTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CompileTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CompileTask.java	2001/01/03 14:18:29	1.4
  +++ CompileTask.java	2001/10/28 21:26:29	1.5
  @@ -54,10 +54,11 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +
   import org.apache.tools.ant.types.PatternSet;
   
  -import java.util.*;
  +import java.util.Vector;
  +import java.util.Enumeration;
   
   /**
    * This task will compile and load a new taskdef all in one step.
  
  
  
  1.22      +18 -5     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
  
  Index: Copy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Copy.java	2001/10/12 08:19:40	1.21
  +++ Copy.java	2001/10/28 21:26:29	1.22
  @@ -54,12 +54,25 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.Mapper;
  +import org.apache.tools.ant.types.FilterSet;
  +import org.apache.tools.ant.types.FilterSetCollection;
  +import org.apache.tools.ant.util.FileUtils;
  +import org.apache.tools.ant.util.FileNameMapper;
  +import org.apache.tools.ant.util.FlatFileNameMapper;
  +import org.apache.tools.ant.util.IdentityMapper;
  +import org.apache.tools.ant.util.SourceFileScanner;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Vector;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
   
   /**
    * A consolidated copy task.  Copies a file or directory to a new file 
  
  
  
  1.19      +6 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java
  
  Index: Copydir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Copydir.java	2001/01/03 14:18:29	1.18
  +++ Copydir.java	2001/10/28 21:26:29	1.19
  @@ -54,9 +54,12 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
   
   /**
    * Copies a directory.
  
  
  
  1.11      +6 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
  
  Index: Copyfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Copyfile.java	2001/01/03 14:18:29	1.10
  +++ Copyfile.java	2001/10/28 21:26:29	1.11
  @@ -54,9 +54,12 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  +import java.io.File;
  +import java.io.IOException;
  +
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
   
   /**
    * Copies a file.
  
  
  
  1.16      +9 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java
  
  Index: Cvs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Cvs.java	2001/06/01 04:50:42	1.15
  +++ Cvs.java	2001/10/28 21:26:29	1.16
  @@ -54,10 +54,17 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Environment;
  -import java.io.*;
  +import java.io.File;
  +import java.io.OutputStream;
  +import java.io.PrintStream;
  +import java.io.BufferedOutputStream;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
   
   /**
    *
  
  
  
  1.4       +9 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
  
  Index: CVSPass.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CVSPass.java	2001/07/24 13:13:30	1.3
  +++ CVSPass.java	2001/10/28 21:26:29	1.4
  @@ -54,8 +54,14 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import java.io.File;
  +import java.io.BufferedReader;
  +import java.io.FileReader;
  +import java.io.PrintWriter;
  +import java.io.FileWriter;
  +import java.io.IOException;
   
   /**
    * CVSLogin
  @@ -63,7 +69,7 @@
    * Adds an new entry to a CVS password file
    *
    * @author <a href="jeff@custommonkey.org">Jeff Martin</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class CVSPass extends Task {
       /** CVS Root */
  
  
  
  1.8       +12 -4     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Definer.java
  
  Index: Definer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Definer.java	2001/08/06 09:59:51	1.7
  +++ Definer.java	2001/10/28 21:26:29	1.8
  @@ -54,11 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
   
  -import java.util.*;
  -import java.io.*;
  +import java.util.Properties;
  +import java.util.Enumeration;
  +import java.io.File;
  +import java.io.InputStream;
  +import java.io.FileInputStream;
  +import java.io.IOException;
   
   /**
    * Base class for Taskdef and Typedef - does all the classpath
  
  
  
  1.19      +7 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Delete.java	2001/07/27 08:24:59	1.18
  +++ Delete.java	2001/10/28 21:26:29	1.19
  @@ -54,10 +54,13 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import java.io.*;
  -import java.util.*;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.PatternSet;
  +import java.io.File;
  +import java.util.Vector;
   
   /**
    * Deletes a file or directory, or set of files defined by a fileset.
  
  
  
  1.10      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java
  
  Index: Deltree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Deltree.java	2001/01/03 14:18:29	1.9
  +++ Deltree.java	2001/10/28 21:26:29	1.10
  @@ -54,8 +54,10 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import java.io.File;
  +import java.io.IOException;
   
   /**
    *
  
  
  
  1.3       +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java
  
  Index: DependSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DependSet.java	2001/08/18 14:59:39	1.2
  +++ DependSet.java	2001/10/28 21:26:29	1.3
  @@ -58,7 +58,9 @@
   import java.util.Enumeration;
   import java.util.Vector;
   import java.util.Date;
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.FileList;
   
  @@ -105,7 +107,7 @@
    * </li></ulist>
    * 
    * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  - * @version $Revision: 1.2 $ $Date: 2001/08/18 14:59:39 $
  + * @version $Revision: 1.3 $ $Date: 2001/10/28 21:26:29 $
    */
   public class DependSet extends MatchingTask {
   
  
  
  
  1.4       +6 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ear.java
  
  Index: Ear.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Ear.java	2001/09/12 15:19:46	1.3
  +++ Ear.java	2001/10/28 21:26:29	1.4
  @@ -53,12 +53,14 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.ZipFileSet;
  -import org.apache.tools.zip.*;
  +import org.apache.tools.zip.ZipOutputStream;
   
  -import java.io.*;
  -import java.util.Vector;
  +import java.io.File;
  +import java.io.IOException;
  +
   
   /**
    * Creates a EAR archive. Based on WAR task
  
  
  
  1.8       +7 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
  
  Index: Echo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Echo.java	2001/01/03 14:18:29	1.7
  +++ Echo.java	2001/10/28 21:26:29	1.8
  @@ -54,9 +54,14 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.ProjectHelper;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  -import java.io.*;
  +import java.io.File;
  +import java.io.FileWriter;
  +import java.io.IOException;
   /**
    * Echo
    *
  
  
  
  1.20      +11 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Exec.java	2001/09/13 08:33:45	1.19
  +++ Exec.java	2001/10/28 21:26:29	1.20
  @@ -54,8 +54,16 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import java.io.File;
  +import java.io.PrintWriter;
  +import java.io.FileWriter;
  +import java.io.InputStream;
  +import java.io.IOException;
  +import java.io.BufferedReader;
  +import java.io.InputStreamReader;
   
   /**
    * Executes a given command if the os platform is appropriate.
  @@ -74,7 +82,7 @@
       protected PrintWriter fos = null;
       private boolean failOnError = false;
   
  -    private static final int BUFFER_SIZE = 512;
  +    private final static int BUFFER_SIZE = 512;
   
       public void execute() throws BuildException {
           run(command);
  
  
  
  1.17      +12 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
  
  Index: ExecTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ExecTask.java	2001/07/27 09:55:46	1.16
  +++ ExecTask.java	2001/10/28 21:26:29	1.17
  @@ -54,10 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.Environment;
   
  -import java.io.*;
  +import java.io.File;
  +import java.io.FileOutputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
  +import java.io.BufferedReader;
  +import java.io.StringReader;
  +import java.io.FileNotFoundException;
   
   /**
    * Executes a given command if the os platform is appropriate.
  
  
  
  1.22      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Execute.java	2001/08/07 22:11:52	1.21
  +++ Execute.java	2001/10/28 21:26:29	1.22
  @@ -61,8 +61,8 @@
   
   import java.io.File;
   import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.OutputStream;
  +
  +
   import java.io.BufferedReader;
   import java.io.StringReader;
   import java.io.ByteArrayOutputStream;
  
  
  
  1.17      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
  
  Index: ExecuteJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ExecuteJava.java	2001/08/18 14:59:39	1.16
  +++ ExecuteJava.java	2001/10/28 21:26:29	1.17
  @@ -57,7 +57,7 @@
   
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.ExitException;
  +
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -65,7 +65,7 @@
   
   import java.lang.reflect.InvocationTargetException;
   import java.lang.reflect.Method;
  -import java.io.*;
  +import java.io.PrintStream;
   
   /*
    *
  
  
  
  1.16      +9 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
  
  Index: ExecuteOn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ExecuteOn.java	2001/08/30 13:26:37	1.15
  +++ ExecuteOn.java	2001/10/28 21:26:29	1.16
  @@ -54,9 +54,15 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.Mapper;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.util.FileNameMapper;
  +import org.apache.tools.ant.util.SourceFileScanner;
   
   import java.util.Hashtable;
   import java.util.Vector;
  
  
  
  1.4       +3 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java
  
  Index: Exit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Exit.java	2001/03/29 10:21:12	1.3
  +++ Exit.java	2001/10/28 21:26:29	1.4
  @@ -54,7 +54,9 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.ProjectHelper;
   
   /**
    * Just exit the active build, giving an additional message 
  
  
  
  1.16      +10 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
  
  Index: Expand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Expand.java	2001/07/27 06:52:51	1.15
  +++ Expand.java	2001/10/28 21:26:29	1.16
  @@ -54,9 +54,16 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  -import java.util.zip.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.FileOutputStream;
  +import java.io.FileNotFoundException;
  +import java.io.IOException;
  +import java.util.zip.ZipInputStream;
  +import java.util.zip.ZipEntry;
   /**
    * Unzip a file. 
    *
  
  
  
  1.10      +6 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Filter.java	2001/08/04 14:55:03	1.9
  +++ Filter.java	2001/10/28 21:26:29	1.10
  @@ -54,12 +54,14 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.util.Enumeration;
  -import java.util.Properties;
  +
  +
   import java.io.File;
  -import java.io.FileInputStream;
  +
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /**
    * This task sets a token filter that is used by the file copy methods
  
  
  
  1.19      +29 -22    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- FixCRLF.java	2001/08/06 12:25:56	1.18
  +++ FixCRLF.java	2001/10/28 21:26:29	1.19
  @@ -59,8 +59,15 @@
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.BufferedReader;
  +import java.io.FileReader;
  +import java.io.IOException;
  +import java.io.BufferedWriter;
  +import java.io.FileWriter;
  +import java.util.Random;
  +import java.util.Enumeration;
  +import java.util.NoSuchElementException;
   
   /**
    * Task to convert text source files to local OS formatting conventions, as
  @@ -101,32 +108,32 @@
    *
    * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
    * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  - * @version $Revision: 1.18 $ $Name:  $
  + * @version $Revision: 1.19 $ $Name:  $
    */
   
   public class FixCRLF extends MatchingTask {
   
  -    private static final int UNDEF = -1;
  -    private static final int NOTJAVA = 0;
  -    private static final int LOOKING = 1;
  -    private static final int IN_CHAR_CONST = 2;
  -    private static final int IN_STR_CONST = 3;
  -    private static final int IN_SINGLE_COMMENT = 4;
  -    private static final int IN_MULTI_COMMENT = 5;
  -
  -    private static final int ASIS = 0;
  -    private static final int CR = 1;
  -    private static final int LF = 2;
  -    private static final int CRLF = 3;
  -    private static final int ADD = 1;
  -    private static final int REMOVE = -1;
  -    private static final int SPACES = -1;
  -    private static final int TABS = 1;
  +    private final static int UNDEF = -1;
  +    private final static int NOTJAVA = 0;
  +    private final static int LOOKING = 1;
  +    private final static int IN_CHAR_CONST = 2;
  +    private final static int IN_STR_CONST = 3;
  +    private final static int IN_SINGLE_COMMENT = 4;
  +    private final static int IN_MULTI_COMMENT = 5;
  +
  +    private final static int ASIS = 0;
  +    private final static int CR = 1;
  +    private final static int LF = 2;
  +    private final static int CRLF = 3;
  +    private final static int ADD = 1;
  +    private final static int REMOVE = -1;
  +    private final static int SPACES = -1;
  +    private final static int TABS = 1;
   
  -    private static final int INBUFLEN = 8192;
  -    private static final int LINEBUFLEN = 200;
  +    private final static int INBUFLEN = 8192;
  +    private final static int LINEBUFLEN = 200;
   
  -    private static final char CTRLZ = '\u001A';
  +    private final static char CTRLZ = '\u001A';
   
       private int tablength = 8;
       private String spaces = "        ";
  
  
  
  1.5       +3 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GenerateKey.java	2001/01/03 14:18:30	1.4
  +++ GenerateKey.java	2001/10/28 21:26:29	1.5
  @@ -55,7 +55,9 @@
   
   import java.util.Enumeration;
   import java.util.Vector;
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  
  
  
  1.10      +11 -4     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Get.java	2001/09/07 03:23:54	1.9
  +++ Get.java	2001/10/28 21:26:29	1.10
  @@ -54,10 +54,17 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  +import java.io.File;
  +import java.io.FileOutputStream;
  +import java.io.InputStream;
  +import java.io.IOException;
  +import java.net.URL;
  +import java.net.URLConnection;
  +import java.net.HttpURLConnection;
  +import java.util.Date;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /**
    * Get a particular file from a URL source. 
  
  
  
  1.6       +7 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
  
  Index: GUnzip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- GUnzip.java	2001/05/23 16:57:37	1.5
  +++ GUnzip.java	2001/10/28 21:26:29	1.6
  @@ -54,10 +54,14 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
   
  -import java.io.*;
  -import java.util.zip.*;
  +import java.io.File;
  +import java.io.FileOutputStream;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.util.zip.GZIPInputStream;
   
   /**
    * Expands a file that has been compressed with the GZIP
  
  
  
  1.12      +9 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java
  
  Index: GZip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- GZip.java	2001/09/17 05:52:45	1.11
  +++ GZip.java	2001/10/28 21:26:29	1.12
  @@ -54,10 +54,16 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
  -import java.io.*;
  -import java.util.zip.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.FileOutputStream;
  +import java.io.FileInputStream;
  +import java.util.zip.GZIPOutputStream;
   
   /**
    * Compresses a file with the GZIP algorightm. Normally used to compress
  
  
  
  1.26      +11 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Jar.java	2001/09/30 13:21:53	1.25
  +++ Jar.java	2001/10/28 21:26:29	1.26
  @@ -54,11 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.FileScanner;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.ZipFileSet;
  -import org.apache.tools.zip.*;
  +import org.apache.tools.zip.ZipOutputStream;
   
  -import java.io.*;
  +import java.io.IOException;
  +import java.io.File;
  +import java.io.InputStream;
  +import java.io.FileInputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.PrintWriter;
  +import java.io.ByteArrayInputStream;
   import java.util.Enumeration;
   
   /**
  
  
  
  1.30      +11 -4     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Java.java	2001/08/02 21:52:59	1.29
  +++ Java.java	2001/10/28 21:26:29	1.30
  @@ -58,11 +58,18 @@
   import org.apache.tools.ant.ExitException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.CommandlineJava;
  +import org.apache.tools.ant.types.Reference;
  +import org.apache.tools.ant.types.Environment;
   
  -import java.io.*;
  -import java.lang.reflect.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.PrintStream;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +
  +import java.util.Vector;
   
   /**
    * This task acts as a loader for java applications but allows to use the same JVM 
  
  
  
  1.71      +7 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- Javac.java	2001/09/30 13:21:53	1.70
  +++ Javac.java	2001/10/28 21:26:29	1.71
  @@ -57,9 +57,12 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import org.apache.tools.ant.taskdefs.compilers.*;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
  +import org.apache.tools.ant.util.GlobPatternMapper;
  +import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
  +import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory;
   
   import java.io.File;
   
  @@ -98,7 +101,7 @@
   
   public class Javac extends MatchingTask {
   
  -    private static final String FAIL_MSG
  +    private final static String FAIL_MSG
           = "Compile failed, messages should have been provided.";
   
       private Path src;
  
  
  
  1.5       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JavacOutputStream.java
  
  Index: JavacOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JavacOutputStream.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JavacOutputStream.java	2001/01/03 14:18:30	1.4
  +++ JavacOutputStream.java	2001/10/28 21:26:29	1.5
  @@ -55,8 +55,9 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  +import org.apache.tools.ant.Task;
  +import java.io.OutputStream;
  +import java.io.IOException;
   
   /**
    * Serves as an output stream to Javac. This let's us print messages
  
  
  
  1.62      +14 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- Javadoc.java	2001/10/13 01:56:00	1.61
  +++ Javadoc.java	2001/10/28 21:26:29	1.62
  @@ -53,14 +53,25 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.PrintWriter;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.io.FilenameFilter;
  +import java.util.Vector;
  +import java.util.Enumeration;
  +import java.util.StringTokenizer;
  +import java.util.Random;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.ProjectHelper;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.FileSet;
   
   /**
    * This task makes it easy to generate Javadoc documentation for a collection
  
  
  
  1.9       +6 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Jikes.java	2001/01/03 14:18:30	1.8
  +++ Jikes.java	2001/10/28 21:26:29	1.9
  @@ -53,8 +53,12 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import org.apache.tools.ant.*;
  +import java.io.File;
  +import java.io.PrintWriter;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildException;
   
   import java.util.Random;
   
  
  
  
  1.8       +7 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
  
  Index: JikesOutputParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JikesOutputParser.java	2001/01/03 14:18:30	1.7
  +++ JikesOutputParser.java	2001/10/28 21:26:29	1.8
  @@ -53,9 +53,14 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.Project;
       
  -import java.io.*;
  +import java.io.BufferedReader;
  +import java.io.OutputStream;
  +import java.io.InputStream;
  +import java.io.IOException;
  +import java.io.InputStreamReader;
   
   /**
    * Parses output from jikes and
  
  
  
  1.7       +10 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
  
  Index: KeySubst.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- KeySubst.java	2001/07/07 13:51:11	1.6
  +++ KeySubst.java	2001/10/28 21:26:29	1.7
  @@ -54,9 +54,16 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  -import java.util.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import java.io.File;
  +import java.io.BufferedReader;
  +import java.io.BufferedWriter;
  +import java.io.FileReader;
  +import java.io.FileWriter;
  +import java.io.IOException;
  +import java.util.Hashtable;
  +import java.util.StringTokenizer;
   
   /**
    * Keyword substitution. Input file is written to output file.
  
  
  
  1.4       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java
  
  Index: LogStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LogStreamHandler.java	2001/07/13 12:54:28	1.3
  +++ LogStreamHandler.java	2001/10/28 21:26:29	1.4
  @@ -55,11 +55,11 @@
   package org.apache.tools.ant.taskdefs;
   
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.Project;
  +
   import org.apache.tools.ant.Task;
  +
  +
   
  -import java.io.OutputStream;
  -import java.io.InputStream;
   import java.io.IOException;
   
   /**
  
  
  
  1.7       +17 -10    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
  
  Index: Manifest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Manifest.java	2001/10/11 14:55:07	1.6
  +++ Manifest.java	2001/10/28 21:26:29	1.7
  @@ -54,8 +54,15 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.util.*;
  -import java.io.*;
  +import java.util.Vector;
  +import java.util.Hashtable;
  +import java.util.Enumeration;
  +import java.io.IOException;
  +import java.io.PrintWriter;
  +import java.io.BufferedReader;
  +import java.io.InputStream;
  +import java.io.InputStreamReader;
  +import java.io.StringWriter;
   
   import org.apache.tools.ant.BuildException;
   
  @@ -66,27 +73,27 @@
    */
   public class Manifest {
       /** The standard manifest version header */
  -    static public final String ATTRIBUTE_MANIFEST_VERSION = "Manifest-Version";
  +    public final static String ATTRIBUTE_MANIFEST_VERSION = "Manifest-Version";
       
       /** The standard Signature Version header */
  -    static public final String ATTRIBUTE_SIGNATURE_VERSION = "Signature-Version";
  +    public final static String ATTRIBUTE_SIGNATURE_VERSION = "Signature-Version";
       
       /** The Name Attribute is the first in a named section */
  -    static public final String ATTRIBUTE_NAME = "Name";
  +    public final static String ATTRIBUTE_NAME = "Name";
       
       /** THe From Header is disallowed in a Manifest */    
  -    static public final String ATTRIBUTE_FROM = "From";
  +    public final static String ATTRIBUTE_FROM = "From";
       
       /** Default Manifest version if one is not specified */
  -    static public final String DEFAULT_MANIFEST_VERSION = "1.0";
  +    public final static String DEFAULT_MANIFEST_VERSION = "1.0";
       
       /** The max length of a line in a Manifest */
  -    static public final int MAX_LINE_LENGTH = 70;
  +    public final static int MAX_LINE_LENGTH = 70;
       
       /**
        * Class to hold manifest attributes
        */
  -    static public class Attribute {
  +    public static class Attribute {
           /** The attribute's name */
           private String name = null;
           
  @@ -227,7 +234,7 @@
        * Manifest. A section consists of a set of attribute values,
        * separated from other sections by a blank line.
        */
  -    static public class Section {
  +    public static class Section {
           private Vector warnings = new Vector();
           
           /** The section's name if any. The main section in a manifest is unnamed.*/
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ManifestException.java
  
  Index: ManifestException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ManifestException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ManifestException.java	2001/07/30 11:15:17	1.1
  +++ ManifestException.java	2001/10/28 21:26:29	1.2
  @@ -54,7 +54,7 @@
   package org.apache.tools.ant.taskdefs;
   
   
  -import java.io.*;
  +
   
   /**
    * Exception thrown indicating problems in a JAR Manifest
  
  
  
  1.16      +8 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  
  Index: MatchingTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- MatchingTask.java	2001/08/01 09:08:55	1.15
  +++ MatchingTask.java	2001/10/28 21:26:29	1.16
  @@ -54,11 +54,15 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.PatternSet;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.util.StringTokenizer;
  +import java.util.Vector;
   
   /**
    * This is an abstract task that should be used by all those tasks that 
  
  
  
  1.9       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
  
  Index: Mkdir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Mkdir.java	2001/06/25 07:46:47	1.8
  +++ Mkdir.java	2001/10/28 21:26:29	1.9
  @@ -54,7 +54,8 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
   import java.io.File;
   
   
  
  
  
  1.9       +8 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java
  
  Index: Move.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Move.java	2001/08/18 14:59:39	1.8
  +++ Move.java	2001/10/28 21:26:29	1.9
  @@ -54,11 +54,15 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.types.FilterSetCollection;
  +import org.apache.tools.ant.types.FilterSet;
  +import org.apache.tools.ant.types.FileSet;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.Enumeration;
   
   /**
    * Moves a file or directory to a new file or directory.  By default,
  
  
  
  1.2       +9 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java
  
  Index: Parallel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Parallel.java	2001/07/22 13:12:29	1.1
  +++ Parallel.java	2001/10/28 21:26:29	1.2
  @@ -53,11 +53,15 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import java.util.*;
  -import java.text.*;
  -import java.lang.RuntimeException;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.TaskContainer;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Location;
  +
  +import java.util.Vector;
  +import java.util.Enumeration;
  +
  +
   
   /**
    * Implements a multi threaded task execution.
  
  
  
  1.9       +3 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Patch.java
  
  Index: Patch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Patch.java	2001/05/23 16:57:38	1.8
  +++ Patch.java	2001/10/28 21:26:29	1.9
  @@ -54,7 +54,9 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.Commandline;
   import java.io.File;
   import java.io.IOException;
  
  
  
  1.4       +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
  
  Index: PathConvert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PathConvert.java	2001/10/13 01:48:41	1.3
  +++ PathConvert.java	2001/10/28 21:26:29	1.4
  @@ -57,9 +57,11 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
  +import org.apache.tools.ant.types.FileSet;
   
  -import java.util.*;
  +import java.util.Vector;
   import java.io.File;
   
   /**
  
  
  
  1.33      +12 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Property.java	2001/08/30 13:26:37	1.32
  +++ Property.java	2001/10/28 21:26:29	1.33
  @@ -54,11 +54,20 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.ProjectHelper;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -import java.io.*;
  -import java.util.*;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.util.Properties;
  +import java.util.Vector;
  +import java.util.Enumeration;
   
   /**
    * Will set a Project property. Used to be a hack in ProjectHelper
  
  
  
  1.3       +10 -8     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Recorder.java
  
  Index: Recorder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Recorder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Recorder.java	2001/04/24 08:41:50	1.2
  +++ Recorder.java	2001/10/28 21:26:29	1.3
  @@ -55,16 +55,18 @@
   package org.apache.tools.ant.taskdefs;
   
   import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.DirectoryScanner;
  +
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import org.apache.tools.ant.taskdefs.compilers.*;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +
  +
   import org.apache.tools.ant.Task;
   
  -import java.io.*;
  +import java.io.PrintStream;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
   
  -import java.util.*;
  +import java.util.Hashtable;
   
   /**
    * This task is the manager for RecorderEntry's.  It is this class
  @@ -176,7 +178,7 @@
        * Possible values include: start and stop.
        */
       public static class ActionChoices extends EnumeratedAttribute {
  -        private static final String[] values = {"start", "stop"};
  +        private final static String[] values = {"start", "stop"};
           public String[] getValues() {
               return values;
           }
  @@ -187,7 +189,7 @@
        * Possible values include: error, warn, info, verbose, debug.
        */
       public static class VerbosityLevelChoices extends EnumeratedAttribute {
  -        private static final String[] values = { "error", "warn", "info",
  +        private final static String[] values = { "error", "warn", "info",
               "verbose", "debug"};
           public String[] getValues() {
               return values;
  
  
  
  1.3       +5 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
  
  Index: RecorderEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RecorderEntry.java	2001/04/24 08:41:51	1.2
  +++ RecorderEntry.java	2001/10/28 21:26:29	1.3
  @@ -54,9 +54,11 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  -import java.util.*;
  +import org.apache.tools.ant.BuildLogger;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.BuildEvent;
  +import java.io.PrintStream;
  +
   
   /**
    * This is a class that represents a recorder.  This is the listener
  
  
  
  1.18      +19 -4     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java
  
  Index: Replace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Replace.java	2001/09/20 11:13:50	1.17
  +++ Replace.java	2001/10/28 21:26:29	1.18
  @@ -54,10 +54,25 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.taskdefs.*;
  -import java.io.*;
  -import java.util.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.FileNotFoundException;
  +import java.io.IOException;
  +import java.io.Reader;
  +import java.io.FileReader;
  +import java.io.InputStreamReader;
  +import java.io.Writer;
  +import java.io.FileWriter;
  +import java.io.OutputStreamWriter;
  +import java.io.FileOutputStream;
  +import java.io.BufferedReader;
  +import java.io.BufferedWriter;
  +import java.util.Properties;
  +import java.util.Vector;
   
   /**
    * Replaces all occurrences of one or more string tokens with given
  
  
  
  1.26      +5 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Rmic.java	2001/08/01 09:37:27	1.25
  +++ Rmic.java	2001/10/28 21:26:29	1.26
  @@ -58,10 +58,12 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.taskdefs.rmic.*;
  +import org.apache.tools.ant.taskdefs.rmic.RmicAdapter;
  +import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -import org.apache.tools.ant.util.*;
  +import org.apache.tools.ant.util.FileNameMapper;
  +import org.apache.tools.ant.util.SourceFileScanner;
   
   import java.io.File;
   import java.io.IOException;
  @@ -100,7 +102,7 @@
   
   public class Rmic extends MatchingTask {
   
  -    private static final String FAIL_MSG 
  +    private final static String FAIL_MSG 
           = "Rmic failed, messages should have been provided.";
   
       private File baseDir;
  
  
  
  1.4       +9 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
  
  Index: SendEmail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SendEmail.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SendEmail.java	2001/01/03 14:18:31	1.3
  +++ SendEmail.java	2001/10/28 21:26:29	1.4
  @@ -54,10 +54,16 @@
    
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import java.util.*;
  +import java.io.PrintStream;
  +import java.io.File;
  +import java.io.BufferedInputStream;
  +import java.io.FileInputStream;
  +import java.io.IOException;
  +import java.util.Vector;
  +import java.util.StringTokenizer;
  +import java.util.Enumeration;
   import org.apache.tools.mail.MailMessage;
  -import org.apache.tools.ant.Project;
  +
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.BuildException;
   
  
  
  
  1.2       +8 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java
  
  Index: Sequential.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Sequential.java	2001/07/22 13:12:29	1.1
  +++ Sequential.java	2001/10/28 21:26:29	1.2
  @@ -53,11 +53,14 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import java.util.*;
  -import java.text.*;
  -import java.lang.RuntimeException;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.TaskContainer;
  +import org.apache.tools.ant.BuildException;
  +
  +import java.util.Vector;
  +import java.util.Enumeration;
  +
  +
   
   /**
    * Implements a single threaded task execution.
  
  
  
  1.10      +5 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SignJar.java	2001/09/13 05:21:04	1.9
  +++ SignJar.java	2001/10/28 21:26:29	1.10
  @@ -59,8 +59,11 @@
   import java.util.Vector;
   import java.util.zip.ZipEntry;
   import java.util.zip.ZipFile;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +
   import org.apache.tools.ant.types.FileSet;
   
   /**
  
  
  
  1.25      +33 -8     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  
  Index: SQLExec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- SQLExec.java	2001/09/30 13:21:53	1.24
  +++ SQLExec.java	2001/10/28 21:26:29	1.25
  @@ -54,17 +54,42 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.AntClassLoader;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.ProjectHelper;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.Path;
  +import org.apache.tools.ant.types.Reference;
  +import org.apache.tools.ant.types.FileSet;
   
  -import java.io.*;
  +import java.io.File;
  +import java.io.PrintStream;
  +import java.io.BufferedOutputStream;
  +import java.io.FileOutputStream;
  +import java.io.IOException;
  +import java.io.Reader;
  +import java.io.BufferedReader;
  +import java.io.StringReader;
  +import java.io.FileReader;
  +import java.io.InputStreamReader;
  +import java.io.FileInputStream;
   import java.util.Enumeration;
   import java.util.StringTokenizer;
   import java.util.Vector;
   import java.util.Properties;
  -import java.util.zip.*;
  -import java.sql.*;
   
  +import java.sql.Connection;
  +import java.sql.Statement;
  +import java.sql.Driver;
  +import java.sql.SQLException;
  +import java.sql.DatabaseMetaData;
  +import java.sql.SQLWarning;
  +import java.sql.ResultSet;
  +import java.sql.ResultSetMetaData;
  +
   /**
    * Reads in a text file containing SQL statements seperated with semicolons
    * and executes it in a given db.
  @@ -76,9 +101,9 @@
    */
   public class SQLExec extends Task {
   
  -    static public class DelimiterType extends EnumeratedAttribute {
  -        static public final String NORMAL = "normal";
  -        static public final String ROW = "row";
  +    public static class DelimiterType extends EnumeratedAttribute {
  +        public final static String NORMAL = "normal";
  +        public final static String ROW = "row";
           public String[] getValues() {
               return new String[] {NORMAL, ROW};
           }
  
  
  
  1.18      +21 -12    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Tar.java	2001/05/03 13:10:30	1.17
  +++ Tar.java	2001/10/28 21:26:29	1.18
  @@ -54,12 +54,21 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import java.util.*;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.util.*;
  -import org.apache.tools.tar.*;
  -import org.apache.tools.ant.types.*;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.FileOutputStream;
  +import java.io.FileInputStream;
  +import java.util.Vector;
  +import java.util.Enumeration;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.util.MergingMapper;
  +import org.apache.tools.tar.TarOutputStream;
  +import org.apache.tools.tar.TarConstants;
  +import org.apache.tools.tar.TarEntry;
  +import org.apache.tools.ant.types.FileSet;
   
   /**
    * Creates a TAR archive.
  @@ -71,11 +80,11 @@
   public class Tar extends MatchingTask {
   
       // permissable values for longfile attribute
  -    static public final String WARN = "warn";
  -    static public final String FAIL = "fail";
  -    static public final String TRUNCATE = "truncate";
  -    static public final String GNU = "gnu";
  -    static public final String OMIT = "omit";
  +    public final static String WARN = "warn";
  +    public final static String FAIL = "fail";
  +    public final static String TRUNCATE = "truncate";
  +    public final static String GNU = "gnu";
  +    public final static String OMIT = "omit";
   
       private String[] validModes = new String[] {WARN, FAIL, TRUNCATE, GNU, OMIT};
   
  @@ -302,7 +311,7 @@
           return sfs.restrict(files, baseDir, null, mm).length == 0;
       }
   
  -    static public class TarFileSet extends FileSet {
  +    public static class TarFileSet extends FileSet {
           private String[] files = null;
           
           private int mode = 0100644;
  
  
  
  1.5       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
  
  Index: TaskOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TaskOutputStream.java	2001/01/03 14:18:31	1.4
  +++ TaskOutputStream.java	2001/10/28 21:26:29	1.5
  @@ -55,8 +55,9 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  +import org.apache.tools.ant.Task;
  +import java.io.OutputStream;
  +import java.io.IOException;
   
   /**
    * Redirects text written to a stream thru the standard
  
  
  
  1.11      +10 -7     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Touch.java
  
  Index: Touch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Touch.java	2001/08/07 05:49:48	1.10
  +++ Touch.java	2001/10/28 21:26:29	1.11
  @@ -54,19 +54,22 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.util.FileUtils;
   
   import java.io.File;
   import java.io.FileOutputStream;
   import java.io.IOException;
  -import java.lang.reflect.InvocationTargetException;
  -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;
   
  
  
  
  1.13      +13 -4     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  
  Index: Tstamp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Tstamp.java	2001/08/02 14:48:24	1.12
  +++ Tstamp.java	2001/10/28 21:26:29	1.13
  @@ -54,10 +54,19 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import java.io.*;
  -import java.util.*;
  -import java.text.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.Location;
  +
  +import java.util.Vector;
  +import java.util.Date;
  +import java.util.Locale;
  +import java.util.Enumeration;
  +import java.util.Calendar;
  +import java.util.StringTokenizer;
  +import java.util.NoSuchElementException;
  +import java.text.SimpleDateFormat;
   
   /**
    * Sets TSTAMP, DSTAMP and TODAY
  
  
  
  1.14      +10 -3     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java
  
  Index: Untar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Untar.java	2001/07/27 06:52:51	1.13
  +++ Untar.java	2001/10/28 21:26:29	1.14
  @@ -54,9 +54,16 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  -import org.apache.tools.tar.*;
  -import java.io.*;
  +import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.tar.TarInputStream;
  +import org.apache.tools.tar.TarEntry;
  +import java.io.File;
  +import java.io.FileInputStream;
  +import java.io.FileOutputStream;
  +import java.io.FileNotFoundException;
  +import java.io.IOException;
   
   /**
    * Untar a file.
  
  
  
  1.8       +10 -5     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
  
  Index: UpToDate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- UpToDate.java	2001/08/03 16:38:20	1.7
  +++ UpToDate.java	2001/10/28 21:26:29	1.8
  @@ -54,13 +54,18 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.condition.Condition;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import java.io.*;
  +import org.apache.tools.ant.types.Mapper;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.util.FileNameMapper;
  +import org.apache.tools.ant.util.MergingMapper;
  +import java.io.File;
   import java.util.Enumeration;
  -import java.util.Date;
  +
   import java.util.Vector;
   
   /**
  
  
  
  1.14      +6 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java
  
  Index: War.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- War.java	2001/09/12 15:19:10	1.13
  +++ War.java	2001/10/28 21:26:29	1.14
  @@ -54,12 +54,14 @@
   
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.ZipFileSet;
  -import org.apache.tools.zip.*;
  +import org.apache.tools.zip.ZipOutputStream;
   
  -import java.io.*;
  -import java.util.Vector;
  +import java.io.File;
  +import java.io.IOException;
  +
   
   /**
    * Creates a WAR archive.
  
  
  
  1.26      +7 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
  
  Index: XSLTProcess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- XSLTProcess.java	2001/08/30 13:26:37	1.25
  +++ XSLTProcess.java	2001/10/28 21:26:29	1.26
  @@ -55,12 +55,15 @@
   package org.apache.tools.ant.taskdefs;
   
   
  -import java.io.*;
  +import java.io.File;
   import java.util.Enumeration;
  -import java.util.Hashtable;
  -import java.util.StringTokenizer;
  +
  +
   import java.util.Vector;
  -import org.apache.tools.ant.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   import org.apache.tools.ant.util.FileUtils;
  
  
  
  1.54      +22 -7     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Zip.java	2001/10/24 09:11:26	1.53
  +++ Zip.java	2001/10/28 21:26:29	1.54
  @@ -53,18 +53,33 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import java.io.*;
  -import java.util.Enumeration;
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.FileOutputStream;
  +import java.io.FileInputStream;
  +import java.io.OutputStream;
  +import java.io.ByteArrayOutputStream;
  +import java.io.ByteArrayInputStream;
  +
   import java.util.Hashtable;
   import java.util.Stack;
  -import java.util.StringTokenizer;
  +
   import java.util.Vector;
   import java.util.zip.CRC32;
   import java.util.zip.ZipInputStream;
  -import org.apache.tools.ant.*;
  -import org.apache.tools.ant.types.*;
  -import org.apache.tools.ant.util.*;
  -import org.apache.tools.zip.*;
  +import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.FileScanner;
  +import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.FileSet;
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +import org.apache.tools.ant.types.ZipFileSet;
  +import org.apache.tools.ant.types.ZipScanner;
  +import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.util.MergingMapper;
  +import org.apache.tools.zip.ZipOutputStream;
  +import org.apache.tools.zip.ZipEntry;
   
   /**
    * Create a ZIP archive.
  
  
  

--
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