Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 29802 invoked from network); 22 Mar 2002 12:25:55 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 22 Mar 2002 12:25:55 -0000 Received: (qmail 9776 invoked by uid 97); 22 Mar 2002 12:25:50 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 9760 invoked by uid 97); 22 Mar 2002 12:25:50 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 9749 invoked by uid 97); 22 Mar 2002 12:25:49 -0000 Date: 22 Mar 2002 12:25:49 -0000 Message-ID: <20020322122549.88529.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive Ear.java Jar.java War.java Zip.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 02/03/22 04:25:49 Modified: proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive Ear.java Jar.java War.java Zip.java Added: proposal/myrmidon/lib excalibur-zip-1.0.jar Removed: proposal/myrmidon/src/java/org/apache/aut/zip AsiExtraField.java ExtraFieldUtils.java UnixStat.java UnrecognizedExtraField.java ZipEntry.java ZipExtraField.java ZipLong.java ZipOutputStream.java ZipShort.java proposal/myrmidon/src/testcases/org/apache/aut/zip/test AsiExtraFieldTestCase.java ExtraFieldUtilsTestCase.java ZipEntryTestCase.java ZipLongTestCase.java ZipShortTestCase.java Log: Zap the zip files which are no w in a separate library Revision Changes Path 1.1 jakarta-ant/proposal/myrmidon/lib/excalibur-zip-1.0.jar <> 1.2 +1 -3 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java Index: Ear.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Ear.java 17 Mar 2002 09:42:22 -0000 1.1 +++ Ear.java 22 Mar 2002 12:25:49 -0000 1.2 @@ -9,10 +9,8 @@ import java.io.File; import java.io.IOException; -import org.apache.aut.zip.ZipOutputStream; +import org.apache.avalon.excalibur.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; /** * Creates a EAR archive. Based on WAR task 1.2 +1 -3 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java Index: Jar.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Jar.java 17 Mar 2002 09:42:22 -0000 1.1 +++ Jar.java 22 Mar 2002 12:25:49 -0000 1.2 @@ -19,14 +19,12 @@ import java.io.Reader; import java.util.Enumeration; import java.util.zip.ZipFile; -import org.apache.aut.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.tools.todo.taskdefs.manifest.Manifest; import org.apache.tools.todo.taskdefs.manifest.ManifestException; import org.apache.tools.todo.taskdefs.manifest.ManifestUtil; import org.apache.tools.todo.types.FileScanner; +import org.apache.avalon.excalibur.zip.ZipOutputStream; /** * Creates a JAR archive. 1.2 +1 -4 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java Index: War.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- War.java 17 Mar 2002 09:42:22 -0000 1.1 +++ War.java 22 Mar 2002 12:25:49 -0000 1.2 @@ -9,11 +9,8 @@ import java.io.File; import java.io.IOException; -import org.apache.aut.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.todo.taskdefs.archive.Jar; +import org.apache.avalon.excalibur.zip.ZipOutputStream; /** * Creates a WAR archive. 1.2 +3 -6 jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java Index: Zip.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Zip.java 17 Mar 2002 09:42:22 -0000 1.1 +++ Zip.java 22 Mar 2002 12:25:49 -0000 1.2 @@ -20,14 +20,11 @@ import java.util.Stack; import java.util.zip.CRC32; import java.util.zip.ZipInputStream; -import org.apache.aut.zip.ZipEntry; -import org.apache.aut.zip.ZipOutputStream; import org.apache.avalon.excalibur.io.IOUtil; +import org.apache.avalon.excalibur.zip.ZipEntry; +import org.apache.avalon.excalibur.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.tools.todo.taskdefs.MatchingTask; -import org.apache.tools.todo.taskdefs.archive.WhenEmpty; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileScanner; import org.apache.tools.todo.types.FileSet; @@ -504,7 +501,7 @@ * @param zOut The feature to be added to the Files attribute * @param prefix The feature to be added to the Files attribute * @param fullpath The feature to be added to the Files attribute - * @exception java.io.IOException Description of Exception + * @exception IOException Description of Exception */ protected void addFiles( FileScanner scanner, ZipOutputStream zOut, String prefix, String fullpath ) -- To unsubscribe, e-mail: For additional commands, e-mail: