ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs AntStructure.java BUnzip2.java Checksum.java Chmod.java DependSet.java ExecuteOn.java Expand.java GenerateKey.java Get.java GUnzip.java Input.java Jar.java Java.java Javac.java Javadoc.java Manifest.java Recorder.java Replace.java SendEmail.java SignJar.java SQLExec.java Tar.java Touch.java Tstamp.java UpToDate.java
Date Sat, 22 Dec 2001 12:59:31 GMT
donaldp     01/12/22 04:59:31

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        AntStructure.java BUnzip2.java Checksum.java
                        Chmod.java DependSet.java ExecuteOn.java
                        Expand.java GenerateKey.java Get.java GUnzip.java
                        Input.java Jar.java Java.java Javac.java
                        Javadoc.java Manifest.java Recorder.java
                        Replace.java SendEmail.java SignJar.java
                        SQLExec.java Tar.java Touch.java Tstamp.java
                        UpToDate.java
  Log:
  restyled
  
  Removed setAntRun() calls from Execute class
  
  Renamed Environment to EnvironmentData
  
  Revision  Changes    Path
  1.7       +2 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
  
  Index: AntStructure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AntStructure.java	2001/12/21 14:21:19	1.6
  +++ AntStructure.java	2001/12/22 12:59:30	1.7
  @@ -14,9 +14,8 @@
   import java.io.OutputStreamWriter;
   import java.io.PrintWriter;
   import java.io.UnsupportedEncodingException;
  -import java.util.Iterator;
  -import java.util.Hashtable;
   import java.util.Enumeration;
  +import java.util.Hashtable;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   
  @@ -24,7 +23,7 @@
    * 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.6 $
  + * @version $Revision: 1.7 $
    */
   
   public class AntStructure extends Task
  
  
  
  1.6       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
  
  Index: BUnzip2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BUnzip2.java	2001/12/16 05:44:55	1.5
  +++ BUnzip2.java	2001/12/22 12:59:30	1.6
  @@ -37,7 +37,7 @@
           if( source.lastModified() > dest.lastModified() )
           {
               getLogger().info( "Expanding " + source.getAbsolutePath() + " to "
  -                 + dest.getAbsolutePath() );
  +                              + dest.getAbsolutePath() );
   
               FileOutputStream out = null;
               CBZip2InputStream zIn = null;
  
  
  
  1.9       +1 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java
  
  Index: Checksum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Checksum.java	2001/12/21 14:21:19	1.8
  +++ Checksum.java	2001/12/22 12:59:30	1.9
  @@ -17,10 +17,9 @@
   import java.security.MessageDigest;
   import java.security.NoSuchAlgorithmException;
   import java.security.NoSuchProviderException;
  -import java.util.Iterator;
  -import java.util.Hashtable;
   import java.util.ArrayList;
   import java.util.Enumeration;
  +import java.util.Hashtable;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.9       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java
  
  Index: Chmod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Chmod.java	2001/12/21 13:34:15	1.8
  +++ Chmod.java	2001/12/22 12:59:30	1.9
  @@ -11,9 +11,9 @@
   import java.io.IOException;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Os;
  +import org.apache.tools.ant.taskdefs.exec.Execute;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.PatternSet;
  -import org.apache.tools.ant.taskdefs.exec.Execute;
   
   /**
    * Chmod equivalent for unix-like environments.
  
  
  
  1.5       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java
  
  Index: DependSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DependSet.java	2001/12/21 14:21:19	1.4
  +++ DependSet.java	2001/12/22 12:59:30	1.5
  @@ -8,9 +8,9 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  +import java.util.ArrayList;
   import java.util.Date;
   import java.util.Iterator;
  -import java.util.ArrayList;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Os;
   import org.apache.tools.ant.DirectoryScanner;
  @@ -60,7 +60,7 @@
    *
    *
    * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  - * @version $Revision: 1.4 $ $Date: 2001/12/21 14:21:19 $
  + * @version $Revision: 1.5 $ $Date: 2001/12/22 12:59:30 $
    */
   public class DependSet extends MatchingTask
   {
  
  
  
  1.12      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
  
  Index: ExecuteOn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ExecuteOn.java	2001/12/21 14:21:19	1.11
  +++ ExecuteOn.java	2001/12/22 12:59:30	1.12
  @@ -9,8 +9,8 @@
   
   import java.io.File;
   import java.io.IOException;
  -import java.util.Hashtable;
   import java.util.ArrayList;
  +import java.util.Hashtable;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.10      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java
  
  Index: Expand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Expand.java	2001/12/21 14:21:19	1.9
  +++ Expand.java	2001/12/22 12:59:30	1.10
  @@ -13,8 +13,8 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.util.Date;
   import java.util.ArrayList;
  +import java.util.Date;
   import java.util.zip.ZipEntry;
   import java.util.zip.ZipInputStream;
   import org.apache.avalon.excalibur.io.FileUtil;
  
  
  
  1.11      +1 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- GenerateKey.java	2001/12/21 14:21:19	1.10
  +++ GenerateKey.java	2001/12/22 12:59:30	1.11
  @@ -7,13 +7,12 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import java.util.Iterator;
   import java.util.ArrayList;
  +import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.ExecTask;
  -import org.apache.tools.ant.types.Commandline;
   
   /**
    * Generates a key.
  
  
  
  1.9       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Get.java	2001/12/21 13:34:15	1.8
  +++ Get.java	2001/12/22 12:59:30	1.9
  @@ -271,7 +271,7 @@
                   {
                       Date t = new Date( remoteTimestamp );
                       getLogger().info( "last modified = " + t.toString()
  -                         + ( ( remoteTimestamp == 0 ) ? " - using current time instead"
: "" ) );
  +                                      + ( ( remoteTimestamp == 0 ) ? " - using current
time instead" : "" ) );
                   }
                   if( remoteTimestamp != 0 )
                       touchFile( dest, remoteTimestamp );
  
  
  
  1.6       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
  
  Index: GUnzip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/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/12/16 05:44:55	1.5
  +++ GUnzip.java	2001/12/22 12:59:30	1.6
  @@ -37,7 +37,7 @@
           if( source.lastModified() > dest.lastModified() )
           {
               getLogger().info( "Expanding " + source.getAbsolutePath() + " to "
  -                 + dest.getAbsolutePath() );
  +                              + dest.getAbsolutePath() );
   
               FileOutputStream out = null;
               GZIPInputStream zIn = null;
  
  
  
  1.7       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
  
  Index: Input.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Input.java	2001/12/21 14:21:19	1.6
  +++ Input.java	2001/12/22 12:59:30	1.7
  @@ -10,8 +10,8 @@
   import java.io.BufferedReader;
   import java.io.IOException;
   import java.io.InputStreamReader;
  -import java.util.StringTokenizer;
   import java.util.ArrayList;
  +import java.util.StringTokenizer;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  
  
  
  1.6       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Jar.java	2001/12/21 14:21:19	1.5
  +++ Jar.java	2001/12/22 12:59:30	1.6
  @@ -17,8 +17,8 @@
   import java.io.OutputStreamWriter;
   import java.io.PrintWriter;
   import java.io.Reader;
  -import java.util.Iterator;
   import java.util.Enumeration;
  +import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.FileScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.9       +3 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Java.java	2001/12/21 14:21:19	1.8
  +++ Java.java	2001/12/22 12:59:30	1.9
  @@ -16,11 +16,11 @@
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute;
  -import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
   import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
  +import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  -import org.apache.tools.ant.types.Environment;
  +import org.apache.tools.ant.types.EnvironmentData;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
   
  @@ -166,7 +166,7 @@
        *
        * @param sysp The feature to be added to the Sysproperty attribute
        */
  -    public void addSysproperty( Environment.Variable sysp )
  +    public void addSysproperty( EnvironmentData.Variable sysp )
       {
           cmdl.addSysproperty( sysp );
       }
  @@ -384,8 +384,6 @@
                   fos = new FileOutputStream( out );
                   exe = new Execute( new PumpStreamHandler( fos ), null );
               }
  -
  -            exe.setAntRun( getProject() );
   
               if( dir == null )
               {
  
  
  
  1.10      +4 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Javac.java	2001/12/21 14:21:19	1.9
  +++ Javac.java	2001/12/22 12:59:30	1.10
  @@ -8,8 +8,8 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  -import java.util.Iterator;
   import java.util.ArrayList;
  +import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Os;
   import org.apache.tools.ant.DirectoryScanner;
  @@ -774,9 +774,9 @@
               CompilerAdapter adapter = CompilerAdapterFactory.getCompiler(
                   compiler, this );
               getLogger().info( "Compiling " + compileList.length +
  -                 " source file"
  -                 + ( compileList.length == 1 ? "" : "s" )
  -                 + ( destDir != null ? " to " + destDir : "" ) );
  +                              " source file"
  +                              + ( compileList.length == 1 ? "" : "s" )
  +                              + ( destDir != null ? " to " + destDir : "" ) );
   
               // now we need to populate the compiler adapter
               adapter.setJavac( this );
  
  
  
  1.11      +1 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Javadoc.java	2001/12/21 14:21:19	1.10
  +++ Javadoc.java	2001/12/22 12:59:30	1.11
  @@ -12,9 +12,9 @@
   import java.io.FilenameFilter;
   import java.io.IOException;
   import java.io.PrintWriter;
  +import java.util.ArrayList;
   import java.util.Iterator;
   import java.util.StringTokenizer;
  -import java.util.ArrayList;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Os;
   import org.apache.tools.ant.DirectoryScanner;
  @@ -28,7 +28,6 @@
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Reference;
  -import org.apache.tools.ant.util.FileUtils;
   
   /**
    * This task makes it easy to generate Javadoc documentation for a collection of
  @@ -918,7 +917,6 @@
           JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO );
           JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN );
           Execute exe = new Execute( new PumpStreamHandler( out, err ) );
  -        exe.setAntRun( getProject() );
   
           /*
            * No reason to change the working directory as all filenames and
  
  
  
  1.8       +5 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java
  
  Index: Manifest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Manifest.java	2001/12/21 14:21:19	1.7
  +++ Manifest.java	2001/12/22 12:59:30	1.8
  @@ -18,10 +18,10 @@
   import java.io.Reader;
   import java.io.StringWriter;
   import java.io.UnsupportedEncodingException;
  -import java.util.Iterator;
  -import java.util.Hashtable;
   import java.util.ArrayList;
   import java.util.Enumeration;
  +import java.util.Hashtable;
  +import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  @@ -735,15 +735,15 @@
               if( attribute.getName().equalsIgnoreCase( ATTRIBUTE_NAME ) )
               {
                   warnings.add( "\"" + ATTRIBUTE_NAME + "\" attributes should not occur in
the " +
  -                                     "main section and must be the first element in all
" +
  -                                     "other sections: \"" + attribute.getName() + ": "
+ attribute.getValue() + "\"" );
  +                              "main section and must be the first element in all " +
  +                              "other sections: \"" + attribute.getName() + ": " + attribute.getValue()
+ "\"" );
                   return attribute.getValue();
               }
   
               if( attribute.getName().toLowerCase().startsWith( ATTRIBUTE_FROM.toLowerCase()
) )
               {
                   warnings.add( "Manifest attributes should not start with \"" +
  -                                     ATTRIBUTE_FROM + "\" in \"" + attribute.getName()
+ ": " + attribute.getValue() + "\"" );
  +                              ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": "
+ attribute.getValue() + "\"" );
               }
               else
               {
  
  
  
  1.4       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java
  
  Index: Recorder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Recorder.java	2001/12/16 06:27:47	1.3
  +++ Recorder.java	2001/12/22 12:59:30	1.4
  @@ -143,7 +143,7 @@
               throw new TaskException( "No filename specified" );
   
           log( "setting a recorder for name " + filename,
  -                          Project.MSG_DEBUG );
  +             Project.MSG_DEBUG );
   
           // get the recorder entry
           RecorderEntry recorder = getRecorder( filename, getProject() );
  
  
  
  1.7       +1 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java
  
  Index: Replace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Replace.java	2001/12/21 14:21:19	1.6
  +++ Replace.java	2001/12/22 12:59:30	1.7
  @@ -20,12 +20,11 @@
   import java.io.OutputStreamWriter;
   import java.io.Reader;
   import java.io.Writer;
  -import java.util.Properties;
   import java.util.ArrayList;
  +import java.util.Properties;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.util.FileUtils;
   
   /**
    * Replaces all occurrences of one or more string tokens with given values in
  
  
  
  1.6       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
  
  Index: SendEmail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SendEmail.java	2001/12/21 14:21:19	1.5
  +++ SendEmail.java	2001/12/22 12:59:30	1.6
  @@ -12,9 +12,9 @@
   import java.io.FileInputStream;
   import java.io.IOException;
   import java.io.PrintStream;
  +import java.util.ArrayList;
   import java.util.Iterator;
   import java.util.StringTokenizer;
  -import java.util.ArrayList;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  
  
  
  1.8       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SignJar.java	2001/12/21 14:21:19	1.7
  +++ SignJar.java	2001/12/22 12:59:30	1.8
  @@ -9,7 +9,6 @@
   
   import java.io.File;
   import java.io.IOException;
  -import java.util.Iterator;
   import java.util.ArrayList;
   import java.util.Enumeration;
   import java.util.zip.ZipEntry;
  
  
  
  1.9       +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  
  Index: SQLExec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SQLExec.java	2001/12/21 14:21:19	1.8
  +++ SQLExec.java	2001/12/22 12:59:30	1.9
  @@ -26,10 +26,10 @@
   import java.sql.SQLException;
   import java.sql.SQLWarning;
   import java.sql.Statement;
  +import java.util.ArrayList;
   import java.util.Iterator;
   import java.util.Properties;
   import java.util.StringTokenizer;
  -import java.util.ArrayList;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.DirectoryScanner;
  @@ -366,7 +366,7 @@
        * @return Description of the Returned Value
        */
       public Path createClasspath()
  -    throws TaskException
  +        throws TaskException
       {
           if( this.classpath == null )
           {
  @@ -580,7 +580,7 @@
           }
   
           getLogger().info( goodSql + " of " + totalSql +
  -             " SQL statements executed successfully" );
  +                          " SQL statements executed successfully" );
       }
   
       /**
  
  
  
  1.9       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Tar.java	2001/12/21 14:21:19	1.8
  +++ Tar.java	2001/12/22 12:59:30	1.9
  @@ -11,8 +11,8 @@
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
   import java.io.IOException;
  -import java.util.Iterator;
   import java.util.ArrayList;
  +import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.8       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java
  
  Index: Touch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Touch.java	2001/12/21 14:21:19	1.7
  +++ Touch.java	2001/12/22 12:59:30	1.8
  @@ -12,8 +12,8 @@
   import java.io.IOException;
   import java.text.DateFormat;
   import java.text.ParseException;
  -import java.util.Locale;
   import java.util.ArrayList;
  +import java.util.Locale;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  
  1.10      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  
  Index: Tstamp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Tstamp.java	2001/12/21 14:21:19	1.9
  +++ Tstamp.java	2001/12/22 12:59:30	1.10
  @@ -8,15 +8,15 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.text.SimpleDateFormat;
  +import java.util.ArrayList;
   import java.util.Calendar;
   import java.util.Date;
  -import java.util.Iterator;
   import java.util.Hashtable;
  +import java.util.Iterator;
   import java.util.Locale;
   import java.util.NoSuchElementException;
   import java.util.StringTokenizer;
   import java.util.TimeZone;
  -import java.util.ArrayList;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  
  
  
  1.9       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
  
  Index: UpToDate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UpToDate.java	2001/12/21 14:21:19	1.8
  +++ UpToDate.java	2001/12/22 12:59:30	1.9
  @@ -8,8 +8,8 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  -import java.util.Iterator;
   import java.util.ArrayList;
  +import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  
  
  

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