You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ad...@apache.org on 2002/04/07 12:19:28 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types ScannerUtil.java FileSet.java
adammurdoch 02/04/07 03:19:27
Modified: proposal/myrmidon/src/java/org/apache/antlib/build
Checksum.java UpToDateCondition.java
proposal/myrmidon/src/java/org/apache/antlib/file
CopyTask.java Delete.java Touch.java
proposal/myrmidon/src/java/org/apache/antlib/security
SignJar.java
proposal/myrmidon/src/java/org/apache/antlib/xml
XMLValidateTask.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/file
Path.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/java
JavaRuntimeClassPath.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs
Cab.java DependSet.java MatchingTask.java
SQLExec.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive
Expand.java TarFileSet.java Zip.java
ZipFileSet.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/i18n
Translate.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac
DefaultCompilerAdapter.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc
Javadoc.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit
BatchTest.java XMLResultAggregator.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata
AbstractMetamataTask.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net
FTP.java MimeMail.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/perforce
P4Add.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka
CovMerge.java Coverage.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text
ReplaceRegExp.java
proposal/myrmidon/src/todo/org/apache/tools/todo/types
ScannerUtil.java
Removed: proposal/myrmidon/src/todo/org/apache/tools/todo/types
FileSet.java
Log:
Axed todo.types.FileSet.
Revision Changes Path
1.10 +2 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java
Index: Checksum.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Checksum.java 23 Mar 2002 03:46:31 -0000 1.9
+++ Checksum.java 7 Apr 2002 10:19:24 -0000 1.10
@@ -22,8 +22,8 @@
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.AbstractMatchingTask;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
@@ -32,7 +32,7 @@
*
* @ant.task name="checksum"
* @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
- * @version $Revision: 1.9 $ $Date: 2002/03/23 03:46:31 $
+ * @version $Revision: 1.10 $ $Date: 2002/04/07 10:19:24 $
*/
public class Checksum
extends AbstractMatchingTask
1.2 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/UpToDateCondition.java
Index: UpToDateCondition.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/UpToDateCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UpToDateCondition.java 28 Mar 2002 06:35:22 -0000 1.1
+++ UpToDateCondition.java 7 Apr 2002 10:19:25 -0000 1.2
@@ -13,9 +13,9 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.FileNameMapper;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.myrmidon.framework.conditions.Condition;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
import org.apache.tools.todo.types.SourceFileScanner;
import org.apache.tools.todo.util.mappers.MergingMapper;
1.11 +2 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java
Index: CopyTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CopyTask.java 29 Mar 2002 12:57:21 -0000 1.10
+++ CopyTask.java 7 Apr 2002 10:19:25 -0000 1.11
@@ -19,8 +19,8 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.FileNameMapper;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
import org.apache.tools.todo.types.SourceFileScanner;
import org.apache.tools.todo.util.mappers.IdentityMapper;
@@ -34,7 +34,7 @@
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
* @author <A href="gholam@xtra.co.nz">Michael McCallum</A>
* @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
- * @version $Revision: 1.10 $ $Date: 2002/03/29 12:57:21 $
+ * @version $Revision: 1.11 $ $Date: 2002/04/07 10:19:25 $
*/
public class CopyTask
extends AbstractTask
1.9 +2 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java
Index: Delete.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Delete.java 29 Mar 2002 12:57:21 -0000 1.8
+++ Delete.java 7 Apr 2002 10:19:25 -0000 1.9
@@ -13,8 +13,8 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
@@ -26,7 +26,7 @@
* @author <a href="mailto:tad1@cornell.edu">Tom Dimock</a>
* @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Revision: 1.8 $ $Date: 2002/03/29 12:57:21 $
+ * @version $Revision: 1.9 $ $Date: 2002/04/07 10:19:25 $
*/
public class Delete
extends AbstractTask
1.7 +2 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java
Index: Touch.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Touch.java 29 Mar 2002 12:57:21 -0000 1.6
+++ Touch.java 7 Apr 2002 10:19:25 -0000 1.7
@@ -18,8 +18,8 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
@@ -32,7 +32,7 @@
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
* @author <a href="mailto:mj@servidium.com">Michael J. Sikorsky</a>
* @author <a href="mailto:shaw@servidium.com">Robert Shaw</a>
- * @version $Revision: 1.6 $ $Date: 2002/03/29 12:57:21 $
+ * @version $Revision: 1.7 $ $Date: 2002/04/07 10:19:25 $
*/
public class Touch
extends AbstractTask
1.16 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
Index: SignJar.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SignJar.java 23 Mar 2002 03:46:33 -0000 1.15
+++ SignJar.java 7 Apr 2002 10:19:25 -0000 1.16
@@ -16,9 +16,9 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.28 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java
Index: XMLValidateTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XMLValidateTask.java 7 Apr 2002 09:51:09 -0000 1.27
+++ XMLValidateTask.java 7 Apr 2002 10:19:25 -0000 1.28
@@ -17,8 +17,8 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.file.Path;
import org.apache.myrmidon.framework.file.FileListUtil;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
1.4 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java
Index: Path.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Path.java 23 Mar 2002 04:01:26 -0000 1.3
+++ Path.java 7 Apr 2002 10:19:25 -0000 1.4
@@ -12,10 +12,10 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.DataType;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.myrmidon.framework.file.ArrayFileList;
import org.apache.myrmidon.framework.file.FileList;
import org.apache.tools.todo.util.FileUtils;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.ScannerUtil;
1.2 +2 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/JavaRuntimeClassPath.java
Index: JavaRuntimeClassPath.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/JavaRuntimeClassPath.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaRuntimeClassPath.java 28 Mar 2002 06:29:31 -0000 1.1
+++ JavaRuntimeClassPath.java 7 Apr 2002 10:19:26 -0000 1.2
@@ -9,9 +9,9 @@
import org.apache.myrmidon.framework.file.FileList;
import org.apache.myrmidon.framework.file.Path;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.todo.types.FileSet;
import org.apache.aut.nativelib.Os;
import java.util.Locale;
import java.io.File;
@@ -20,7 +20,7 @@
* A FileList that evaluates to the runtime class-path for this JVM.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/28 06:29:31 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/07 10:19:26 $
*
* @ant.type type="path" name="java-runtime"
*/
1.3 +1 -5 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.java
Index: Cab.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cab.java 18 Mar 2002 08:53:30 -0000 1.2
+++ Cab.java 7 Apr 2002 10:19:26 -0000 1.3
@@ -14,16 +14,12 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.aut.nativelib.ExecManager;
import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.3 +2 -2 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/DependSet.java
Index: DependSet.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/DependSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DependSet.java 21 Mar 2002 06:38:12 -0000 1.2
+++ DependSet.java 7 Apr 2002 10:19:26 -0000 1.3
@@ -13,8 +13,8 @@
import java.util.Iterator;
import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
import org.apache.tools.todo.types.SimpleFileList;
@@ -60,7 +60,7 @@
*
*
* @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/21 06:38:12 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/07 10:19:26 $
*/
public class DependSet extends MatchingTask
{
1.2 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java
Index: MatchingTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MatchingTask.java 17 Mar 2002 09:42:21 -0000 1.1
+++ MatchingTask.java 7 Apr 2002 10:19:26 -0000 1.2
@@ -12,8 +12,8 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Pattern;
import org.apache.myrmidon.framework.PatternSet;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.7 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SQLExec.java 7 Apr 2002 09:51:09 -0000 1.6
+++ SQLExec.java 7 Apr 2002 10:19:26 -0000 1.7
@@ -34,9 +34,9 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.file.Path;
import org.apache.myrmidon.framework.file.FileListUtil;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.EnumeratedAttribute;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.2 +1 -2 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Expand.java
Index: Expand.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Expand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Expand.java 17 Mar 2002 09:42:22 -0000 1.1
+++ Expand.java 7 Apr 2002 10:19:26 -0000 1.2
@@ -18,12 +18,11 @@
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.myrmidon.framework.PatternSet;
import org.apache.myrmidon.framework.PatternUtil;
import org.apache.tools.todo.taskdefs.MatchingTask;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.2 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarFileSet.java
Index: TarFileSet.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarFileSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TarFileSet.java 17 Mar 2002 09:42:22 -0000 1.1
+++ TarFileSet.java 7 Apr 2002 10:19:26 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.tools.todo.taskdefs.archive;
-import org.apache.tools.todo.types.FileSet;
+import org.apache.myrmidon.framework.FileSet;
public class TarFileSet
extends FileSet
1.4 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Zip.java 7 Apr 2002 02:57:45 -0000 1.3
+++ Zip.java 7 Apr 2002 10:19:26 -0000 1.4
@@ -24,10 +24,10 @@
import org.apache.excalibur.zip.ZipEntry;
import org.apache.excalibur.zip.ZipOutputStream;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.taskdefs.MatchingTask;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.FileScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
import org.apache.tools.todo.types.SourceFileScanner;
import org.apache.tools.todo.util.mappers.MergingMapper;
1.2 +2 -2 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java
Index: ZipFileSet.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ZipFileSet.java 17 Mar 2002 09:42:22 -0000 1.1
+++ ZipFileSet.java 7 Apr 2002 10:19:26 -0000 1.2
@@ -8,7 +8,7 @@
package org.apache.tools.todo.taskdefs.archive;
import java.io.File;
-import org.apache.tools.todo.types.FileSet;
+import org.apache.myrmidon.framework.FileSet;
/**
* A ZipFileSet is a FileSet with extra attributes useful in the context of
@@ -57,7 +57,7 @@
* Set the source Zip file for the zipfileset. Prevents both "dir" and "src"
* from being specified.
*
- * @param srcFile The zip file from which to extract entries.
+ * @param src The zip file from which to extract entries.
*/
public void setSrc( final File src )
{
1.2 +1 -3 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/i18n/Translate.java
Index: Translate.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/i18n/Translate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Translate.java 17 Mar 2002 09:56:53 -0000 1.1
+++ Translate.java 7 Apr 2002 10:19:26 -0000 1.2
@@ -20,11 +20,9 @@
import java.util.Locale;
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.taskdefs.MatchingTask;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.9 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java
Index: DefaultCompilerAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultCompilerAdapter.java 7 Apr 2002 09:51:09 -0000 1.8
+++ DefaultCompilerAdapter.java 7 Apr 2002 10:19:26 -0000 1.9
@@ -16,10 +16,10 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.Commandline;
import org.apache.myrmidon.framework.file.Path;
import org.apache.myrmidon.framework.file.FileListUtil;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.util.FileUtils;
import org.apache.aut.nativelib.PathUtil;
1.10 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Javadoc.java 7 Apr 2002 09:51:10 -0000 1.9
+++ Javadoc.java 7 Apr 2002 10:19:26 -0000 1.10
@@ -21,9 +21,9 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute;
import org.apache.myrmidon.framework.Pattern;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.myrmidon.framework.file.Path;
import org.apache.myrmidon.framework.file.FileListUtil;
import org.apache.tools.todo.types.ScannerUtil;
1.2 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/BatchTest.java
Index: BatchTest.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/BatchTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BatchTest.java 17 Mar 2002 09:56:54 -0000 1.1
+++ BatchTest.java 7 Apr 2002 10:19:26 -0000 1.2
@@ -12,8 +12,8 @@
import java.util.Arrays;
import java.util.Iterator;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.3 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java
Index: XMLResultAggregator.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLResultAggregator.java 18 Mar 2002 11:49:47 -0000 1.2
+++ XMLResultAggregator.java 7 Apr 2002 10:19:26 -0000 1.3
@@ -21,8 +21,8 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
1.8 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java
Index: AbstractMetamataTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractMetamataTask.java 22 Mar 2002 04:12:37 -0000 1.7
+++ AbstractMetamataTask.java 7 Apr 2002 10:19:26 -0000 1.8
@@ -20,8 +20,8 @@
import org.apache.myrmidon.framework.java.ExecuteJava;
import org.apache.tools.todo.types.Argument;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.myrmidon.framework.file.Path;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.3 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/FTP.java
Index: FTP.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/FTP.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FTP.java 22 Mar 2002 07:18:08 -0000 1.2
+++ FTP.java 7 Apr 2002 10:19:26 -0000 1.3
@@ -25,8 +25,8 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.FileScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.2 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/MimeMail.java
Index: MimeMail.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/MimeMail.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MimeMail.java 17 Mar 2002 09:56:55 -0000 1.1
+++ MimeMail.java 7 Apr 2002 10:19:27 -0000 1.2
@@ -26,8 +26,8 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.3 +1 -3 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/perforce/P4Add.java
Index: P4Add.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/perforce/P4Add.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- P4Add.java 22 Mar 2002 07:18:08 -0000 1.2
+++ P4Add.java 7 Apr 2002 10:19:27 -0000 1.3
@@ -10,10 +10,8 @@
import java.io.File;
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.4 +1 -3 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovMerge.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CovMerge.java 18 Mar 2002 11:49:47 -0000 1.3
+++ CovMerge.java 7 Apr 2002 10:19:27 -0000 1.4
@@ -13,14 +13,12 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Random;
-import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.framework.Execute;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.10 +1 -1 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java
Index: Coverage.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Coverage.java 7 Apr 2002 09:51:10 -0000 1.9
+++ Coverage.java 7 Apr 2002 10:19:27 -0000 1.10
@@ -16,9 +16,9 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.Argument;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.FileSet;
import org.apache.myrmidon.framework.file.Path;
import org.apache.aut.nativelib.PathUtil;
1.3 +1 -3 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java
Index: ReplaceRegExp.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReplaceRegExp.java 22 Mar 2002 07:18:08 -0000 1.2
+++ ReplaceRegExp.java 7 Apr 2002 10:19:27 -0000 1.3
@@ -18,12 +18,10 @@
import java.util.ArrayList;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.ScannerUtil;
import org.apache.tools.todo.util.regexp.Regexp;
-import org.apache.tools.todo.taskdefs.text.RegularExpression;
/**
* <pre>
1.2 +3 -56 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.java
Index: ScannerUtil.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScannerUtil.java 17 Mar 2002 09:42:24 -0000 1.1
+++ ScannerUtil.java 7 Apr 2002 10:19:27 -0000 1.2
@@ -13,12 +13,12 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.PatternUtil;
+import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.taskdefs.archive.TarFileSet;
import org.apache.tools.todo.taskdefs.archive.ZipFileSet;
import org.apache.tools.todo.taskdefs.archive.ZipScanner;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.FileScanner;
-import org.apache.tools.todo.types.FileSet;
/**
*
@@ -26,7 +26,7 @@
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @author Arnout J. Kuiper <a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>
* @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/17 09:42:24 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/07 10:19:27 $
*/
public class ScannerUtil
{
@@ -534,32 +534,6 @@
}
}
- public static void setupDirectoryScanner( final org.apache.myrmidon.framework.FileSet set,
- final FileScanner scanner,
- final TaskContext context )
- throws TaskException
- {
- if( null == scanner )
- {
- final String message = "ds cannot be null";
- throw new IllegalArgumentException( message );
- }
-
- scanner.setBasedir( set.getDir() );
-
- /*final String message = "FileSet: Setup file scanner in dir " +
- set.getDir() + " with " + set;
- getLogger().debug( message );*/
-
- scanner.setIncludes( PatternUtil.getIncludePatterns( set, context ) );
- scanner.setExcludes( PatternUtil.getExcludePatterns( set, context ) );
- if( set.includeDefaultExcludes() )
- {
- scanner.addDefaultExcludes();
- }
- scanner.setCaseSensitive( true );
- }
-
public static void setupDirectoryScanner( final FileSet set,
final FileScanner scanner,
final TaskContext context )
@@ -583,37 +557,10 @@
{
scanner.addDefaultExcludes();
}
- scanner.setCaseSensitive( set.isCaseSensitive() );
+ scanner.setCaseSensitive( true );
}
public static DirectoryScanner getDirectoryScanner( final FileSet set )
- throws TaskException
- {
- final File dir = set.getDir();
- if( null == dir )
- {
- final String message = "No directory specified for fileset.";
- throw new TaskException( message );
- }
-
- if( !dir.exists() )
- {
- final String message = dir.getAbsolutePath() + " not found.";
- throw new TaskException( message );
- }
- if( !dir.isDirectory() )
- {
- final String message = dir.getAbsolutePath() + " is not a directory.";
- throw new TaskException( message );
- }
-
- final DirectoryScanner scanner = new DirectoryScanner();
- setupDirectoryScanner( set, scanner, null );
- scanner.scan();
- return scanner;
- }
-
- public static DirectoryScanner getDirectoryScanner( final org.apache.myrmidon.framework.FileSet set )
throws TaskException
{
final File dir = set.getDir();
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>