Move zip/tar related archiving and un-archiving classes into new package

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

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Ear.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java

@@ -5,12 +5,11 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.IOException;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.ZipFileSet;
 import org.apache.aut.zip.ZipOutputStream;
 
 /**
@@ -19,7 +18,8 @@ import org.apache.aut.zip.ZipOutputStream;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:leslie.hughes@rubus.com">Les Hughes</a>
  */
-public class Ear extends Jar
+public class Ear
+    extends Jar
 {
     private File m_appxml;
     private boolean m_descriptorAdded;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,6 +25,7 @@ import org.apache.tools.ant.types.FileSet;
 import org.apache.myrmidon.framework.PatternSet;
 import org.apache.myrmidon.framework.PatternUtil;
 import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 
 /**
  * Unzip a file.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -19,9 +19,11 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.util.Enumeration;
 import java.util.Iterator;
+import java.util.zip.ZipFile;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.FileScanner;
-import org.apache.tools.ant.types.ZipFileSet;
+import org.apache.tools.ant.taskdefs.Manifest;
+import org.apache.tools.ant.taskdefs.ManifestException;
 import org.apache.aut.zip.ZipOutputStream;
 
 /**
@@ -163,7 +165,7 @@ public class Jar
             java.util.zip.ZipFile theZipFile = null;
             try
             {
-                theZipFile = new java.util.zip.ZipFile( zipFile );
+                theZipFile = new ZipFile( zipFile );
                 java.util.zip.ZipEntry entry = theZipFile.getEntry( "META-INF/MANIFEST.MF" );
                 if( entry == null )
                 {

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,6 +20,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.SourceFileScanner;
 import org.apache.tools.ant.types.ScannerUtil;
 import org.apache.tools.ant.util.mappers.MergingMapper;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 
 /**
  * Creates a TAR archive.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/TarFileSet.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarFileSet.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import org.apache.tools.ant.types.FileSet;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/TarLongFileMode.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.EnumeratedAttribute;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Untar.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Untar.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/War.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java

@@ -5,12 +5,11 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.IOException;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.ZipFileSet;
 import org.apache.aut.zip.ZipOutputStream;
 
 /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WhenEmpty.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/WhenEmpty.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import org.apache.tools.ant.types.EnumeratedAttribute;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,9 +28,8 @@ import org.apache.tools.ant.types.FileScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
 import org.apache.tools.ant.types.SourceFileScanner;
-import org.apache.tools.ant.types.ZipFileSet;
-import org.apache.tools.ant.types.ZipScanner;
 import org.apache.tools.ant.util.mappers.MergingMapper;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 
 /**
  * Create a ZIP archive.

proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java

@@ -5,9 +5,10 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
+import org.apache.tools.ant.types.FileSet;
 
 /**
  * A ZipFileSet is a FileSet with extra attributes useful in the context of

proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java → proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipScanner.java

@@ -5,9 +5,10 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
+import org.apache.tools.ant.types.DirectoryScanner;
 
 /**
  * ZipScanner accesses the pattern matching algorithm in DirectoryScanner, which

proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java

@@ -14,7 +14,9 @@ import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.PatternUtil;
 import org.apache.myrmidon.framework.PatternSet;
-import org.apache.tools.ant.taskdefs.TarFileSet;
+import org.apache.tools.ant.taskdefs.archive.TarFileSet;
+import org.apache.tools.ant.taskdefs.archive.ZipFileSet;
+import org.apache.tools.ant.taskdefs.archive.ZipScanner;
 
 /**
  *

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Ear.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java

@@ -5,12 +5,11 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.IOException;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.ZipFileSet;
 import org.apache.aut.zip.ZipOutputStream;
 
 /**
@@ -19,7 +18,8 @@ import org.apache.aut.zip.ZipOutputStream;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:leslie.hughes@rubus.com">Les Hughes</a>
  */
-public class Ear extends Jar
+public class Ear
+    extends Jar
 {
     private File m_appxml;
     private boolean m_descriptorAdded;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Expand.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,6 +25,7 @@ import org.apache.tools.ant.types.FileSet;
 import org.apache.myrmidon.framework.PatternSet;
 import org.apache.myrmidon.framework.PatternUtil;
 import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 
 /**
  * Unzip a file.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -19,9 +19,11 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.util.Enumeration;
 import java.util.Iterator;
+import java.util.zip.ZipFile;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.FileScanner;
-import org.apache.tools.ant.types.ZipFileSet;
+import org.apache.tools.ant.taskdefs.Manifest;
+import org.apache.tools.ant.taskdefs.ManifestException;
 import org.apache.aut.zip.ZipOutputStream;
 
 /**
@@ -163,7 +165,7 @@ public class Jar
             java.util.zip.ZipFile theZipFile = null;
             try
             {
-                theZipFile = new java.util.zip.ZipFile( zipFile );
+                theZipFile = new ZipFile( zipFile );
                 java.util.zip.ZipEntry entry = theZipFile.getEntry( "META-INF/MANIFEST.MF" );
                 if( entry == null )
                 {

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,6 +20,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.SourceFileScanner;
 import org.apache.tools.ant.types.ScannerUtil;
 import org.apache.tools.ant.util.mappers.MergingMapper;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 
 /**
  * Creates a TAR archive.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/TarFileSet.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarFileSet.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import org.apache.tools.ant.types.FileSet;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/TarLongFileMode.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.EnumeratedAttribute;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Untar.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Untar.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/War.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java

@@ -5,12 +5,11 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
 import java.io.IOException;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.ZipFileSet;
 import org.apache.aut.zip.ZipOutputStream;
 
 /**

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WhenEmpty.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/WhenEmpty.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import org.apache.tools.ant.types.EnumeratedAttribute;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.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.taskdefs;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,9 +28,8 @@ import org.apache.tools.ant.types.FileScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
 import org.apache.tools.ant.types.SourceFileScanner;
-import org.apache.tools.ant.types.ZipFileSet;
-import org.apache.tools.ant.types.ZipScanner;
 import org.apache.tools.ant.util.mappers.MergingMapper;
+import org.apache.tools.ant.taskdefs.MatchingTask;
 
 /**
  * Create a ZIP archive.

proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java

@@ -5,9 +5,10 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
+import org.apache.tools.ant.types.FileSet;
 
 /**
  * A ZipFileSet is a FileSet with extra attributes useful in the context of

proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java → proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipScanner.java

@@ -5,9 +5,10 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.ant.taskdefs.archive;
 
 import java.io.File;
+import org.apache.tools.ant.types.DirectoryScanner;
 
 /**
  * ZipScanner accesses the pattern matching algorithm in DirectoryScanner, which

proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java

@@ -14,7 +14,9 @@ import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.PatternUtil;
 import org.apache.myrmidon.framework.PatternSet;
-import org.apache.tools.ant.taskdefs.TarFileSet;
+import org.apache.tools.ant.taskdefs.archive.TarFileSet;
+import org.apache.tools.ant.taskdefs.archive.ZipFileSet;
+import org.apache.tools.ant.taskdefs.archive.ZipScanner;
 
 /**
  *