Move mappers into their own package

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270726 13f79535-47bb-0310-9956-ffa450edef68

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;
 
 /**

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;
 
 /**

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;

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;
 
 /**

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;

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;
 

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;
 
 /**

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,

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

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

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.

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.

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

proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java → 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;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/util/FlatFileNameMapper.java → 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;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/util/GlobPatternMapper.java → 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

proposal/myrmidon/src/todo/org/apache/tools/ant/util/IdentityMapper.java → 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.

proposal/myrmidon/src/todo/org/apache/tools/ant/util/MergingMapper.java → 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

proposal/myrmidon/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java → 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;

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;
 
 /**

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;
 
 /**

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;

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;
 
 /**

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;

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;
 

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;
 
 /**

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,

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

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

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.

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.

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

proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java → 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;
 

proposal/myrmidon/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java → 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;
 

proposal/myrmidon/src/main/org/apache/tools/ant/util/GlobPatternMapper.java → 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

proposal/myrmidon/src/main/org/apache/tools/ant/util/IdentityMapper.java → 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.

proposal/myrmidon/src/main/org/apache/tools/ant/util/MergingMapper.java → 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

proposal/myrmidon/src/todo/org/apache/tools/ant/util/RegexpPatternMapper.java → 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;