From eb278f795eee59165a03a7046586dc20b589f600 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 13 Jan 2002 04:45:01 +0000 Subject: [PATCH] Move mappers into their own package git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270726 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/org/apache/tools/ant/taskdefs/Javac.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Rmic.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Tar.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/UpToDate.java | 4 ++-- .../src/main/org/apache/tools/ant/taskdefs/Zip.java | 2 +- .../main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/file/Copy.java | 6 +++--- .../apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java | 2 +- .../org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java | 2 +- .../main/org/apache/tools/ant/taskdefs/text/ExtMapper.java | 2 +- .../org/apache/tools/ant/taskdefs/text/Native2Ascii.java | 4 ++-- .../src/main/org/apache/tools/ant/types/Mapper.java | 2 +- .../main/org/apache/tools/ant/types/SourceFileScanner.java | 2 +- .../apache/tools/ant/util/{ => mappers}/FileNameMapper.java | 2 +- .../apache/tools/ant/util/mappers}/FlatFileNameMapper.java | 2 +- .../apache/tools/ant/util/mappers}/GlobPatternMapper.java | 2 +- .../org/apache/tools/ant/util/mappers}/IdentityMapper.java | 2 +- .../org/apache/tools/ant/util/mappers}/MergingMapper.java | 2 +- .../tools/ant/util/{ => mappers}/RegexpPatternMapper.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Javac.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Rmic.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Tar.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/UpToDate.java | 4 ++-- .../src/todo/org/apache/tools/ant/taskdefs/Zip.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/file/Copy.java | 6 +++--- .../apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java | 2 +- .../org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/text/ExtMapper.java | 2 +- .../org/apache/tools/ant/taskdefs/text/Native2Ascii.java | 4 ++-- .../src/todo/org/apache/tools/ant/types/Mapper.java | 2 +- .../todo/org/apache/tools/ant/types/SourceFileScanner.java | 2 +- .../apache/tools/ant/util/{ => mappers}/FileNameMapper.java | 2 +- .../apache/tools/ant/util/mappers}/FlatFileNameMapper.java | 2 +- .../apache/tools/ant/util/mappers}/GlobPatternMapper.java | 2 +- .../org/apache/tools/ant/util/mappers}/IdentityMapper.java | 2 +- .../org/apache/tools/ant/util/mappers}/MergingMapper.java | 2 +- .../tools/ant/util/{ => mappers}/RegexpPatternMapper.java | 2 +- 38 files changed, 46 insertions(+), 46 deletions(-) rename proposal/myrmidon/src/main/org/apache/tools/ant/util/{ => mappers}/FileNameMapper.java (97%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/util => main/org/apache/tools/ant/util/mappers}/FlatFileNameMapper.java (96%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/util => main/org/apache/tools/ant/util/mappers}/GlobPatternMapper.java (98%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/util => main/org/apache/tools/ant/util/mappers}/IdentityMapper.java (96%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/util => main/org/apache/tools/ant/util/mappers}/MergingMapper.java (96%) rename proposal/myrmidon/src/main/org/apache/tools/ant/util/{ => mappers}/RegexpPatternMapper.java (98%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/util/{ => mappers}/FileNameMapper.java (97%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/util => todo/org/apache/tools/ant/util/mappers}/FlatFileNameMapper.java (96%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/util => todo/org/apache/tools/ant/util/mappers}/GlobPatternMapper.java (98%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/util => todo/org/apache/tools/ant/util/mappers}/IdentityMapper.java (96%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/util => todo/org/apache/tools/ant/util/mappers}/MergingMapper.java (96%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/util/{ => mappers}/RegexpPatternMapper.java (98%) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java index 52a63b66b..3902d7fca 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -18,7 +18,7 @@ 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.mappers.GlobPatternMapper; import org.apache.tools.ant.types.SourceFileScanner; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java index 2fddcd3cf..9ab81a927 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -18,7 +18,7 @@ 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.mappers.FileNameMapper; import org.apache.tools.ant.types.SourceFileScanner; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java index b63717f65..7619da363 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java @@ -17,7 +17,7 @@ import org.apache.myrmidon.api.TaskException; 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.mappers.MergingMapper; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.tar.TarConstants; import org.apache.tools.tar.TarEntry; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 8e2381951..4e4da8409 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -15,8 +15,8 @@ import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Mapper; -import org.apache.tools.ant.util.FileNameMapper; -import org.apache.tools.ant.util.MergingMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.util.mappers.MergingMapper; import org.apache.tools.ant.types.SourceFileScanner; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java index de556aa34..2263ed829 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -27,7 +27,7 @@ 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.mappers.MergingMapper; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipOutputStream; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java index 2bc111d99..01acb6e10 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java @@ -18,7 +18,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.types.Marker; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.avalon.excalibur.util.StringUtil; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java index 3f78d2af2..bd23604b9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java @@ -21,10 +21,10 @@ import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; import org.apache.tools.ant.types.Mapper; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.FlatFileNameMapper; -import org.apache.tools.ant.util.IdentityMapper; +import org.apache.tools.ant.util.mappers.FlatFileNameMapper; +import org.apache.tools.ant.util.mappers.IdentityMapper; import org.apache.tools.ant.types.SourceFileScanner; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 0e278c532..2c3f542d8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -15,7 +15,7 @@ import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * This is the default implementation for the RmicAdapter interface. Currently, diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java index bdcacca90..e8f0a0d23 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.rmic; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * The interface that all rmic adapters must adher to.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ExtMapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ExtMapper.java index a12a46866..02d83c200 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ExtMapper.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ExtMapper.java @@ -7,7 +7,7 @@ */ package org.apache.tools.ant.taskdefs.text; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; class ExtMapper implements FileNameMapper diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java index c391ec8d7..61b8d5d34 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java @@ -14,8 +14,8 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.tools.ant.util.FileNameMapper; -import org.apache.tools.ant.util.IdentityMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.util.mappers.IdentityMapper; /** * Convert files from native encodings to ascii. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Mapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Mapper.java index e72030e1c..7cf2bdf66 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Mapper.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Mapper.java @@ -11,7 +11,7 @@ import java.net.URL; import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.ProjectComponent; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * Element to define a FileNameMapper. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java index 58c8b0ab1..429b7b7fe 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java @@ -14,7 +14,7 @@ import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * Utility class that collects the functionality of the various scanDir methods diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/FileNameMapper.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/FileNameMapper.java index 023e95303..8d34e489c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/FileNameMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FlatFileNameMapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/FlatFileNameMapper.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/FlatFileNameMapper.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/FlatFileNameMapper.java index 46089cbb0..29b031379 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FlatFileNameMapper.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/FlatFileNameMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; import java.io.File; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/GlobPatternMapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/GlobPatternMapper.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/GlobPatternMapper.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/GlobPatternMapper.java index ab64795ad..0caaf1d45 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/GlobPatternMapper.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/GlobPatternMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; /** * Implementation of FileNameMapper that does simple wildcard pattern diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/IdentityMapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/IdentityMapper.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/IdentityMapper.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/IdentityMapper.java index e52e5a064..f1bc43d63 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/IdentityMapper.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/IdentityMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; /** * Implementation of FileNameMapper that always returns the source file name. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/MergingMapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MergingMapper.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/MergingMapper.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MergingMapper.java index 8dd26869a..598b8c515 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/MergingMapper.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MergingMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; /** * Implementation of FileNameMapper that always returns the same target file diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java index dd1d6fbdc..12dfb9973 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java index 52a63b66b..3902d7fca 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java @@ -18,7 +18,7 @@ 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.mappers.GlobPatternMapper; import org.apache.tools.ant.types.SourceFileScanner; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java index 2fddcd3cf..9ab81a927 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java @@ -18,7 +18,7 @@ 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.mappers.FileNameMapper; import org.apache.tools.ant.types.SourceFileScanner; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java index b63717f65..7619da363 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java @@ -17,7 +17,7 @@ import org.apache.myrmidon.api.TaskException; 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.mappers.MergingMapper; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.tar.TarConstants; import org.apache.tools.tar.TarEntry; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java index 8e2381951..4e4da8409 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java @@ -15,8 +15,8 @@ import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Mapper; -import org.apache.tools.ant.util.FileNameMapper; -import org.apache.tools.ant.util.MergingMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.util.mappers.MergingMapper; import org.apache.tools.ant.types.SourceFileScanner; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java index de556aa34..2263ed829 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java @@ -27,7 +27,7 @@ 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.mappers.MergingMapper; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipOutputStream; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java index 2bc111d99..01acb6e10 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java @@ -18,7 +18,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.types.Marker; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; import org.apache.tools.ant.types.SourceFileScanner; import org.apache.avalon.excalibur.util.StringUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java index 3f78d2af2..bd23604b9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java @@ -21,10 +21,10 @@ import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; import org.apache.tools.ant.types.Mapper; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.FlatFileNameMapper; -import org.apache.tools.ant.util.IdentityMapper; +import org.apache.tools.ant.util.mappers.FlatFileNameMapper; +import org.apache.tools.ant.util.mappers.IdentityMapper; import org.apache.tools.ant.types.SourceFileScanner; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 0e278c532..2c3f542d8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -15,7 +15,7 @@ import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * This is the default implementation for the RmicAdapter interface. Currently, diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java index bdcacca90..e8f0a0d23 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.rmic; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * The interface that all rmic adapters must adher to.

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ExtMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ExtMapper.java index a12a46866..02d83c200 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ExtMapper.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ExtMapper.java @@ -7,7 +7,7 @@ */ package org.apache.tools.ant.taskdefs.text; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; class ExtMapper implements FileNameMapper diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java index c391ec8d7..61b8d5d34 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java @@ -14,8 +14,8 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.tools.ant.util.FileNameMapper; -import org.apache.tools.ant.util.IdentityMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; +import org.apache.tools.ant.util.mappers.IdentityMapper; /** * Convert files from native encodings to ascii. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Mapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Mapper.java index e72030e1c..7cf2bdf66 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Mapper.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Mapper.java @@ -11,7 +11,7 @@ import java.net.URL; import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.ProjectComponent; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * Element to define a FileNameMapper. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java index 58c8b0ab1..429b7b7fe 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java @@ -14,7 +14,7 @@ import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; -import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.mappers.FileNameMapper; /** * Utility class that collects the functionality of the various scanDir methods diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/FileNameMapper.java similarity index 97% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/FileNameMapper.java index 023e95303..8d34e489c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/FileNameMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/FlatFileNameMapper.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/FlatFileNameMapper.java index 46089cbb0..29b031379 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/FlatFileNameMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; import java.io.File; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/GlobPatternMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/GlobPatternMapper.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/GlobPatternMapper.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/GlobPatternMapper.java index ab64795ad..0caaf1d45 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/GlobPatternMapper.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/GlobPatternMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; /** * Implementation of FileNameMapper that does simple wildcard pattern diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/IdentityMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/IdentityMapper.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/IdentityMapper.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/IdentityMapper.java index e52e5a064..f1bc43d63 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/IdentityMapper.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/IdentityMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; /** * Implementation of FileNameMapper that always returns the source file name. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/MergingMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MergingMapper.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/MergingMapper.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MergingMapper.java index 8dd26869a..598b8c515 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/MergingMapper.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MergingMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; /** * Implementation of FileNameMapper that always returns the same target file diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/RegexpPatternMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/RegexpPatternMapper.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java index dd1d6fbdc..12dfb9973 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/RegexpPatternMapper.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.util.mappers; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException;