From 6584b1cf3e65148be573d992b00b2f4b1ca46c45 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 27 Jan 2002 10:07:16 +0000 Subject: [PATCH] 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 --- .../org/apache/tools/ant/taskdefs/{ => archive}/Ear.java | 6 +++--- .../org/apache/tools/ant/taskdefs/archive}/Expand.java | 3 ++- .../org/apache/tools/ant/taskdefs/archive}/Jar.java | 8 +++++--- .../org/apache/tools/ant/taskdefs/archive}/Tar.java | 3 ++- .../tools/ant/taskdefs/{ => archive}/TarFileSet.java | 2 +- .../tools/ant/taskdefs/{ => archive}/TarLongFileMode.java | 2 +- .../org/apache/tools/ant/taskdefs/archive}/Untar.java | 2 +- .../org/apache/tools/ant/taskdefs/archive}/War.java | 3 +-- .../tools/ant/taskdefs/{ => archive}/WhenEmpty.java | 2 +- .../org/apache/tools/ant/taskdefs/{ => archive}/Zip.java | 5 ++--- .../apache/tools/ant/taskdefs/archive}/ZipFileSet.java | 3 ++- .../tools/ant/{types => taskdefs/archive}/ZipScanner.java | 3 ++- .../src/main/org/apache/tools/ant/types/ScannerUtil.java | 4 +++- .../org/apache/tools/ant/taskdefs/{ => archive}/Ear.java | 6 +++--- .../org/apache/tools/ant/taskdefs/archive}/Expand.java | 3 ++- .../org/apache/tools/ant/taskdefs/archive}/Jar.java | 8 +++++--- .../org/apache/tools/ant/taskdefs/archive}/Tar.java | 3 ++- .../tools/ant/taskdefs/{ => archive}/TarFileSet.java | 2 +- .../tools/ant/taskdefs/{ => archive}/TarLongFileMode.java | 2 +- .../org/apache/tools/ant/taskdefs/archive}/Untar.java | 2 +- .../org/apache/tools/ant/taskdefs/archive}/War.java | 3 +-- .../tools/ant/taskdefs/{ => archive}/WhenEmpty.java | 2 +- .../org/apache/tools/ant/taskdefs/{ => archive}/Zip.java | 5 ++--- .../apache/tools/ant/taskdefs/archive}/ZipFileSet.java | 3 ++- .../tools/ant/{types => taskdefs/archive}/ZipScanner.java | 3 ++- .../src/todo/org/apache/tools/ant/types/ScannerUtil.java | 4 +++- 26 files changed, 52 insertions(+), 40 deletions(-) rename proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/{ => archive}/Ear.java (96%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/taskdefs => main/org/apache/tools/ant/taskdefs/archive}/Expand.java (98%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/taskdefs => main/org/apache/tools/ant/taskdefs/archive}/Jar.java (98%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/taskdefs => main/org/apache/tools/ant/taskdefs/archive}/Tar.java (98%) rename proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/{ => archive}/TarFileSet.java (95%) rename proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/{ => archive}/TarLongFileMode.java (97%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/taskdefs => main/org/apache/tools/ant/taskdefs/archive}/Untar.java (97%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/taskdefs => main/org/apache/tools/ant/taskdefs/archive}/War.java (97%) rename proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/{ => archive}/WhenEmpty.java (92%) rename proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/{ => archive}/Zip.java (99%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant/types => main/org/apache/tools/ant/taskdefs/archive}/ZipFileSet.java (96%) rename proposal/myrmidon/src/main/org/apache/tools/ant/{types => taskdefs/archive}/ZipScanner.java (96%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/{ => archive}/Ear.java (96%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/taskdefs => todo/org/apache/tools/ant/taskdefs/archive}/Expand.java (98%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/taskdefs => todo/org/apache/tools/ant/taskdefs/archive}/Jar.java (98%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/taskdefs => todo/org/apache/tools/ant/taskdefs/archive}/Tar.java (98%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/{ => archive}/TarFileSet.java (95%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/{ => archive}/TarLongFileMode.java (97%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/taskdefs => todo/org/apache/tools/ant/taskdefs/archive}/Untar.java (97%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/taskdefs => todo/org/apache/tools/ant/taskdefs/archive}/War.java (97%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/{ => archive}/WhenEmpty.java (92%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/{ => archive}/Zip.java (99%) rename proposal/myrmidon/src/{main/org/apache/tools/ant/types => todo/org/apache/tools/ant/taskdefs/archive}/ZipFileSet.java (96%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/{types => taskdefs/archive}/ZipScanner.java (96%) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Ear.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Ear.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java index 1381a6163..9693574cd 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Ear.java +++ b/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 Stefan Bodewig * @author Les Hughes */ -public class Ear extends Jar +public class Ear + extends Jar { private File m_appxml; private boolean m_descriptorAdded; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.java index b4e5f5f03..7be55ca38 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java +++ b/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. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java index 562dd5ef0..fc0545817 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java +++ b/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 ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java index 2c6d3ca09..8327fa4ca 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/TarFileSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarFileSet.java similarity index 95% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/TarFileSet.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarFileSet.java index 9d5112309..3176342d6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/TarFileSet.java +++ b/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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/TarLongFileMode.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/TarLongFileMode.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java index 4d02ee70e..c1631a424 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/TarLongFileMode.java +++ b/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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Untar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Untar.java similarity index 97% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Untar.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Untar.java index 5bbe268a2..7a02ccbac 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Untar.java +++ b/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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/War.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java similarity index 97% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/War.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java index b73ce6ffd..6907a213e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/War.java +++ b/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; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WhenEmpty.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java similarity index 92% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WhenEmpty.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java index 86f44a237..0266efe13 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WhenEmpty.java +++ b/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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java similarity index 99% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java index fc8799d33..69a69634c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/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. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java index 39b5e07ef..3d2305e29 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipScanner.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipScanner.java index 01979e711..1528b94bb 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java index b5d60f364..59b284892 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java +++ b/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; /** * diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Ear.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Ear.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java index 1381a6163..9693574cd 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Ear.java +++ b/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 Stefan Bodewig * @author Les Hughes */ -public class Ear extends Jar +public class Ear + extends Jar { private File m_appxml; private boolean m_descriptorAdded; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Expand.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Expand.java index b4e5f5f03..7be55ca38 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java index 562dd5ef0..fc0545817 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/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 ) { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java index 2c6d3ca09..8327fa4ca 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/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. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/TarFileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarFileSet.java similarity index 95% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/TarFileSet.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarFileSet.java index 9d5112309..3176342d6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/TarFileSet.java +++ b/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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/TarLongFileMode.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java similarity index 97% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/TarLongFileMode.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java index 4d02ee70e..c1631a424 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/TarLongFileMode.java +++ b/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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Untar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Untar.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Untar.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Untar.java index 5bbe268a2..7a02ccbac 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Untar.java +++ b/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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/War.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/War.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java index b73ce6ffd..6907a213e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/War.java +++ b/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; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WhenEmpty.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java similarity index 92% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WhenEmpty.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java index 86f44a237..0266efe13 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WhenEmpty.java +++ b/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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java similarity index 99% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java index fc8799d33..69a69634c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java index 39b5e07ef..3d2305e29 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipScanner.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipScanner.java index 01979e711..1528b94bb 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java index b5d60f364..59b284892 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java +++ b/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; /** *