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 Checksum.java DependSet.java Expand.java Jar.java Javac.java MatchingTask.java Rmic.java SQLExec.java Tar.java Zip.java
Date Sun, 13 Jan 2002 00:00:16 GMT
donaldp     02/01/12 16:00:16

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Checksum.java DependSet.java Expand.java Jar.java
                        Javac.java MatchingTask.java Rmic.java SQLExec.java
                        Tar.java Zip.java
  Log:
  Moved useful static methods to FileUtils and removed all unused methods
  
  Revision  Changes    Path
  1.13      +1 -1      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Checksum.java	1 Jan 2002 09:13:45 -0000	1.12
  +++ Checksum.java	13 Jan 2002 00:00:15 -0000	1.13
  @@ -21,7 +21,7 @@
   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.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.condition.Condition;
   import org.apache.tools.ant.types.FileSet;
   
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DependSet.java	12 Jan 2002 04:57:14 -0000	1.10
  +++ DependSet.java	13 Jan 2002 00:00:15 -0000	1.11
  @@ -13,7 +13,7 @@
   import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.aut.nativelib.Os;
  -import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileList;
   import org.apache.tools.ant.types.FileSet;
   
  @@ -59,7 +59,7 @@
    *
    *
    * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  - * @version $Revision: 1.10 $ $Date: 2002/01/12 04:57:14 $
  + * @version $Revision: 1.11 $ $Date: 2002/01/13 00:00:15 $
    */
   public class DependSet extends MatchingTask
   {
  
  
  
  1.14      +3 -3      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Expand.java	1 Jan 2002 09:13:45 -0000	1.13
  +++ Expand.java	13 Jan 2002 00:00:15 -0000	1.14
  @@ -19,7 +19,7 @@
   import java.util.zip.ZipInputStream;
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.PatternSet;
   
  @@ -200,7 +200,7 @@
               for( int v = 0; v < patternsets.size(); v++ )
               {
                   PatternSet p = (PatternSet)patternsets.get( v );
  -                String[] incls = p.getIncludePatterns( getProject() );
  +                String[] incls = p.getIncludePatterns( null );
                   if( incls != null )
                   {
                       for( int w = 0; w < incls.length; w++ )
  @@ -213,7 +213,7 @@
                           }
                       }
                   }
  -                String[] excls = p.getExcludePatterns( getProject() );
  +                String[] excls = p.getExcludePatterns( null );
                   if( excls != null )
                   {
                       for( int w = 0; w < excls.length; w++ )
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Jar.java	23 Dec 2001 14:21:50 -0000	1.8
  +++ Jar.java	13 Jan 2002 00:00:15 -0000	1.9
  @@ -20,7 +20,7 @@
   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.types.FileScanner;
   import org.apache.tools.ant.types.ZipFileSet;
   import org.apache.tools.zip.ZipOutputStream;
   
  
  
  
  1.22      +2 -2      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Javac.java	12 Jan 2002 05:01:06 -0000	1.21
  +++ Javac.java	13 Jan 2002 00:00:15 -0000	1.22
  @@ -13,13 +13,13 @@
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.JavaVersion;
   import org.apache.aut.nativelib.Os;
  -import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
   import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.GlobPatternMapper;
  -import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.types.SourceFileScanner;
   
   /**
    * Task to compile Java source files. This task can take the following
  
  
  
  1.9       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  
  Index: MatchingTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MatchingTask.java	1 Jan 2002 09:13:45 -0000	1.8
  +++ MatchingTask.java	13 Jan 2002 00:00:15 -0000	1.9
  @@ -9,7 +9,7 @@
   
   import java.io.File;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.PatternSet;
  
  
  
  1.20      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Rmic.java	6 Jan 2002 02:02:26 -0000	1.19
  +++ Rmic.java	13 Jan 2002 00:00:15 -0000	1.20
  @@ -14,12 +14,12 @@
   import java.util.ArrayList;
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.DirectoryScanner;
   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.util.FileNameMapper;
  -import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.types.SourceFileScanner;
   
   /**
    * Task to compile RMI stubs and skeletons. This task can take the following
  
  
  
  1.18      +1 -1      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SQLExec.java	6 Jan 2002 02:01:58 -0000	1.17
  +++ SQLExec.java	13 Jan 2002 00:00:15 -0000	1.18
  @@ -32,7 +32,7 @@
   import java.util.Properties;
   import java.util.StringTokenizer;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.FileSet;
  
  
  
  1.14      +2 -2      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Tar.java	6 Jan 2002 02:00:39 -0000	1.13
  +++ Tar.java	13 Jan 2002 00:00:15 -0000	1.14
  @@ -14,11 +14,11 @@
   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.types.DirectoryScanner;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.util.MergingMapper;
  -import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.types.SourceFileScanner;
   import org.apache.tools.tar.TarConstants;
   import org.apache.tools.tar.TarEntry;
   import org.apache.tools.tar.TarOutputStream;
  
  
  
  1.13      +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Zip.java	1 Jan 2002 09:13:45 -0000	1.12
  +++ Zip.java	13 Jan 2002 00:00:15 -0000	1.13
  @@ -21,14 +21,14 @@
   import java.util.zip.CRC32;
   import java.util.zip.ZipInputStream;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.FileScanner;
  +import org.apache.tools.ant.types.DirectoryScanner;
  +import org.apache.tools.ant.types.FileScanner;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ZipFileSet;
   import org.apache.tools.ant.types.ZipScanner;
   import org.apache.tools.ant.util.MergingMapper;
  -import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.types.SourceFileScanner;
   import org.apache.tools.zip.ZipEntry;
   import org.apache.tools.zip.ZipOutputStream;
   
  
  
  

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