From 0af1e9e5da7ac862bd49740ead73395f903780a2 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Fri, 22 Mar 2002 12:25:49 +0000
Subject: [PATCH] Zap the zip files which are no w in a separate library

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271954 13f79535-47bb-0310-9956-ffa450edef68
---
 proposal/myrmidon/lib/excalibur-zip-1.0.jar   | Bin 0 -> 35487 bytes
 .../org/apache/aut/zip/AsiExtraField.java     | 362 ---------
 .../org/apache/aut/zip/ExtraFieldUtils.java   | 194 -----
 .../src/java/org/apache/aut/zip/UnixStat.java |  66 --
 .../aut/zip/UnrecognizedExtraField.java       |  99 ---
 .../src/java/org/apache/aut/zip/ZipEntry.java | 435 -----------
 .../org/apache/aut/zip/ZipExtraField.java     |  81 --
 .../src/java/org/apache/aut/zip/ZipLong.java  | 113 ---
 .../org/apache/aut/zip/ZipOutputStream.java   | 715 ------------------
 .../src/java/org/apache/aut/zip/ZipShort.java | 109 ---
 .../aut/zip/test/AsiExtraFieldTestCase.java   | 167 ----
 .../aut/zip/test/ExtraFieldUtilsTestCase.java | 120 ---
 .../apache/aut/zip/test/ZipEntryTestCase.java |  99 ---
 .../apache/aut/zip/test/ZipLongTestCase.java  |  80 --
 .../apache/aut/zip/test/ZipShortTestCase.java |  76 --
 .../aut/zip/test/AsiExtraFieldTestCase.java   | 167 ----
 .../aut/zip/test/ExtraFieldUtilsTestCase.java | 120 ---
 .../apache/aut/zip/test/ZipEntryTestCase.java |  99 ---
 .../apache/aut/zip/test/ZipLongTestCase.java  |  80 --
 .../apache/aut/zip/test/ZipShortTestCase.java |  76 --
 .../tools/todo/taskdefs/archive/Ear.java      |   4 +-
 .../tools/todo/taskdefs/archive/Jar.java      |   4 +-
 .../tools/todo/taskdefs/archive/War.java      |   5 +-
 .../tools/todo/taskdefs/archive/Zip.java      |   9 +-
 24 files changed, 6 insertions(+), 3274 deletions(-)
 create mode 100644 proposal/myrmidon/lib/excalibur-zip-1.0.jar
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/AsiExtraField.java
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/ExtraFieldUtils.java
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/UnixStat.java
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/UnrecognizedExtraField.java
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/ZipEntry.java
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/ZipExtraField.java
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/ZipLong.java
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/ZipOutputStream.java
 delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/zip/ZipShort.java
 delete mode 100644 proposal/myrmidon/src/test/org/apache/aut/zip/test/AsiExtraFieldTestCase.java
 delete mode 100644 proposal/myrmidon/src/test/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java
 delete mode 100644 proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipEntryTestCase.java
 delete mode 100644 proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipLongTestCase.java
 delete mode 100644 proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipShortTestCase.java
 delete mode 100644 proposal/myrmidon/src/testcases/org/apache/aut/zip/test/AsiExtraFieldTestCase.java
 delete mode 100644 proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java
 delete mode 100644 proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipEntryTestCase.java
 delete mode 100644 proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipLongTestCase.java
 delete mode 100644 proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipShortTestCase.java

diff --git a/proposal/myrmidon/lib/excalibur-zip-1.0.jar b/proposal/myrmidon/lib/excalibur-zip-1.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1e111a6ace9de8916abef740bc302f58ac1d035b
GIT binary patch
literal 35487
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

literal 0
HcmV?d00001

diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/AsiExtraField.java b/proposal/myrmidon/src/java/org/apache/aut/zip/AsiExtraField.java
deleted file mode 100644
index 100c6ea7e..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/AsiExtraField.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-import java.util.zip.CRC32;
-import java.util.zip.ZipException;
-
-/**
- * Adds Unix file permission and UID/GID fields as well as symbolic link
- * handling. <p>
- *
- * This class uses the ASi extra field in the format: <pre>
- *         Value         Size            Description
- *         -----         ----            -----------
- * (Unix3) 0x756e        Short           tag for this extra block type
- *         TSize         Short           total data size for this block
- *         CRC           Long            CRC-32 of the remaining data
- *         Mode          Short           file permissions
- *         SizDev        Long            symlink'd size OR major/minor dev num
- *         UID           Short           user ID
- *         GID           Short           group ID
- *         (var.)        variable        symbolic link filename
- * </pre> taken from appnote.iz (Info-ZIP note, 981119) found at <a
- * href="ftp://ftp.uu.net/pub/archiving/zip/doc/">
- * ftp://ftp.uu.net/pub/archiving/zip/doc/</a> </p> <p>
- *
- * Short is two bytes and Long is four bytes in big endian byte and word order,
- * device numbers are currently not supported.</p>
- *
- * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public class AsiExtraField implements ZipExtraField, UnixStat, Cloneable
-{
-
-    private final static ZipShort HEADER_ID = new ZipShort( 0x756E );
-
-    /**
-     * Standard Unix stat(2) file mode.
-     *
-     * @since 1.1
-     */
-    private int mode = 0;
-    /**
-     * User ID.
-     *
-     * @since 1.1
-     */
-    private int uid = 0;
-    /**
-     * Group ID.
-     *
-     * @since 1.1
-     */
-    private int gid = 0;
-    /**
-     * File this entry points to, if it is a symbolic link. <p>
-     *
-     * empty string - if entry is not a symbolic link.</p>
-     *
-     * @since 1.1
-     */
-    private String link = "";
-    /**
-     * Is this an entry for a directory?
-     *
-     * @since 1.1
-     */
-    private boolean dirFlag = false;
-
-    /**
-     * Instance used to calculate checksums.
-     *
-     * @since 1.1
-     */
-    private CRC32 crc = new CRC32();
-
-    public AsiExtraField()
-    {
-    }
-
-    /**
-     * Indicate whether this entry is a directory.
-     *
-     * @param dirFlag The new Directory value
-     * @since 1.1
-     */
-    public void setDirectory( boolean dirFlag )
-    {
-        this.dirFlag = dirFlag;
-        mode = getMode( mode );
-    }
-
-    /**
-     * Set the group id.
-     *
-     * @param gid The new GroupId value
-     * @since 1.1
-     */
-    public void setGroupId( int gid )
-    {
-        this.gid = gid;
-    }
-
-    /**
-     * Indicate that this entry is a symbolic link to the given filename.
-     *
-     * @param name Name of the file this entry links to, empty String if it is
-     *      not a symbolic link.
-     * @since 1.1
-     */
-    public void setLinkedFile( String name )
-    {
-        link = name;
-        mode = getMode( mode );
-    }
-
-    /**
-     * File mode of this file.
-     *
-     * @param mode The new Mode value
-     * @since 1.1
-     */
-    public void setMode( int mode )
-    {
-        this.mode = getMode( mode );
-    }
-
-    /**
-     * Set the user id.
-     *
-     * @param uid The new UserId value
-     * @since 1.1
-     */
-    public void setUserId( int uid )
-    {
-        this.uid = uid;
-    }
-
-    /**
-     * Delegate to local file data.
-     *
-     * @return The CentralDirectoryData value
-     * @since 1.1
-     */
-    public byte[] getCentralDirectoryData()
-    {
-        return getLocalFileDataData();
-    }
-
-    /**
-     * Delegate to local file data.
-     *
-     * @return The CentralDirectoryLength value
-     * @since 1.1
-     */
-    public ZipShort getCentralDirectoryLength()
-    {
-        return getLocalFileDataLength();
-    }
-
-    /**
-     * Get the group id.
-     *
-     * @return The GroupId value
-     * @since 1.1
-     */
-    public int getGroupId()
-    {
-        return gid;
-    }
-
-    /**
-     * The Header-ID.
-     *
-     * @return The HeaderId value
-     * @since 1.1
-     */
-    public ZipShort getHeaderId()
-    {
-        return HEADER_ID;
-    }
-
-    /**
-     * Name of linked file
-     *
-     * @return name of the file this entry links to if it is a symbolic link,
-     *      the empty string otherwise.
-     * @since 1.1
-     */
-    public String getLinkedFile()
-    {
-        return link;
-    }
-
-    /**
-     * The actual data to put into local file data - without Header-ID or length
-     * specifier.
-     *
-     * @return The LocalFileDataData value
-     * @since 1.1
-     */
-    public byte[] getLocalFileDataData()
-    {
-        // CRC will be added later
-        byte[] data = new byte[ getLocalFileDataLength().getValue() - 4 ];
-        System.arraycopy( ( new ZipShort( getMode() ) ).getBytes(), 0, data, 0, 2 );
-
-        byte[] linkArray = getLinkedFile().getBytes();
-        System.arraycopy( ( new ZipLong( linkArray.length ) ).getBytes(),
-                          0, data, 2, 4 );
-
-        System.arraycopy( ( new ZipShort( getUserId() ) ).getBytes(),
-                          0, data, 6, 2 );
-        System.arraycopy( ( new ZipShort( getGroupId() ) ).getBytes(),
-                          0, data, 8, 2 );
-
-        System.arraycopy( linkArray, 0, data, 10, linkArray.length );
-
-        crc.reset();
-        crc.update( data );
-        long checksum = crc.getValue();
-
-        byte[] result = new byte[ data.length + 4 ];
-        System.arraycopy( ( new ZipLong( checksum ) ).getBytes(), 0, result, 0, 4 );
-        System.arraycopy( data, 0, result, 4, data.length );
-        return result;
-    }
-
-    /**
-     * Length of the extra field in the local file data - without Header-ID or
-     * length specifier.
-     *
-     * @return The LocalFileDataLength value
-     * @since 1.1
-     */
-    public ZipShort getLocalFileDataLength()
-    {
-        return new ZipShort( 4// CRC
-                             + 2// Mode
-                             + 4// SizDev
-                             + 2// UID
-                             + 2// GID
-                             + getLinkedFile().getBytes().length );
-    }
-
-    /**
-     * File mode of this file.
-     *
-     * @return The Mode value
-     * @since 1.1
-     */
-    public int getMode()
-    {
-        return mode;
-    }
-
-    /**
-     * Get the user id.
-     *
-     * @return The UserId value
-     * @since 1.1
-     */
-    public int getUserId()
-    {
-        return uid;
-    }
-
-    /**
-     * Is this entry a directory?
-     *
-     * @return The Directory value
-     * @since 1.1
-     */
-    public boolean isDirectory()
-    {
-        return dirFlag && !isLink();
-    }
-
-    /**
-     * Is this entry a symbolic link?
-     *
-     * @return The Link value
-     * @since 1.1
-     */
-    public boolean isLink()
-    {
-        return getLinkedFile().length() != 0;
-    }
-
-    /**
-     * Populate data from this array as if it was in local file data.
-     *
-     * @param data Description of Parameter
-     * @param offset Description of Parameter
-     * @param length Description of Parameter
-     * @exception ZipException Description of Exception
-     * @since 1.1
-     */
-    public void parseFromLocalFileData( byte[] data, int offset, int length )
-        throws ZipException
-    {
-
-        long givenChecksum = ( new ZipLong( data, offset ) ).getValue();
-        byte[] tmp = new byte[ length - 4 ];
-        System.arraycopy( data, offset + 4, tmp, 0, length - 4 );
-        crc.reset();
-        crc.update( tmp );
-        long realChecksum = crc.getValue();
-        if( givenChecksum != realChecksum )
-        {
-            throw new ZipException( "bad CRC checksum "
-                                    + Long.toHexString( givenChecksum )
-                                    + " instead of "
-                                    + Long.toHexString( realChecksum ) );
-        }
-
-        int newMode = ( new ZipShort( tmp, 0 ) ).getValue();
-        byte[] linkArray = new byte[ (int)( new ZipLong( tmp, 2 ) ).getValue() ];
-        uid = ( new ZipShort( tmp, 6 ) ).getValue();
-        gid = ( new ZipShort( tmp, 8 ) ).getValue();
-
-        if( linkArray.length == 0 )
-        {
-            link = "";
-        }
-        else
-        {
-            System.arraycopy( tmp, 10, linkArray, 0, linkArray.length );
-            link = new String( linkArray );
-        }
-        setDirectory( ( newMode & DIR_FLAG ) != 0 );
-        setMode( newMode );
-    }
-
-    /**
-     * Get the file mode for given permissions with the correct file type.
-     *
-     * @param mode Description of Parameter
-     * @return The Mode value
-     * @since 1.1
-     */
-    protected int getMode( int mode )
-    {
-        int type = FILE_FLAG;
-        if( isLink() )
-        {
-            type = LINK_FLAG;
-        }
-        else if( isDirectory() )
-        {
-            type = DIR_FLAG;
-        }
-        return type | ( mode & PERM_MASK );
-    }
-
-}
diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/ExtraFieldUtils.java b/proposal/myrmidon/src/java/org/apache/aut/zip/ExtraFieldUtils.java
deleted file mode 100644
index 59888e46b..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/ExtraFieldUtils.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.zip.ZipException;
-
-/**
- * ZipExtraField related methods
- *
- * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public class ExtraFieldUtils
-{
-
-    /**
-     * Static registry of known extra fields.
-     *
-     * @since 1.1
-     */
-    private static Hashtable implementations;
-
-    static
-    {
-        implementations = new Hashtable();
-        register( AsiExtraField.class );
-    }
-
-    /**
-     * Create an instance of the approriate ExtraField, falls back to {@link
-     * UnrecognizedExtraField UnrecognizedExtraField}.
-     *
-     * @param headerId Description of Parameter
-     * @return Description of the Returned Value
-     * @exception InstantiationException Description of Exception
-     * @exception IllegalAccessException Description of Exception
-     * @since 1.1
-     */
-    public static ZipExtraField createExtraField( ZipShort headerId )
-        throws InstantiationException, IllegalAccessException
-    {
-        Class c = (Class)implementations.get( headerId );
-        if( c != null )
-        {
-            return (ZipExtraField)c.newInstance();
-        }
-        UnrecognizedExtraField u = new UnrecognizedExtraField();
-        u.setHeaderId( headerId );
-        return u;
-    }
-
-    /**
-     * Merges the central directory fields of the given ZipExtraFields.
-     *
-     * @param data Description of Parameter
-     * @return Description of the Returned Value
-     * @since 1.1
-     */
-    public static byte[] mergeCentralDirectoryData( ZipExtraField[] data )
-    {
-        int sum = 4 * data.length;
-        for( int i = 0; i < data.length; i++ )
-        {
-            sum += data[ i ].getCentralDirectoryLength().getValue();
-        }
-        byte[] result = new byte[ sum ];
-        int start = 0;
-        for( int i = 0; i < data.length; i++ )
-        {
-            System.arraycopy( data[ i ].getHeaderId().getBytes(),
-                              0, result, start, 2 );
-            System.arraycopy( data[ i ].getCentralDirectoryLength().getBytes(),
-                              0, result, start + 2, 2 );
-            byte[] local = data[ i ].getCentralDirectoryData();
-            System.arraycopy( local, 0, result, start + 4, local.length );
-            start += ( local.length + 4 );
-        }
-        return result;
-    }
-
-    /**
-     * Merges the local file data fields of the given ZipExtraFields.
-     *
-     * @param data Description of Parameter
-     * @return Description of the Returned Value
-     * @since 1.1
-     */
-    public static byte[] mergeLocalFileDataData( ZipExtraField[] data )
-    {
-        int sum = 4 * data.length;
-        for( int i = 0; i < data.length; i++ )
-        {
-            sum += data[ i ].getLocalFileDataLength().getValue();
-        }
-        byte[] result = new byte[ sum ];
-        int start = 0;
-        for( int i = 0; i < data.length; i++ )
-        {
-            System.arraycopy( data[ i ].getHeaderId().getBytes(),
-                              0, result, start, 2 );
-            System.arraycopy( data[ i ].getLocalFileDataLength().getBytes(),
-                              0, result, start + 2, 2 );
-            byte[] local = data[ i ].getLocalFileDataData();
-            System.arraycopy( local, 0, result, start + 4, local.length );
-            start += ( local.length + 4 );
-        }
-        return result;
-    }
-
-    /**
-     * Split the array into ExtraFields and populate them with the give data.
-     *
-     * @param data Description of Parameter
-     * @return Description of the Returned Value
-     * @exception ZipException Description of Exception
-     * @since 1.1
-     */
-    public static ZipExtraField[] parse( byte[] data )
-        throws ZipException
-    {
-        ArrayList v = new ArrayList();
-        int start = 0;
-        while( start <= data.length - 4 )
-        {
-            ZipShort headerId = new ZipShort( data, start );
-            int length = ( new ZipShort( data, start + 2 ) ).getValue();
-            if( start + 4 + length > data.length )
-            {
-                throw new ZipException( "data starting at " + start + " is in unknown format" );
-            }
-            try
-            {
-                ZipExtraField ze = createExtraField( headerId );
-                ze.parseFromLocalFileData( data, start + 4, length );
-                v.add( ze );
-            }
-            catch( InstantiationException ie )
-            {
-                throw new ZipException( ie.getMessage() );
-            }
-            catch( IllegalAccessException iae )
-            {
-                throw new ZipException( iae.getMessage() );
-            }
-            start += ( length + 4 );
-        }
-        if( start != data.length )
-        {// array not exhausted
-            throw new ZipException( "data starting at " + start + " is in unknown format" );
-        }
-
-        final ZipExtraField[] result = new ZipExtraField[ v.size() ];
-        return (ZipExtraField[])v.toArray( result );
-    }
-
-    /**
-     * Register a ZipExtraField implementation. <p>
-     *
-     * The given class must have a no-arg constructor and implement the {@link
-     * ZipExtraField ZipExtraField interface}.</p>
-     *
-     * @param c Description of Parameter
-     * @since 1.1
-     */
-    public static void register( Class c )
-    {
-        try
-        {
-            ZipExtraField ze = (ZipExtraField)c.newInstance();
-            implementations.put( ze.getHeaderId(), c );
-        }
-        catch( ClassCastException cc )
-        {
-            throw new RuntimeException( c +
-                                        " doesn\'t implement ZipExtraField" );
-        }
-        catch( InstantiationException ie )
-        {
-            throw new RuntimeException( c + " is not a concrete class" );
-        }
-        catch( IllegalAccessException ie )
-        {
-            throw new RuntimeException( c +
-                                        "\'s no-arg constructor is not public" );
-        }
-    }
-}
diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/UnixStat.java b/proposal/myrmidon/src/java/org/apache/aut/zip/UnixStat.java
deleted file mode 100644
index 4d4579eb4..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/UnixStat.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-/**
- * Constants from stat.h on Unix systems.
- *
- * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public interface UnixStat
-{
-    /**
-     * Bits used for permissions (and sticky bit)
-     *
-     * @since 1.1
-     */
-    int PERM_MASK = 07777;
-    /**
-     * Indicates symbolic links.
-     *
-     * @since 1.1
-     */
-    int LINK_FLAG = 0120000;
-    /**
-     * Indicates plain files.
-     *
-     * @since 1.1
-     */
-    int FILE_FLAG = 0100000;
-    /**
-     * Indicates directories.
-     *
-     * @since 1.1
-     */
-    int DIR_FLAG = 040000;
-
-    // ----------------------------------------------------------
-    // somewhat arbitrary choices that are quite common for shared
-    // installations
-    // -----------------------------------------------------------
-
-    /**
-     * Default permissions for symbolic links.
-     *
-     * @since 1.1
-     */
-    int DEFAULT_LINK_PERM = 0777;
-    /**
-     * Default permissions for directories.
-     *
-     * @since 1.1
-     */
-    int DEFAULT_DIR_PERM = 0755;
-    /**
-     * Default permissions for plain files.
-     *
-     * @since 1.1
-     */
-    int DEFAULT_FILE_PERM = 0644;
-}
diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/UnrecognizedExtraField.java b/proposal/myrmidon/src/java/org/apache/aut/zip/UnrecognizedExtraField.java
deleted file mode 100644
index 0de625781..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/UnrecognizedExtraField.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-/**
- * Simple placeholder for all those extra fields we don't want to deal with. <p>
- *
- * Assumes local file data and central directory entries are identical - unless
- * told the opposite.</p>
- *
- * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public class UnrecognizedExtraField
-    implements ZipExtraField
-{
-    /**
-     * Extra field data in central directory - without Header-ID or length
-     * specifier.
-     *
-     * @since 1.1
-     */
-    private byte[] centralData;
-
-    /**
-     * The Header-ID.
-     *
-     * @since 1.1
-     */
-    private ZipShort headerId;
-
-    /**
-     * Extra field data in local file data - without Header-ID or length
-     * specifier.
-     *
-     * @since 1.1
-     */
-    private byte[] localData;
-
-    public void setCentralDirectoryData( byte[] data )
-    {
-        centralData = data;
-    }
-
-    public void setHeaderId( ZipShort headerId )
-    {
-        this.headerId = headerId;
-    }
-
-    public void setLocalFileDataData( byte[] data )
-    {
-        localData = data;
-    }
-
-    public byte[] getCentralDirectoryData()
-    {
-        if( centralData != null )
-        {
-            return centralData;
-        }
-        return getLocalFileDataData();
-    }
-
-    public ZipShort getCentralDirectoryLength()
-    {
-        if( centralData != null )
-        {
-            return new ZipShort( centralData.length );
-        }
-        return getLocalFileDataLength();
-    }
-
-    public ZipShort getHeaderId()
-    {
-        return headerId;
-    }
-
-    public byte[] getLocalFileDataData()
-    {
-        return localData;
-    }
-
-    public ZipShort getLocalFileDataLength()
-    {
-        return new ZipShort( localData.length );
-    }
-
-    public void parseFromLocalFileData( byte[] data, int offset, int length )
-    {
-        byte[] tmp = new byte[ length ];
-        System.arraycopy( data, offset, tmp, 0, length );
-        setLocalFileDataData( tmp );
-    }
-}
diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipEntry.java b/proposal/myrmidon/src/java/org/apache/aut/zip/ZipEntry.java
deleted file mode 100644
index 20fc6c585..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipEntry.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.zip.ZipException;
-
-/**
- * Extension that adds better handling of extra fields and provides access to
- * the internal and external file attributes.
- *
- * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public class ZipEntry
-    extends java.util.zip.ZipEntry
-{
-    /**
-     * Helper for JDK 1.1
-     *
-     * @since 1.2
-     */
-    private static Method setCompressedSizeMethod = null;
-    /**
-     * Helper for JDK 1.1
-     *
-     * @since 1.2
-     */
-    private static Object lockReflection = new Object();
-    /**
-     * Helper for JDK 1.1
-     *
-     * @since 1.2
-     */
-    private static boolean triedToGetMethod = false;
-
-    private int internalAttributes = 0;
-    private long externalAttributes = 0;
-    private ArrayList extraFields = new ArrayList();
-
-    /**
-     * Helper for JDK 1.1 <-> 1.2 incompatibility.
-     *
-     * @since 1.2
-     */
-    private Long compressedSize = null;
-
-    /**
-     * Creates a new zip entry with the specified name.
-     *
-     * @param name Description of Parameter
-     * @since 1.1
-     */
-    public ZipEntry( String name )
-    {
-        super( name );
-    }
-
-    /**
-     * Creates a new zip entry with fields taken from the specified zip entry.
-     *
-     * @param entry Description of Parameter
-     * @exception ZipException Description of Exception
-     * @since 1.1
-     */
-    public ZipEntry( java.util.zip.ZipEntry entry )
-        throws ZipException
-    {
-        /*
-         * REVISIT: call super(entry) instead of this stuff in Ant2,
-         * "copy constructor" has not been available in JDK 1.1
-         */
-        super( entry.getName() );
-
-        setComment( entry.getComment() );
-        setMethod( entry.getMethod() );
-        setTime( entry.getTime() );
-
-        long size = entry.getSize();
-        if( size > 0 )
-        {
-            setSize( size );
-        }
-        long cSize = entry.getCompressedSize();
-        if( cSize > 0 )
-        {
-            setComprSize( cSize );
-        }
-        long crc = entry.getCrc();
-        if( crc > 0 )
-        {
-            setCrc( crc );
-        }
-
-        byte[] extra = entry.getExtra();
-        if( extra != null )
-        {
-            setExtraFields( ExtraFieldUtils.parse( extra ) );
-        }
-        else
-        {
-            // initializes extra data to an empty byte array
-            setExtra();
-        }
-    }
-
-    /**
-     * Creates a new zip entry with fields taken from the specified zip entry.
-     *
-     * @param entry Description of Parameter
-     * @exception ZipException Description of Exception
-     * @since 1.1
-     */
-    public ZipEntry( ZipEntry entry )
-        throws ZipException
-    {
-        this( (java.util.zip.ZipEntry)entry );
-        setInternalAttributes( entry.getInternalAttributes() );
-        setExternalAttributes( entry.getExternalAttributes() );
-        setExtraFields( entry.getExtraFields() );
-    }
-
-    /**
-     * Try to get a handle to the setCompressedSize method.
-     *
-     * @since 1.2
-     */
-    private static void checkSCS()
-    {
-        if( !triedToGetMethod )
-        {
-            synchronized( lockReflection )
-            {
-                triedToGetMethod = true;
-                try
-                {
-                    setCompressedSizeMethod =
-                        java.util.zip.ZipEntry.class.getMethod( "setCompressedSize",
-                                                                new Class[]{Long.TYPE} );
-                }
-                catch( NoSuchMethodException nse )
-                {
-                }
-            }
-        }
-    }
-
-    /**
-     * Are we running JDK 1.2 or higher?
-     *
-     * @return Description of the Returned Value
-     * @since 1.2
-     */
-    private static boolean haveSetCompressedSize()
-    {
-        checkSCS();
-        return setCompressedSizeMethod != null;
-    }
-
-    /**
-     * Invoke setCompressedSize via reflection.
-     *
-     * @param ze Description of Parameter
-     * @param size Description of Parameter
-     * @since 1.2
-     */
-    private static void performSetCompressedSize( ZipEntry ze, long size )
-    {
-        Long[] s = {new Long( size )};
-        try
-        {
-            setCompressedSizeMethod.invoke( ze, s );
-        }
-        catch( InvocationTargetException ite )
-        {
-            Throwable nested = ite.getTargetException();
-            throw new RuntimeException( "Exception setting the compressed size "
-                                        + "of " + ze + ": "
-                                        + nested.getMessage() );
-        }
-        catch( Throwable other )
-        {
-            throw new RuntimeException( "Exception setting the compressed size "
-                                        + "of " + ze + ": "
-                                        + other.getMessage() );
-        }
-    }
-
-    /**
-     * Make this class work in JDK 1.1 like a 1.2 class. <p>
-     *
-     * This either stores the size for later usage or invokes setCompressedSize
-     * via reflection.</p>
-     *
-     * @param size The new ComprSize value
-     * @since 1.2
-     */
-    public void setComprSize( long size )
-    {
-        if( haveSetCompressedSize() )
-        {
-            performSetCompressedSize( this, size );
-        }
-        else
-        {
-            compressedSize = new Long( size );
-        }
-    }
-
-    /**
-     * Sets the external file attributes.
-     *
-     * @param value The new ExternalAttributes value
-     * @since 1.1
-     */
-    public void setExternalAttributes( long value )
-    {
-        externalAttributes = value;
-    }
-
-    /**
-     * Throws an Exception if extra data cannot be parsed into extra fields.
-     *
-     * @param extra The new Extra value
-     * @exception RuntimeException Description of Exception
-     * @since 1.1
-     */
-    public void setExtra( byte[] extra )
-        throws RuntimeException
-    {
-        try
-        {
-            setExtraFields( ExtraFieldUtils.parse( extra ) );
-        }
-        catch( Exception e )
-        {
-            throw new RuntimeException( e.getMessage() );
-        }
-    }
-
-    /**
-     * Replaces all currently attached extra fields with the new array.
-     *
-     * @param fields The new ExtraFields value
-     * @since 1.1
-     */
-    public void setExtraFields( ZipExtraField[] fields )
-    {
-        extraFields.clear();
-        for( int i = 0; i < fields.length; i++ )
-        {
-            extraFields.add( fields[ i ] );
-        }
-        setExtra();
-    }
-
-    /**
-     * Sets the internal file attributes.
-     *
-     * @param value The new InternalAttributes value
-     * @since 1.1
-     */
-    public void setInternalAttributes( int value )
-    {
-        internalAttributes = value;
-    }
-
-    /**
-     * Retrieves the extra data for the central directory.
-     *
-     * @return The CentralDirectoryExtra value
-     * @since 1.1
-     */
-    public byte[] getCentralDirectoryExtra()
-    {
-        return ExtraFieldUtils.mergeCentralDirectoryData( getExtraFields() );
-    }
-
-    /**
-     * Override to make this class work in JDK 1.1 like a 1.2 class.
-     *
-     * @return The CompressedSize value
-     * @since 1.2
-     */
-    public long getCompressedSize()
-    {
-        if( compressedSize != null )
-        {
-            // has been set explicitly and we are running in a 1.1 VM
-            return compressedSize.longValue();
-        }
-        return super.getCompressedSize();
-    }
-
-    /**
-     * Retrieves the external file attributes.
-     *
-     * @return The ExternalAttributes value
-     * @since 1.1
-     */
-    public long getExternalAttributes()
-    {
-        return externalAttributes;
-    }
-
-    /**
-     * Retrieves extra fields.
-     *
-     * @return The ExtraFields value
-     * @since 1.1
-     */
-    public ZipExtraField[] getExtraFields()
-    {
-        final ZipExtraField[] result = new ZipExtraField[ extraFields.size() ];
-        return (ZipExtraField[])extraFields.toArray( result );
-    }
-
-    /**
-     * Retrieves the internal file attributes.
-     *
-     * @return The InternalAttributes value
-     * @since 1.1
-     */
-    public int getInternalAttributes()
-    {
-        return internalAttributes;
-    }
-
-    /**
-     * Retrieves the extra data for the local file data.
-     *
-     * @return The LocalFileDataExtra value
-     * @since 1.1
-     */
-    public byte[] getLocalFileDataExtra()
-    {
-        byte[] extra = getExtra();
-        return extra != null ? extra : new byte[ 0 ];
-    }
-
-    /**
-     * Adds an extra fields - replacing an already present extra field of the
-     * same type.
-     *
-     * @param ze The feature to be added to the ExtraField attribute
-     * @since 1.1
-     */
-    public void addExtraField( ZipExtraField ze )
-    {
-        ZipShort type = ze.getHeaderId();
-        boolean done = false;
-        for( int i = 0; !done && i < extraFields.size(); i++ )
-        {
-            if( ( (ZipExtraField)extraFields.get( i ) ).getHeaderId().equals( type ) )
-            {
-                extraFields.set( i, ze );
-                done = true;
-            }
-        }
-        if( !done )
-        {
-            extraFields.add( ze );
-        }
-        setExtra();
-    }
-
-    /**
-     * Overwrite clone
-     *
-     * @return Description of the Returned Value
-     * @since 1.1
-     */
-    public Object clone()
-    {
-        ZipEntry e = null;
-        try
-        {
-            e = new ZipEntry( (java.util.zip.ZipEntry)super.clone() );
-        }
-        catch( Exception ex )
-        {
-            // impossible as extra data is in correct format
-            ex.printStackTrace();
-        }
-        e.setInternalAttributes( getInternalAttributes() );
-        e.setExternalAttributes( getExternalAttributes() );
-        e.setExtraFields( getExtraFields() );
-        return e;
-    }
-
-    /**
-     * Remove an extra fields.
-     *
-     * @param type Description of Parameter
-     * @since 1.1
-     */
-    public void removeExtraField( ZipShort type )
-    {
-        boolean done = false;
-        for( int i = 0; !done && i < extraFields.size(); i++ )
-        {
-            if( ( (ZipExtraField)extraFields.get( i ) ).getHeaderId().equals( type ) )
-            {
-                extraFields.remove( i );
-                done = true;
-            }
-        }
-        if( !done )
-        {
-            throw new java.util.NoSuchElementException();
-        }
-        setExtra();
-    }
-
-    /**
-     * Unfortunately {@link java.util.zip.ZipOutputStream
-     * java.util.zip.ZipOutputStream} seems to access the extra data directly,
-     * so overriding getExtra doesn't help - we need to modify super's data
-     * directly.
-     *
-     * @since 1.1
-     */
-    protected void setExtra()
-    {
-        super.setExtra( ExtraFieldUtils.mergeLocalFileDataData( getExtraFields() ) );
-    }
-
-}
diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipExtraField.java b/proposal/myrmidon/src/java/org/apache/aut/zip/ZipExtraField.java
deleted file mode 100644
index 63a7f4387..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipExtraField.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-import java.util.zip.ZipException;
-
-/**
- * General format of extra field data. <p>
- *
- * Extra fields usually appear twice per file, once in the local file data and
- * once in the central directory. Usually they are the same, but they don't have
- * to be. {@link java.util.zip.ZipOutputStream java.util.zip.ZipOutputStream}
- * will only use the local file data in both places.</p>
- *
- * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public interface ZipExtraField
-{
-
-    /**
-     * The Header-ID.
-     *
-     * @return The HeaderId value
-     * @since 1.1
-     */
-    ZipShort getHeaderId();
-
-    /**
-     * Length of the extra field in the local file data - without Header-ID or
-     * length specifier.
-     *
-     * @return The LocalFileDataLength value
-     * @since 1.1
-     */
-    ZipShort getLocalFileDataLength();
-
-    /**
-     * Length of the extra field in the central directory - without Header-ID or
-     * length specifier.
-     *
-     * @return The CentralDirectoryLength value
-     * @since 1.1
-     */
-    ZipShort getCentralDirectoryLength();
-
-    /**
-     * The actual data to put into local file data - without Header-ID or length
-     * specifier.
-     *
-     * @return The LocalFileDataData value
-     * @since 1.1
-     */
-    byte[] getLocalFileDataData();
-
-    /**
-     * The actual data to put central directory - without Header-ID or length
-     * specifier.
-     *
-     * @return The CentralDirectoryData value
-     * @since 1.1
-     */
-    byte[] getCentralDirectoryData();
-
-    /**
-     * Populate data from this array as if it was in local file data.
-     *
-     * @param data Description of Parameter
-     * @param offset Description of Parameter
-     * @param length Description of Parameter
-     * @exception ZipException Description of Exception
-     * @since 1.1
-     */
-    void parseFromLocalFileData( byte[] data, int offset, int length )
-        throws ZipException;
-}
diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipLong.java b/proposal/myrmidon/src/java/org/apache/aut/zip/ZipLong.java
deleted file mode 100644
index 73296db23..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipLong.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-/**
- * Utility class that represents a four byte integer with conversion rules for
- * the big endian byte order of ZIP files.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public class ZipLong implements Cloneable
-{
-
-    private long value;
-
-    /**
-     * Create instance from a number.
-     *
-     * @param value Description of Parameter
-     * @since 1.1
-     */
-    public ZipLong( long value )
-    {
-        this.value = value;
-    }
-
-    /**
-     * Create instance from bytes.
-     *
-     * @param bytes Description of Parameter
-     * @since 1.1
-     */
-    public ZipLong( byte[] bytes )
-    {
-        this( bytes, 0 );
-    }
-
-    /**
-     * Create instance from the four bytes starting at offset.
-     *
-     * @param bytes Description of Parameter
-     * @param offset Description of Parameter
-     * @since 1.1
-     */
-    public ZipLong( byte[] bytes, int offset )
-    {
-        value = ( bytes[ offset + 3 ] << 24 ) & 0xFF000000l;
-        value += ( bytes[ offset + 2 ] << 16 ) & 0xFF0000;
-        value += ( bytes[ offset + 1 ] << 8 ) & 0xFF00;
-        value += ( bytes[ offset ] & 0xFF );
-    }
-
-    /**
-     * Get value as two bytes in big endian byte order.
-     *
-     * @return The Bytes value
-     * @since 1.1
-     */
-    public byte[] getBytes()
-    {
-        byte[] result = new byte[ 4 ];
-        result[ 0 ] = (byte)( ( value & 0xFF ) );
-        result[ 1 ] = (byte)( ( value & 0xFF00 ) >> 8 );
-        result[ 2 ] = (byte)( ( value & 0xFF0000 ) >> 16 );
-        result[ 3 ] = (byte)( ( value & 0xFF000000l ) >> 24 );
-        return result;
-    }
-
-    /**
-     * Get value as Java int.
-     *
-     * @return The Value value
-     * @since 1.1
-     */
-    public long getValue()
-    {
-        return value;
-    }
-
-    /**
-     * Override to make two instances with same value equal.
-     *
-     * @param o Description of Parameter
-     * @return Description of the Returned Value
-     * @since 1.1
-     */
-    public boolean equals( Object o )
-    {
-        if( o == null || !( o instanceof ZipLong ) )
-        {
-            return false;
-        }
-        return value == ( (ZipLong)o ).getValue();
-    }
-
-    /**
-     * Override to make two instances with same value equal.
-     *
-     * @return Description of the Returned Value
-     * @since 1.1
-     */
-    public int hashCode()
-    {
-        return (int)value;
-    }
-
-}// ZipLong
diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipOutputStream.java b/proposal/myrmidon/src/java/org/apache/aut/zip/ZipOutputStream.java
deleted file mode 100644
index eb9e4e63a..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipOutputStream.java
+++ /dev/null
@@ -1,715 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.zip.CRC32;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.ZipException;
-
-/**
- * Reimplementation of {@link java.util.zip.ZipOutputStream
- * java.util.zip.ZipOutputStream} that does handle the extended functionality of
- * this package, especially internal/external file attributes and extra fields
- * with different layouts for local file data and central directory entries. <p>
- *
- * This implementation will use a Data Descriptor to store size and CRC
- * information for DEFLATED entries, this means, you don't need to calculate
- * them yourself. Unfortunately this is not possible for the STORED method, here
- * setting the CRC and uncompressed size information is required before {@link
- * #putNextEntry putNextEntry} will be called.</p>
- *
- * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public class ZipOutputStream
-    extends DeflaterOutputStream
-{
-    /**
-     * Helper, a 0 as ZipShort.
-     *
-     * @since 1.1
-     */
-    private final static byte[] ZERO = {0, 0};
-
-    /**
-     * Helper, a 0 as ZipLong.
-     *
-     * @since 1.1
-     */
-    private final static byte[] LZERO = {0, 0, 0, 0};
-
-    /**
-     * Compression method for deflated entries.
-     *
-     * @since 1.1
-     */
-    public final static int DEFLATED = ZipEntry.DEFLATED;
-
-    /**
-     * Compression method for deflated entries.
-     *
-     * @since 1.1
-     */
-    public final static int STORED = ZipEntry.STORED;
-
-    /*
-     * Various ZIP constants
-     */
-    /**
-     * local file header signature
-     *
-     * @since 1.1
-     */
-    protected final static ZipLong LFH_SIG = new ZipLong( 0X04034B50L );
-    /**
-     * data descriptor signature
-     *
-     * @since 1.1
-     */
-    protected final static ZipLong DD_SIG = new ZipLong( 0X08074B50L );
-    /**
-     * central file header signature
-     *
-     * @since 1.1
-     */
-    protected final static ZipLong CFH_SIG = new ZipLong( 0X02014B50L );
-    /**
-     * end of central dir signature
-     *
-     * @since 1.1
-     */
-    protected final static ZipLong EOCD_SIG = new ZipLong( 0X06054B50L );
-
-    /**
-     * Smallest date/time ZIP can handle.
-     *
-     * @since 1.1
-     */
-    private final static ZipLong DOS_TIME_MIN = new ZipLong( 0x00002100L );
-
-    /**
-     * The file comment.
-     *
-     * @since 1.1
-     */
-    private String comment = "";
-
-    /**
-     * Compression level for next entry.
-     *
-     * @since 1.1
-     */
-    private int level = Deflater.DEFAULT_COMPRESSION;
-
-    /**
-     * Default compression method for next entry.
-     *
-     * @since 1.1
-     */
-    private int method = DEFLATED;
-
-    /**
-     * List of ZipEntries written so far.
-     *
-     * @since 1.1
-     */
-    private ArrayList entries = new ArrayList();
-
-    /**
-     * CRC instance to avoid parsing DEFLATED data twice.
-     *
-     * @since 1.1
-     */
-    private CRC32 crc = new CRC32();
-
-    /**
-     * Count the bytes written to out.
-     *
-     * @since 1.1
-     */
-    private long written = 0;
-
-    /**
-     * Data for current entry started here.
-     *
-     * @since 1.1
-     */
-    private long dataStart = 0;
-
-    /**
-     * Start of central directory.
-     *
-     * @since 1.1
-     */
-    private ZipLong cdOffset = new ZipLong( 0 );
-
-    /**
-     * Length of central directory.
-     *
-     * @since 1.1
-     */
-    private ZipLong cdLength = new ZipLong( 0 );
-
-    /**
-     * Holds the offsets of the LFH starts for each entry
-     *
-     * @since 1.1
-     */
-    private Hashtable offsets = new Hashtable();
-
-    /**
-     * The encoding to use for filenames and the file comment. <p>
-     *
-     * For a list of possible values see <a
-     * href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">
-     * http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html
-     * </a>. Defaults to the platform's default character encoding.</p>
-     *
-     * @since 1.3
-     */
-    private String encoding = null;
-
-    /**
-     * Current entry.
-     *
-     * @since 1.1
-     */
-    private ZipEntry entry;
-
-    /**
-     * Creates a new ZIP OutputStream filtering the underlying stream.
-     *
-     * @param out Description of Parameter
-     * @since 1.1
-     */
-    public ZipOutputStream( OutputStream out )
-    {
-        super( out, new Deflater( Deflater.DEFAULT_COMPRESSION, true ) );
-    }
-
-    /**
-     * Convert a Date object to a DOS date/time field. <p>
-     *
-     * Stolen from InfoZip's <code>fileio.c</code></p>
-     *
-     * @param time Description of Parameter
-     * @return Description of the Returned Value
-     * @since 1.1
-     */
-    protected static ZipLong toDosTime( Date time )
-    {
-        int year = time.getYear() + 1900;
-        int month = time.getMonth() + 1;
-        if( year < 1980 )
-        {
-            return DOS_TIME_MIN;
-        }
-        long value = ( ( year - 1980 ) << 25 )
-            | ( month << 21 )
-            | ( time.getDate() << 16 )
-            | ( time.getHours() << 11 )
-            | ( time.getMinutes() << 5 )
-            | ( time.getSeconds() >> 1 );
-
-        byte[] result = new byte[ 4 ];
-        result[ 0 ] = (byte)( ( value & 0xFF ) );
-        result[ 1 ] = (byte)( ( value & 0xFF00 ) >> 8 );
-        result[ 2 ] = (byte)( ( value & 0xFF0000 ) >> 16 );
-        result[ 3 ] = (byte)( ( value & 0xFF000000l ) >> 24 );
-        return new ZipLong( result );
-    }
-
-    /**
-     * Set the file comment.
-     *
-     * @param comment The new Comment value
-     * @since 1.1
-     */
-    public void setComment( String comment )
-    {
-        this.comment = comment;
-    }
-
-    /**
-     * The encoding to use for filenames and the file comment. <p>
-     *
-     * For a list of possible values see <a
-     * href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">
-     * http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html
-     * </a>. Defaults to the platform's default character encoding.</p>
-     *
-     * @param encoding The new Encoding value
-     * @since 1.3
-     */
-    public void setEncoding( String encoding )
-    {
-        this.encoding = encoding;
-    }
-
-    /**
-     * Sets the compression level for subsequent entries. <p>
-     *
-     * Default is Deflater.DEFAULT_COMPRESSION.</p>
-     *
-     * @param level The new Level value
-     * @since 1.1
-     */
-    public void setLevel( int level )
-    {
-        this.level = level;
-    }
-
-    /**
-     * Sets the default compression method for subsequent entries. <p>
-     *
-     * Default is DEFLATED.</p>
-     *
-     * @param method The new Method value
-     * @since 1.1
-     */
-    public void setMethod( int method )
-    {
-        this.method = method;
-    }
-
-    /**
-     * The encoding to use for filenames and the file comment.
-     *
-     * @return null if using the platform's default character encoding.
-     * @since 1.3
-     */
-    public String getEncoding()
-    {
-        return encoding;
-    }
-
-    /**
-     * Writes all necessary data for this entry.
-     *
-     * @exception IOException Description of Exception
-     * @since 1.1
-     */
-    public void closeEntry()
-        throws IOException
-    {
-        if( entry == null )
-        {
-            return;
-        }
-
-        long realCrc = crc.getValue();
-        crc.reset();
-
-        if( entry.getMethod() == DEFLATED )
-        {
-            def.finish();
-            while( !def.finished() )
-            {
-                deflate();
-            }
-
-            entry.setSize( def.getTotalIn() );
-            entry.setComprSize( def.getTotalOut() );
-            entry.setCrc( realCrc );
-
-            def.reset();
-
-            written += entry.getCompressedSize();
-        }
-        else
-        {
-            if( entry.getCrc() != realCrc )
-            {
-                throw new ZipException( "bad CRC checksum for entry "
-                                        + entry.getName() + ": "
-                                        + Long.toHexString( entry.getCrc() )
-                                        + " instead of "
-                                        + Long.toHexString( realCrc ) );
-            }
-
-            if( entry.getSize() != written - dataStart )
-            {
-                throw new ZipException( "bad size for entry "
-                                        + entry.getName() + ": "
-                                        + entry.getSize()
-                                        + " instead of "
-                                        + ( written - dataStart ) );
-            }
-
-        }
-
-        writeDataDescriptor( entry );
-        entry = null;
-    }
-
-    /*
-     * Found out by experiment, that DeflaterOutputStream.close()
-     * will call finish() - so we don't need to override close
-     * ourselves.
-     */
-    /**
-     * Finishs writing the contents and closes this as well as the underlying
-     * stream.
-     *
-     * @exception IOException Description of Exception
-     * @since 1.1
-     */
-    public void finish()
-        throws IOException
-    {
-        closeEntry();
-        cdOffset = new ZipLong( written );
-        final int size = entries.size();
-        for( int i = 0; i < size; i++ )
-        {
-            final ZipEntry entry = (ZipEntry)entries.get( i );
-            writeCentralFileHeader( entry );
-        }
-        cdLength = new ZipLong( written - cdOffset.getValue() );
-        writeCentralDirectoryEnd();
-        offsets.clear();
-        entries.clear();
-    }
-
-    /**
-     * Begin writing next entry.
-     *
-     * @param ze Description of Parameter
-     * @exception IOException Description of Exception
-     * @since 1.1
-     */
-    public void putNextEntry( ZipEntry ze )
-        throws IOException
-    {
-        closeEntry();
-
-        entry = ze;
-        entries.add( entry );
-
-        if( entry.getMethod() == -1 )
-        {// not specified
-            entry.setMethod( method );
-        }
-
-        if( entry.getTime() == -1 )
-        {// not specified
-            entry.setTime( System.currentTimeMillis() );
-        }
-
-        if( entry.getMethod() == STORED )
-        {
-            if( entry.getSize() == -1 )
-            {
-                throw new ZipException( "uncompressed size is required for STORED method" );
-            }
-            if( entry.getCrc() == -1 )
-            {
-                throw new ZipException( "crc checksum is required for STORED method" );
-            }
-            entry.setComprSize( entry.getSize() );
-        }
-        else
-        {
-            def.setLevel( level );
-        }
-        writeLocalFileHeader( entry );
-    }
-
-    /**
-     * Writes bytes to ZIP entry. <p>
-     *
-     * Override is necessary to support STORED entries, as well as calculationg
-     * CRC automatically for DEFLATED entries.</p>
-     *
-     * @param b Description of Parameter
-     * @param offset Description of Parameter
-     * @param length Description of Parameter
-     * @exception IOException Description of Exception
-     */
-    public void write( byte[] b, int offset, int length )
-        throws IOException
-    {
-        if( entry.getMethod() == DEFLATED )
-        {
-            super.write( b, offset, length );
-        }
-        else
-        {
-            out.write( b, offset, length );
-            written += length;
-        }
-        crc.update( b, offset, length );
-    }
-
-    /**
-     * Retrieve the bytes for the given String in the encoding set for this
-     * Stream.
-     *
-     * @param name Description of Parameter
-     * @return The Bytes value
-     * @exception ZipException Description of Exception
-     * @since 1.3
-     */
-    protected byte[] getBytes( String name )
-        throws ZipException
-    {
-        if( encoding == null )
-        {
-            return name.getBytes();
-        }
-        else
-        {
-            try
-            {
-                return name.getBytes( encoding );
-            }
-            catch( UnsupportedEncodingException uee )
-            {
-                throw new ZipException( uee.getMessage() );
-            }
-        }
-    }
-
-    /**
-     * Writes the &quot;End of central dir record&quot;
-     *
-     * @exception IOException Description of Exception
-     * @since 1.1
-     */
-    protected void writeCentralDirectoryEnd()
-        throws IOException
-    {
-        out.write( EOCD_SIG.getBytes() );
-
-        // disk numbers
-        out.write( ZERO );
-        out.write( ZERO );
-
-        // number of entries
-        byte[] num = ( new ZipShort( entries.size() ) ).getBytes();
-        out.write( num );
-        out.write( num );
-
-        // length and location of CD
-        out.write( cdLength.getBytes() );
-        out.write( cdOffset.getBytes() );
-
-        // ZIP file comment
-        byte[] data = getBytes( comment );
-        out.write( ( new ZipShort( data.length ) ).getBytes() );
-        out.write( data );
-    }
-
-    /**
-     * Writes the central file header entry
-     *
-     * @param ze Description of Parameter
-     * @exception IOException Description of Exception
-     * @since 1.1
-     */
-    protected void writeCentralFileHeader( ZipEntry ze )
-        throws IOException
-    {
-        out.write( CFH_SIG.getBytes() );
-        written += 4;
-
-        // version made by
-        out.write( ( new ZipShort( 20 ) ).getBytes() );
-        written += 2;
-
-        // version needed to extract
-        // general purpose bit flag
-        if( ze.getMethod() == DEFLATED )
-        {
-            // requires version 2 as we are going to store length info
-            // in the data descriptor
-            out.write( ( new ZipShort( 20 ) ).getBytes() );
-
-            // bit3 set to signal, we use a data descriptor
-            out.write( ( new ZipShort( 8 ) ).getBytes() );
-        }
-        else
-        {
-            out.write( ( new ZipShort( 10 ) ).getBytes() );
-            out.write( ZERO );
-        }
-        written += 4;
-
-        // compression method
-        out.write( ( new ZipShort( ze.getMethod() ) ).getBytes() );
-        written += 2;
-
-        // last mod. time and date
-        out.write( toDosTime( new Date( ze.getTime() ) ).getBytes() );
-        written += 4;
-
-        // CRC
-        // compressed length
-        // uncompressed length
-        out.write( ( new ZipLong( ze.getCrc() ) ).getBytes() );
-        out.write( ( new ZipLong( ze.getCompressedSize() ) ).getBytes() );
-        out.write( ( new ZipLong( ze.getSize() ) ).getBytes() );
-        written += 12;
-
-        // file name length
-        byte[] name = getBytes( ze.getName() );
-        out.write( ( new ZipShort( name.length ) ).getBytes() );
-        written += 2;
-
-        // extra field length
-        byte[] extra = ze.getCentralDirectoryExtra();
-        out.write( ( new ZipShort( extra.length ) ).getBytes() );
-        written += 2;
-
-        // file comment length
-        String comm = ze.getComment();
-        if( comm == null )
-        {
-            comm = "";
-        }
-        byte[] comment = getBytes( comm );
-        out.write( ( new ZipShort( comment.length ) ).getBytes() );
-        written += 2;
-
-        // disk number start
-        out.write( ZERO );
-        written += 2;
-
-        // internal file attributes
-        out.write( ( new ZipShort( ze.getInternalAttributes() ) ).getBytes() );
-        written += 2;
-
-        // external file attributes
-        out.write( ( new ZipLong( ze.getExternalAttributes() ) ).getBytes() );
-        written += 4;
-
-        // relative offset of LFH
-        out.write( ( (ZipLong)offsets.get( ze ) ).getBytes() );
-        written += 4;
-
-        // file name
-        out.write( name );
-        written += name.length;
-
-        // extra field
-        out.write( extra );
-        written += extra.length;
-
-        // file comment
-        out.write( comment );
-        written += comment.length;
-    }
-
-    /**
-     * Writes the data descriptor entry
-     *
-     * @param ze Description of Parameter
-     * @exception IOException Description of Exception
-     * @since 1.1
-     */
-    protected void writeDataDescriptor( ZipEntry ze )
-        throws IOException
-    {
-        if( ze.getMethod() != DEFLATED )
-        {
-            return;
-        }
-        out.write( DD_SIG.getBytes() );
-        out.write( ( new ZipLong( entry.getCrc() ) ).getBytes() );
-        out.write( ( new ZipLong( entry.getCompressedSize() ) ).getBytes() );
-        out.write( ( new ZipLong( entry.getSize() ) ).getBytes() );
-        written += 16;
-    }
-
-    /**
-     * Writes the local file header entry
-     *
-     * @param ze Description of Parameter
-     * @exception IOException Description of Exception
-     * @since 1.1
-     */
-    protected void writeLocalFileHeader( ZipEntry ze )
-        throws IOException
-    {
-        offsets.put( ze, new ZipLong( written ) );
-
-        out.write( LFH_SIG.getBytes() );
-        written += 4;
-
-        // version needed to extract
-        // general purpose bit flag
-        if( ze.getMethod() == DEFLATED )
-        {
-            // requires version 2 as we are going to store length info
-            // in the data descriptor
-            out.write( ( new ZipShort( 20 ) ).getBytes() );
-
-            // bit3 set to signal, we use a data descriptor
-            out.write( ( new ZipShort( 8 ) ).getBytes() );
-        }
-        else
-        {
-            out.write( ( new ZipShort( 10 ) ).getBytes() );
-            out.write( ZERO );
-        }
-        written += 4;
-
-        // compression method
-        out.write( ( new ZipShort( ze.getMethod() ) ).getBytes() );
-        written += 2;
-
-        // last mod. time and date
-        out.write( toDosTime( new Date( ze.getTime() ) ).getBytes() );
-        written += 4;
-
-        // CRC
-        // compressed length
-        // uncompressed length
-        if( ze.getMethod() == DEFLATED )
-        {
-            out.write( LZERO );
-            out.write( LZERO );
-            out.write( LZERO );
-        }
-        else
-        {
-            out.write( ( new ZipLong( ze.getCrc() ) ).getBytes() );
-            out.write( ( new ZipLong( ze.getSize() ) ).getBytes() );
-            out.write( ( new ZipLong( ze.getSize() ) ).getBytes() );
-        }
-        written += 12;
-
-        // file name length
-        byte[] name = getBytes( ze.getName() );
-        out.write( ( new ZipShort( name.length ) ).getBytes() );
-        written += 2;
-
-        // extra field length
-        byte[] extra = ze.getLocalFileDataExtra();
-        out.write( ( new ZipShort( extra.length ) ).getBytes() );
-        written += 2;
-
-        // file name
-        out.write( name );
-        written += name.length;
-
-        // extra field
-        out.write( extra );
-        written += extra.length;
-
-        dataStart = written;
-    }
-
-}
diff --git a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipShort.java b/proposal/myrmidon/src/java/org/apache/aut/zip/ZipShort.java
deleted file mode 100644
index 383d5be87..000000000
--- a/proposal/myrmidon/src/java/org/apache/aut/zip/ZipShort.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip;
-
-/**
- * Utility class that represents a two byte integer with conversion rules for
- * the big endian byte order of ZIP files.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision$
- */
-public class ZipShort implements Cloneable
-{
-
-    private int value;
-
-    /**
-     * Create instance from a number.
-     *
-     * @param value Description of Parameter
-     * @since 1.1
-     */
-    public ZipShort( int value )
-    {
-        this.value = value;
-    }
-
-    /**
-     * Create instance from bytes.
-     *
-     * @param bytes Description of Parameter
-     * @since 1.1
-     */
-    public ZipShort( byte[] bytes )
-    {
-        this( bytes, 0 );
-    }
-
-    /**
-     * Create instance from the two bytes starting at offset.
-     *
-     * @param bytes Description of Parameter
-     * @param offset Description of Parameter
-     * @since 1.1
-     */
-    public ZipShort( byte[] bytes, int offset )
-    {
-        value = ( bytes[ offset + 1 ] << 8 ) & 0xFF00;
-        value += ( bytes[ offset ] & 0xFF );
-    }
-
-    /**
-     * Get value as two bytes in big endian byte order.
-     *
-     * @return The Bytes value
-     * @since 1.1
-     */
-    public byte[] getBytes()
-    {
-        byte[] result = new byte[ 2 ];
-        result[ 0 ] = (byte)( value & 0xFF );
-        result[ 1 ] = (byte)( ( value & 0xFF00 ) >> 8 );
-        return result;
-    }
-
-    /**
-     * Get value as Java int.
-     *
-     * @return The Value value
-     * @since 1.1
-     */
-    public int getValue()
-    {
-        return value;
-    }
-
-    /**
-     * Override to make two instances with same value equal.
-     *
-     * @param o Description of Parameter
-     * @return Description of the Returned Value
-     * @since 1.1
-     */
-    public boolean equals( Object o )
-    {
-        if( o == null || !( o instanceof ZipShort ) )
-        {
-            return false;
-        }
-        return value == ( (ZipShort)o ).getValue();
-    }
-
-    /**
-     * Override to make two instances with same value equal.
-     *
-     * @return Description of the Returned Value
-     * @since 1.1
-     */
-    public int hashCode()
-    {
-        return value;
-    }
-
-}// ZipShort
diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/test/AsiExtraFieldTestCase.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/AsiExtraFieldTestCase.java
deleted file mode 100644
index 2337f3feb..000000000
--- a/proposal/myrmidon/src/test/org/apache/aut/zip/test/AsiExtraFieldTestCase.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import java.util.zip.ZipException;
-import junit.framework.TestCase;
-import org.apache.aut.zip.UnixStat;
-import org.apache.aut.zip.AsiExtraField;
-
-/**
- * JUnit testcases AsiExtraField.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class AsiExtraFieldTestCase
-    extends TestCase
-    implements UnixStat
-{
-    public AsiExtraFieldTestCase( final String name )
-    {
-        super( name );
-    }
-
-    /**
-     * Test file mode magic.
-     */
-    public void testModes()
-    {
-        final AsiExtraField field = new AsiExtraField();
-        field.setMode( 0123 );
-        assertEquals( "plain file", 0100123, field.getMode() );
-        field.setDirectory( true );
-        assertEquals( "directory", 040123, field.getMode() );
-        field.setLinkedFile( "test" );
-        assertEquals( "symbolic link", 0120123, field.getMode() );
-    }
-
-    private AsiExtraField createField()
-    {
-        final AsiExtraField field = new AsiExtraField();
-        field.setMode( 0123 );
-        field.setUserId( 5 );
-        field.setGroupId( 6 );
-        return field;
-    }
-
-    public void testContent1()
-    {
-        final AsiExtraField field = createField();
-        final byte[] data = field.getLocalFileDataData();
-
-        // CRC manually calculated, sorry
-        final byte[] expect = {(byte)0xC6, 0x02, 0x78, (byte)0xB6, // CRC
-                               0123, (byte)0x80, // mode
-                               0, 0, 0, 0, // link length
-                               5, 0, 6, 0};                        // uid, gid
-        assertEquals( "no link", expect.length, data.length );
-        for( int i = 0; i < expect.length; i++ )
-        {
-            assertEquals( "no link, byte " + i, expect[ i ], data[ i ] );
-        }
-
-        field.setLinkedFile( "test" );
-    }
-
-    public void testContent2()
-    {
-        final AsiExtraField field = createField();
-        field.setLinkedFile( "test" );
-
-        final byte[] data = field.getLocalFileDataData();
-        final byte[] expect = new byte[]{0x75, (byte)0x8E, 0x41, (byte)0xFD, // CRC
-                                         0123, (byte)0xA0, // mode
-                                         4, 0, 0, 0, // link length
-                                         5, 0, 6, 0, // uid, gid
-                                         (byte)'t', (byte)'e', (byte)'s', (byte)'t'};
-        assertEquals( "no link", expect.length, data.length );
-        for( int i = 0; i < expect.length; i++ )
-        {
-            assertEquals( "no link, byte " + i, expect[ i ], data[ i ] );
-        }
-
-    }
-
-    public void testReparse1()
-        throws ZipException
-    {
-        // CRC manually calculated, sorry
-        final byte[] data = {(byte)0xC6, 0x02, 0x78, (byte)0xB6, // CRC
-                             0123, (byte)0x80, // mode
-                             0, 0, 0, 0, // link length
-                             5, 0, 6, 0};                        // uid, gid
-        final AsiExtraField field = new AsiExtraField();
-        field.parseFromLocalFileData( data, 0, data.length );
-
-        assertEquals( "length plain file", data.length,
-                      field.getLocalFileDataLength().getValue() );
-        assertTrue( "plain file, no link", !field.isLink() );
-        assertTrue( "plain file, no dir", !field.isDirectory() );
-        assertEquals( "mode plain file", FILE_FLAG | 0123, field.getMode() );
-        assertEquals( "uid plain file", 5, field.getUserId() );
-        assertEquals( "gid plain file", 6, field.getGroupId() );
-    }
-
-    public void testReparse2()
-        throws ZipException
-    {
-        final byte[] data = new byte[]{0x75, (byte)0x8E, 0x41, (byte)0xFD, // CRC
-                                       0123, (byte)0xA0, // mode
-                                       4, 0, 0, 0, // link length
-                                       5, 0, 6, 0, // uid, gid
-                                       (byte)'t', (byte)'e', (byte)'s', (byte)'t'};
-        final AsiExtraField field = new AsiExtraField();
-        field.parseFromLocalFileData( data, 0, data.length );
-        assertEquals( "length link", data.length,
-                      field.getLocalFileDataLength().getValue() );
-        assertTrue( "link, is link", field.isLink() );
-        assertTrue( "link, no dir", !field.isDirectory() );
-        assertEquals( "mode link", LINK_FLAG | 0123, field.getMode() );
-        assertEquals( "uid link", 5, field.getUserId() );
-        assertEquals( "gid link", 6, field.getGroupId() );
-        assertEquals( "test", field.getLinkedFile() );
-    }
-
-    public void testReparse3()
-        throws ZipException
-    {
-        final byte[] data = new byte[]{(byte)0x8E, 0x01, (byte)0xBF, (byte)0x0E, // CRC
-                                       0123, (byte)0x40, // mode
-                                       0, 0, 0, 0, // link
-                                       5, 0, 6, 0};                          // uid, gid
-        final AsiExtraField field = new AsiExtraField();
-        field.parseFromLocalFileData( data, 0, data.length );
-        assertEquals( "length dir", data.length,
-                      field.getLocalFileDataLength().getValue() );
-        assertTrue( "dir, no link", !field.isLink() );
-        assertTrue( "dir, is dir", field.isDirectory() );
-        assertEquals( "mode dir", DIR_FLAG | 0123, field.getMode() );
-        assertEquals( "uid dir", 5, field.getUserId() );
-        assertEquals( "gid dir", 6, field.getGroupId() );
-    }
-
-    public void testReparse4()
-        throws Exception
-    {
-        final byte[] data = new byte[]{0, 0, 0, 0, // bad CRC
-                                       0123, (byte)0x40, // mode
-                                       0, 0, 0, 0, // link
-                                       5, 0, 6, 0};                          // uid, gid
-        final AsiExtraField field = new AsiExtraField();
-        try
-        {
-            field.parseFromLocalFileData( data, 0, data.length );
-            fail( "should raise bad CRC exception" );
-        }
-        catch( Exception e )
-        {
-            assertEquals( "bad CRC checksum 0 instead of ebf018e",
-                          e.getMessage() );
-        }
-    }
-}
diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java
deleted file mode 100644
index 7f4a73e6c..000000000
--- a/proposal/myrmidon/src/test/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import junit.framework.TestCase;
-import org.apache.aut.zip.UnixStat;
-import org.apache.aut.zip.AsiExtraField;
-import org.apache.aut.zip.UnrecognizedExtraField;
-import org.apache.aut.zip.ZipShort;
-import org.apache.aut.zip.ZipExtraField;
-import org.apache.aut.zip.ExtraFieldUtils;
-
-/**
- * JUnit testcases ExtraFieldUtils.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class ExtraFieldUtilsTestCase
-    extends TestCase
-    implements UnixStat
-{
-    private AsiExtraField m_field;
-    private UnrecognizedExtraField m_dummy;
-    private byte[] m_data;
-    private byte[] m_local;
-
-    public ExtraFieldUtilsTestCase( final String name )
-    {
-        super( name );
-    }
-
-    public void setUp()
-    {
-        m_field = new AsiExtraField();
-        m_field.setMode( 0755 );
-        m_field.setDirectory( true );
-        m_dummy = new UnrecognizedExtraField();
-        m_dummy.setHeaderId( new ZipShort( 1 ) );
-        m_dummy.setLocalFileDataData( new byte[ 0 ] );
-        m_dummy.setCentralDirectoryData( new byte[]{0} );
-
-        m_local = m_field.getLocalFileDataData();
-        final byte[] dummyLocal = m_dummy.getLocalFileDataData();
-        m_data = new byte[ 4 + m_local.length + 4 + dummyLocal.length ];
-        System.arraycopy( m_field.getHeaderId().getBytes(), 0, m_data, 0, 2 );
-        System.arraycopy( m_field.getLocalFileDataLength().getBytes(), 0, m_data, 2, 2 );
-        System.arraycopy( m_local, 0, m_data, 4, m_local.length );
-        System.arraycopy( m_dummy.getHeaderId().getBytes(), 0, m_data,
-                          4 + m_local.length, 2 );
-        System.arraycopy( m_dummy.getLocalFileDataLength().getBytes(), 0, m_data,
-                          4 + m_local.length + 2, 2 );
-        System.arraycopy( dummyLocal, 0, m_data,
-                          4 + m_local.length + 4, dummyLocal.length );
-
-    }
-
-    /**
-     * test parser.
-     */
-    public void testParse() throws Exception
-    {
-        final ZipExtraField[] extraField = ExtraFieldUtils.parse( m_data );
-        assertEquals( "number of fields", 2, extraField.length );
-        assertTrue( "type field 1", extraField[ 0 ] instanceof AsiExtraField );
-        assertEquals( "mode field 1", 040755,
-                      ( (AsiExtraField)extraField[ 0 ] ).getMode() );
-        assertTrue( "type field 2", extraField[ 1 ] instanceof UnrecognizedExtraField );
-        assertEquals( "data length field 2", 0,
-                      extraField[ 1 ].getLocalFileDataLength().getValue() );
-
-        final byte[] data2 = new byte[ m_data.length - 1 ];
-        System.arraycopy( m_data, 0, data2, 0, data2.length );
-        try
-        {
-            ExtraFieldUtils.parse( data2 );
-            fail( "data should be invalid" );
-        }
-        catch( Exception e )
-        {
-            assertEquals( "message",
-                          "data starting at " + ( 4 + m_local.length ) + " is in unknown format",
-                          e.getMessage() );
-        }
-    }
-
-    /**
-     * Test merge methods
-     */
-    public void testMerge()
-    {
-        final byte[] local =
-            ExtraFieldUtils.mergeLocalFileDataData( new ZipExtraField[]{m_field, m_dummy} );
-        assertEquals( "local length", m_data.length, local.length );
-        for( int i = 0; i < local.length; i++ )
-        {
-            assertEquals( "local byte " + i, m_data[ i ], local[ i ] );
-        }
-
-        final byte[] dummyCentral = m_dummy.getCentralDirectoryData();
-        final byte[] data2 = new byte[ 4 + m_local.length + 4 + dummyCentral.length ];
-        System.arraycopy( m_data, 0, data2, 0, 4 + m_local.length + 2 );
-        System.arraycopy( m_dummy.getCentralDirectoryLength().getBytes(), 0,
-                          data2, 4 + m_local.length + 2, 2 );
-        System.arraycopy( dummyCentral, 0, data2,
-                          4 + m_local.length + 4, dummyCentral.length );
-
-        final byte[] central =
-            ExtraFieldUtils.mergeCentralDirectoryData( new ZipExtraField[]{m_field, m_dummy} );
-        assertEquals( "central length", data2.length, central.length );
-        for( int i = 0; i < central.length; i++ )
-        {
-            assertEquals( "central byte " + i, data2[ i ], central[ i ] );
-        }
-    }
-}
diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipEntryTestCase.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipEntryTestCase.java
deleted file mode 100644
index df87812f4..000000000
--- a/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipEntryTestCase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import java.util.NoSuchElementException;
-import junit.framework.TestCase;
-import org.apache.aut.zip.AsiExtraField;
-import org.apache.aut.zip.UnrecognizedExtraField;
-import org.apache.aut.zip.ZipEntry;
-import org.apache.aut.zip.ZipExtraField;
-import org.apache.aut.zip.ZipShort;
-
-/**
- * JUnit testcases ZipEntry.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class ZipEntryTestCase
-    extends TestCase
-{
-    public ZipEntryTestCase( final String name )
-    {
-        super( name );
-    }
-
-    /**
-     * test handling of extra fields
-     */
-    public void testExtraFields()
-    {
-        final AsiExtraField field = createField();
-        final UnrecognizedExtraField extraField = createExtraField();
-
-        final ZipEntry entry = new ZipEntry( "test/" );
-        entry.setExtraFields( new ZipExtraField[]{field, extraField} );
-        final byte[] data1 = entry.getExtra();
-        ZipExtraField[] result = entry.getExtraFields();
-        assertEquals( "first pass", 2, result.length );
-        assertSame( field, result[ 0 ] );
-        assertSame( extraField, result[ 1 ] );
-
-        UnrecognizedExtraField u2 = new UnrecognizedExtraField();
-        u2.setHeaderId( new ZipShort( 1 ) );
-        u2.setLocalFileDataData( new byte[]{1} );
-
-        entry.addExtraField( u2 );
-        byte[] data2 = entry.getExtra();
-        result = entry.getExtraFields();
-        assertEquals( "second pass", 2, result.length );
-        assertSame( field, result[ 0 ] );
-        assertSame( u2, result[ 1 ] );
-        assertEquals( "length second pass", data1.length + 1, data2.length );
-
-        UnrecognizedExtraField u3 = new UnrecognizedExtraField();
-        u3.setHeaderId( new ZipShort( 2 ) );
-        u3.setLocalFileDataData( new byte[]{1} );
-        entry.addExtraField( u3 );
-        result = entry.getExtraFields();
-        assertEquals( "third pass", 3, result.length );
-
-        entry.removeExtraField( new ZipShort( 1 ) );
-        byte[] data3 = entry.getExtra();
-        result = entry.getExtraFields();
-        assertEquals( "fourth pass", 2, result.length );
-        assertSame( field, result[ 0 ] );
-        assertSame( u3, result[ 1 ] );
-        assertEquals( "length fourth pass", data2.length, data3.length );
-
-        try
-        {
-            entry.removeExtraField( new ZipShort( 1 ) );
-            fail( "should be no such element" );
-        }
-        catch( final NoSuchElementException nse )
-        {
-        }
-    }
-
-    private UnrecognizedExtraField createExtraField()
-    {
-        UnrecognizedExtraField extraField = new UnrecognizedExtraField();
-        extraField.setHeaderId( new ZipShort( 1 ) );
-        extraField.setLocalFileDataData( new byte[ 0 ] );
-        return extraField;
-    }
-
-    private AsiExtraField createField()
-    {
-        final AsiExtraField field = new AsiExtraField();
-        field.setDirectory( true );
-        field.setMode( 0755 );
-        return field;
-    }
-}
diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipLongTestCase.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipLongTestCase.java
deleted file mode 100644
index 501b5f491..000000000
--- a/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipLongTestCase.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import junit.framework.TestCase;
-import org.apache.aut.zip.ZipLong;
-
-/**
- * JUnit 3 testcases for org.apache.tools.zip.ZipLong.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class ZipLongTestCase
-    extends TestCase
-{
-
-    public ZipLongTestCase( final String name )
-    {
-        super( name );
-    }
-
-    /**
-     * Test conversion to bytes.
-     */
-    public void testToBytes()
-    {
-        final ZipLong zipLong = new ZipLong( 0x12345678 );
-        final byte[] result = zipLong.getBytes();
-        assertEquals( "length getBytes", 4, result.length );
-        assertEquals( "first byte getBytes", 0x78, result[ 0 ] );
-        assertEquals( "second byte getBytes", 0x56, result[ 1 ] );
-        assertEquals( "third byte getBytes", 0x34, result[ 2 ] );
-        assertEquals( "fourth byte getBytes", 0x12, result[ 3 ] );
-    }
-
-    /**
-     * Test conversion from bytes.
-     */
-    public void testFromBytes()
-    {
-        final byte[] value = new byte[]{0x78, 0x56, 0x34, 0x12};
-        final ZipLong zipLong = new ZipLong( value );
-        assertEquals( "value from bytes", 0x12345678, zipLong.getValue() );
-    }
-
-    /**
-     * Test the contract of the equals method.
-     */
-    public void testEquals()
-    {
-        final ZipLong zipLong1 = new ZipLong( 0x12345678 );
-        final ZipLong zipLong2 = new ZipLong( 0x12345678 );
-        final ZipLong zipLong3 = new ZipLong( 0x87654321 );
-
-        assertTrue( "reflexive", zipLong1.equals( zipLong1 ) );
-
-        assertTrue( "works", zipLong1.equals( zipLong2 ) );
-        assertTrue( "works, part two", !zipLong1.equals( zipLong3 ) );
-
-        assertTrue( "symmetric", zipLong2.equals( zipLong1 ) );
-
-        assertTrue( "null handling", !zipLong1.equals( null ) );
-        assertTrue( "non ZipLong handling", !zipLong1.equals( new Integer( 0x1234 ) ) );
-    }
-
-    /**
-     * Test sign handling.
-     */
-    public void testSign()
-    {
-        final ZipLong zipLong =
-            new ZipLong( new byte[]{(byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF} );
-        assertEquals( 0x00000000FFFFFFFFl, zipLong.getValue() );
-    }
-}
diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipShortTestCase.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipShortTestCase.java
deleted file mode 100644
index 7e45b1d48..000000000
--- a/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipShortTestCase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import junit.framework.TestCase;
-import org.apache.aut.zip.ZipShort;
-
-/**
- * JUnit 3 testcases for org.apache.tools.zip.ZipShort.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class ZipShortTestCase
-    extends TestCase
-{
-    public ZipShortTestCase( String name )
-    {
-        super( name );
-    }
-
-    /**
-     * Test conversion to bytes.
-     */
-    public void testToBytes()
-    {
-        final ZipShort zipShort = new ZipShort( 0x1234 );
-        byte[] result = zipShort.getBytes();
-        assertEquals( "length getBytes", 2, result.length );
-        assertEquals( "first byte getBytes", 0x34, result[ 0 ] );
-        assertEquals( "second byte getBytes", 0x12, result[ 1 ] );
-    }
-
-    /**
-     * Test conversion from bytes.
-     */
-    public void testFromBytes()
-    {
-        byte[] val = new byte[]{0x34, 0x12};
-        final ZipShort zipShort = new ZipShort( val );
-        assertEquals( "value from bytes", 0x1234, zipShort.getValue() );
-    }
-
-    /**
-     * Test the contract of the equals method.
-     */
-    public void testEquals()
-    {
-        final ZipShort zipShort = new ZipShort( 0x1234 );
-        final ZipShort zipShort2 = new ZipShort( 0x1234 );
-        final ZipShort zipShort3 = new ZipShort( 0x5678 );
-
-        assertTrue( "reflexive", zipShort.equals( zipShort ) );
-
-        assertTrue( "works", zipShort.equals( zipShort2 ) );
-        assertTrue( "works, part two", !zipShort.equals( zipShort3 ) );
-
-        assertTrue( "symmetric", zipShort2.equals( zipShort ) );
-
-        assertTrue( "null handling", !zipShort.equals( null ) );
-        assertTrue( "non ZipShort handling", !zipShort.equals( new Integer( 0x1234 ) ) );
-    }
-
-    /**
-     * Test sign handling.
-     */
-    public void testSign()
-    {
-        final ZipShort zipShort = new ZipShort( new byte[]{(byte)0xFF, (byte)0xFF} );
-        assertEquals( 0x0000FFFF, zipShort.getValue() );
-    }
-}
diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/AsiExtraFieldTestCase.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/AsiExtraFieldTestCase.java
deleted file mode 100644
index 2337f3feb..000000000
--- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/AsiExtraFieldTestCase.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import java.util.zip.ZipException;
-import junit.framework.TestCase;
-import org.apache.aut.zip.UnixStat;
-import org.apache.aut.zip.AsiExtraField;
-
-/**
- * JUnit testcases AsiExtraField.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class AsiExtraFieldTestCase
-    extends TestCase
-    implements UnixStat
-{
-    public AsiExtraFieldTestCase( final String name )
-    {
-        super( name );
-    }
-
-    /**
-     * Test file mode magic.
-     */
-    public void testModes()
-    {
-        final AsiExtraField field = new AsiExtraField();
-        field.setMode( 0123 );
-        assertEquals( "plain file", 0100123, field.getMode() );
-        field.setDirectory( true );
-        assertEquals( "directory", 040123, field.getMode() );
-        field.setLinkedFile( "test" );
-        assertEquals( "symbolic link", 0120123, field.getMode() );
-    }
-
-    private AsiExtraField createField()
-    {
-        final AsiExtraField field = new AsiExtraField();
-        field.setMode( 0123 );
-        field.setUserId( 5 );
-        field.setGroupId( 6 );
-        return field;
-    }
-
-    public void testContent1()
-    {
-        final AsiExtraField field = createField();
-        final byte[] data = field.getLocalFileDataData();
-
-        // CRC manually calculated, sorry
-        final byte[] expect = {(byte)0xC6, 0x02, 0x78, (byte)0xB6, // CRC
-                               0123, (byte)0x80, // mode
-                               0, 0, 0, 0, // link length
-                               5, 0, 6, 0};                        // uid, gid
-        assertEquals( "no link", expect.length, data.length );
-        for( int i = 0; i < expect.length; i++ )
-        {
-            assertEquals( "no link, byte " + i, expect[ i ], data[ i ] );
-        }
-
-        field.setLinkedFile( "test" );
-    }
-
-    public void testContent2()
-    {
-        final AsiExtraField field = createField();
-        field.setLinkedFile( "test" );
-
-        final byte[] data = field.getLocalFileDataData();
-        final byte[] expect = new byte[]{0x75, (byte)0x8E, 0x41, (byte)0xFD, // CRC
-                                         0123, (byte)0xA0, // mode
-                                         4, 0, 0, 0, // link length
-                                         5, 0, 6, 0, // uid, gid
-                                         (byte)'t', (byte)'e', (byte)'s', (byte)'t'};
-        assertEquals( "no link", expect.length, data.length );
-        for( int i = 0; i < expect.length; i++ )
-        {
-            assertEquals( "no link, byte " + i, expect[ i ], data[ i ] );
-        }
-
-    }
-
-    public void testReparse1()
-        throws ZipException
-    {
-        // CRC manually calculated, sorry
-        final byte[] data = {(byte)0xC6, 0x02, 0x78, (byte)0xB6, // CRC
-                             0123, (byte)0x80, // mode
-                             0, 0, 0, 0, // link length
-                             5, 0, 6, 0};                        // uid, gid
-        final AsiExtraField field = new AsiExtraField();
-        field.parseFromLocalFileData( data, 0, data.length );
-
-        assertEquals( "length plain file", data.length,
-                      field.getLocalFileDataLength().getValue() );
-        assertTrue( "plain file, no link", !field.isLink() );
-        assertTrue( "plain file, no dir", !field.isDirectory() );
-        assertEquals( "mode plain file", FILE_FLAG | 0123, field.getMode() );
-        assertEquals( "uid plain file", 5, field.getUserId() );
-        assertEquals( "gid plain file", 6, field.getGroupId() );
-    }
-
-    public void testReparse2()
-        throws ZipException
-    {
-        final byte[] data = new byte[]{0x75, (byte)0x8E, 0x41, (byte)0xFD, // CRC
-                                       0123, (byte)0xA0, // mode
-                                       4, 0, 0, 0, // link length
-                                       5, 0, 6, 0, // uid, gid
-                                       (byte)'t', (byte)'e', (byte)'s', (byte)'t'};
-        final AsiExtraField field = new AsiExtraField();
-        field.parseFromLocalFileData( data, 0, data.length );
-        assertEquals( "length link", data.length,
-                      field.getLocalFileDataLength().getValue() );
-        assertTrue( "link, is link", field.isLink() );
-        assertTrue( "link, no dir", !field.isDirectory() );
-        assertEquals( "mode link", LINK_FLAG | 0123, field.getMode() );
-        assertEquals( "uid link", 5, field.getUserId() );
-        assertEquals( "gid link", 6, field.getGroupId() );
-        assertEquals( "test", field.getLinkedFile() );
-    }
-
-    public void testReparse3()
-        throws ZipException
-    {
-        final byte[] data = new byte[]{(byte)0x8E, 0x01, (byte)0xBF, (byte)0x0E, // CRC
-                                       0123, (byte)0x40, // mode
-                                       0, 0, 0, 0, // link
-                                       5, 0, 6, 0};                          // uid, gid
-        final AsiExtraField field = new AsiExtraField();
-        field.parseFromLocalFileData( data, 0, data.length );
-        assertEquals( "length dir", data.length,
-                      field.getLocalFileDataLength().getValue() );
-        assertTrue( "dir, no link", !field.isLink() );
-        assertTrue( "dir, is dir", field.isDirectory() );
-        assertEquals( "mode dir", DIR_FLAG | 0123, field.getMode() );
-        assertEquals( "uid dir", 5, field.getUserId() );
-        assertEquals( "gid dir", 6, field.getGroupId() );
-    }
-
-    public void testReparse4()
-        throws Exception
-    {
-        final byte[] data = new byte[]{0, 0, 0, 0, // bad CRC
-                                       0123, (byte)0x40, // mode
-                                       0, 0, 0, 0, // link
-                                       5, 0, 6, 0};                          // uid, gid
-        final AsiExtraField field = new AsiExtraField();
-        try
-        {
-            field.parseFromLocalFileData( data, 0, data.length );
-            fail( "should raise bad CRC exception" );
-        }
-        catch( Exception e )
-        {
-            assertEquals( "bad CRC checksum 0 instead of ebf018e",
-                          e.getMessage() );
-        }
-    }
-}
diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java
deleted file mode 100644
index 7f4a73e6c..000000000
--- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import junit.framework.TestCase;
-import org.apache.aut.zip.UnixStat;
-import org.apache.aut.zip.AsiExtraField;
-import org.apache.aut.zip.UnrecognizedExtraField;
-import org.apache.aut.zip.ZipShort;
-import org.apache.aut.zip.ZipExtraField;
-import org.apache.aut.zip.ExtraFieldUtils;
-
-/**
- * JUnit testcases ExtraFieldUtils.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class ExtraFieldUtilsTestCase
-    extends TestCase
-    implements UnixStat
-{
-    private AsiExtraField m_field;
-    private UnrecognizedExtraField m_dummy;
-    private byte[] m_data;
-    private byte[] m_local;
-
-    public ExtraFieldUtilsTestCase( final String name )
-    {
-        super( name );
-    }
-
-    public void setUp()
-    {
-        m_field = new AsiExtraField();
-        m_field.setMode( 0755 );
-        m_field.setDirectory( true );
-        m_dummy = new UnrecognizedExtraField();
-        m_dummy.setHeaderId( new ZipShort( 1 ) );
-        m_dummy.setLocalFileDataData( new byte[ 0 ] );
-        m_dummy.setCentralDirectoryData( new byte[]{0} );
-
-        m_local = m_field.getLocalFileDataData();
-        final byte[] dummyLocal = m_dummy.getLocalFileDataData();
-        m_data = new byte[ 4 + m_local.length + 4 + dummyLocal.length ];
-        System.arraycopy( m_field.getHeaderId().getBytes(), 0, m_data, 0, 2 );
-        System.arraycopy( m_field.getLocalFileDataLength().getBytes(), 0, m_data, 2, 2 );
-        System.arraycopy( m_local, 0, m_data, 4, m_local.length );
-        System.arraycopy( m_dummy.getHeaderId().getBytes(), 0, m_data,
-                          4 + m_local.length, 2 );
-        System.arraycopy( m_dummy.getLocalFileDataLength().getBytes(), 0, m_data,
-                          4 + m_local.length + 2, 2 );
-        System.arraycopy( dummyLocal, 0, m_data,
-                          4 + m_local.length + 4, dummyLocal.length );
-
-    }
-
-    /**
-     * test parser.
-     */
-    public void testParse() throws Exception
-    {
-        final ZipExtraField[] extraField = ExtraFieldUtils.parse( m_data );
-        assertEquals( "number of fields", 2, extraField.length );
-        assertTrue( "type field 1", extraField[ 0 ] instanceof AsiExtraField );
-        assertEquals( "mode field 1", 040755,
-                      ( (AsiExtraField)extraField[ 0 ] ).getMode() );
-        assertTrue( "type field 2", extraField[ 1 ] instanceof UnrecognizedExtraField );
-        assertEquals( "data length field 2", 0,
-                      extraField[ 1 ].getLocalFileDataLength().getValue() );
-
-        final byte[] data2 = new byte[ m_data.length - 1 ];
-        System.arraycopy( m_data, 0, data2, 0, data2.length );
-        try
-        {
-            ExtraFieldUtils.parse( data2 );
-            fail( "data should be invalid" );
-        }
-        catch( Exception e )
-        {
-            assertEquals( "message",
-                          "data starting at " + ( 4 + m_local.length ) + " is in unknown format",
-                          e.getMessage() );
-        }
-    }
-
-    /**
-     * Test merge methods
-     */
-    public void testMerge()
-    {
-        final byte[] local =
-            ExtraFieldUtils.mergeLocalFileDataData( new ZipExtraField[]{m_field, m_dummy} );
-        assertEquals( "local length", m_data.length, local.length );
-        for( int i = 0; i < local.length; i++ )
-        {
-            assertEquals( "local byte " + i, m_data[ i ], local[ i ] );
-        }
-
-        final byte[] dummyCentral = m_dummy.getCentralDirectoryData();
-        final byte[] data2 = new byte[ 4 + m_local.length + 4 + dummyCentral.length ];
-        System.arraycopy( m_data, 0, data2, 0, 4 + m_local.length + 2 );
-        System.arraycopy( m_dummy.getCentralDirectoryLength().getBytes(), 0,
-                          data2, 4 + m_local.length + 2, 2 );
-        System.arraycopy( dummyCentral, 0, data2,
-                          4 + m_local.length + 4, dummyCentral.length );
-
-        final byte[] central =
-            ExtraFieldUtils.mergeCentralDirectoryData( new ZipExtraField[]{m_field, m_dummy} );
-        assertEquals( "central length", data2.length, central.length );
-        for( int i = 0; i < central.length; i++ )
-        {
-            assertEquals( "central byte " + i, data2[ i ], central[ i ] );
-        }
-    }
-}
diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipEntryTestCase.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipEntryTestCase.java
deleted file mode 100644
index df87812f4..000000000
--- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipEntryTestCase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import java.util.NoSuchElementException;
-import junit.framework.TestCase;
-import org.apache.aut.zip.AsiExtraField;
-import org.apache.aut.zip.UnrecognizedExtraField;
-import org.apache.aut.zip.ZipEntry;
-import org.apache.aut.zip.ZipExtraField;
-import org.apache.aut.zip.ZipShort;
-
-/**
- * JUnit testcases ZipEntry.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class ZipEntryTestCase
-    extends TestCase
-{
-    public ZipEntryTestCase( final String name )
-    {
-        super( name );
-    }
-
-    /**
-     * test handling of extra fields
-     */
-    public void testExtraFields()
-    {
-        final AsiExtraField field = createField();
-        final UnrecognizedExtraField extraField = createExtraField();
-
-        final ZipEntry entry = new ZipEntry( "test/" );
-        entry.setExtraFields( new ZipExtraField[]{field, extraField} );
-        final byte[] data1 = entry.getExtra();
-        ZipExtraField[] result = entry.getExtraFields();
-        assertEquals( "first pass", 2, result.length );
-        assertSame( field, result[ 0 ] );
-        assertSame( extraField, result[ 1 ] );
-
-        UnrecognizedExtraField u2 = new UnrecognizedExtraField();
-        u2.setHeaderId( new ZipShort( 1 ) );
-        u2.setLocalFileDataData( new byte[]{1} );
-
-        entry.addExtraField( u2 );
-        byte[] data2 = entry.getExtra();
-        result = entry.getExtraFields();
-        assertEquals( "second pass", 2, result.length );
-        assertSame( field, result[ 0 ] );
-        assertSame( u2, result[ 1 ] );
-        assertEquals( "length second pass", data1.length + 1, data2.length );
-
-        UnrecognizedExtraField u3 = new UnrecognizedExtraField();
-        u3.setHeaderId( new ZipShort( 2 ) );
-        u3.setLocalFileDataData( new byte[]{1} );
-        entry.addExtraField( u3 );
-        result = entry.getExtraFields();
-        assertEquals( "third pass", 3, result.length );
-
-        entry.removeExtraField( new ZipShort( 1 ) );
-        byte[] data3 = entry.getExtra();
-        result = entry.getExtraFields();
-        assertEquals( "fourth pass", 2, result.length );
-        assertSame( field, result[ 0 ] );
-        assertSame( u3, result[ 1 ] );
-        assertEquals( "length fourth pass", data2.length, data3.length );
-
-        try
-        {
-            entry.removeExtraField( new ZipShort( 1 ) );
-            fail( "should be no such element" );
-        }
-        catch( final NoSuchElementException nse )
-        {
-        }
-    }
-
-    private UnrecognizedExtraField createExtraField()
-    {
-        UnrecognizedExtraField extraField = new UnrecognizedExtraField();
-        extraField.setHeaderId( new ZipShort( 1 ) );
-        extraField.setLocalFileDataData( new byte[ 0 ] );
-        return extraField;
-    }
-
-    private AsiExtraField createField()
-    {
-        final AsiExtraField field = new AsiExtraField();
-        field.setDirectory( true );
-        field.setMode( 0755 );
-        return field;
-    }
-}
diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipLongTestCase.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipLongTestCase.java
deleted file mode 100644
index 501b5f491..000000000
--- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipLongTestCase.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import junit.framework.TestCase;
-import org.apache.aut.zip.ZipLong;
-
-/**
- * JUnit 3 testcases for org.apache.tools.zip.ZipLong.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class ZipLongTestCase
-    extends TestCase
-{
-
-    public ZipLongTestCase( final String name )
-    {
-        super( name );
-    }
-
-    /**
-     * Test conversion to bytes.
-     */
-    public void testToBytes()
-    {
-        final ZipLong zipLong = new ZipLong( 0x12345678 );
-        final byte[] result = zipLong.getBytes();
-        assertEquals( "length getBytes", 4, result.length );
-        assertEquals( "first byte getBytes", 0x78, result[ 0 ] );
-        assertEquals( "second byte getBytes", 0x56, result[ 1 ] );
-        assertEquals( "third byte getBytes", 0x34, result[ 2 ] );
-        assertEquals( "fourth byte getBytes", 0x12, result[ 3 ] );
-    }
-
-    /**
-     * Test conversion from bytes.
-     */
-    public void testFromBytes()
-    {
-        final byte[] value = new byte[]{0x78, 0x56, 0x34, 0x12};
-        final ZipLong zipLong = new ZipLong( value );
-        assertEquals( "value from bytes", 0x12345678, zipLong.getValue() );
-    }
-
-    /**
-     * Test the contract of the equals method.
-     */
-    public void testEquals()
-    {
-        final ZipLong zipLong1 = new ZipLong( 0x12345678 );
-        final ZipLong zipLong2 = new ZipLong( 0x12345678 );
-        final ZipLong zipLong3 = new ZipLong( 0x87654321 );
-
-        assertTrue( "reflexive", zipLong1.equals( zipLong1 ) );
-
-        assertTrue( "works", zipLong1.equals( zipLong2 ) );
-        assertTrue( "works, part two", !zipLong1.equals( zipLong3 ) );
-
-        assertTrue( "symmetric", zipLong2.equals( zipLong1 ) );
-
-        assertTrue( "null handling", !zipLong1.equals( null ) );
-        assertTrue( "non ZipLong handling", !zipLong1.equals( new Integer( 0x1234 ) ) );
-    }
-
-    /**
-     * Test sign handling.
-     */
-    public void testSign()
-    {
-        final ZipLong zipLong =
-            new ZipLong( new byte[]{(byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF} );
-        assertEquals( 0x00000000FFFFFFFFl, zipLong.getValue() );
-    }
-}
diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipShortTestCase.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipShortTestCase.java
deleted file mode 100644
index 7e45b1d48..000000000
--- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipShortTestCase.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.aut.zip.test;
-
-import junit.framework.TestCase;
-import org.apache.aut.zip.ZipShort;
-
-/**
- * JUnit 3 testcases for org.apache.tools.zip.ZipShort.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-public class ZipShortTestCase
-    extends TestCase
-{
-    public ZipShortTestCase( String name )
-    {
-        super( name );
-    }
-
-    /**
-     * Test conversion to bytes.
-     */
-    public void testToBytes()
-    {
-        final ZipShort zipShort = new ZipShort( 0x1234 );
-        byte[] result = zipShort.getBytes();
-        assertEquals( "length getBytes", 2, result.length );
-        assertEquals( "first byte getBytes", 0x34, result[ 0 ] );
-        assertEquals( "second byte getBytes", 0x12, result[ 1 ] );
-    }
-
-    /**
-     * Test conversion from bytes.
-     */
-    public void testFromBytes()
-    {
-        byte[] val = new byte[]{0x34, 0x12};
-        final ZipShort zipShort = new ZipShort( val );
-        assertEquals( "value from bytes", 0x1234, zipShort.getValue() );
-    }
-
-    /**
-     * Test the contract of the equals method.
-     */
-    public void testEquals()
-    {
-        final ZipShort zipShort = new ZipShort( 0x1234 );
-        final ZipShort zipShort2 = new ZipShort( 0x1234 );
-        final ZipShort zipShort3 = new ZipShort( 0x5678 );
-
-        assertTrue( "reflexive", zipShort.equals( zipShort ) );
-
-        assertTrue( "works", zipShort.equals( zipShort2 ) );
-        assertTrue( "works, part two", !zipShort.equals( zipShort3 ) );
-
-        assertTrue( "symmetric", zipShort2.equals( zipShort ) );
-
-        assertTrue( "null handling", !zipShort.equals( null ) );
-        assertTrue( "non ZipShort handling", !zipShort.equals( new Integer( 0x1234 ) ) );
-    }
-
-    /**
-     * Test sign handling.
-     */
-    public void testSign()
-    {
-        final ZipShort zipShort = new ZipShort( new byte[]{(byte)0xFF, (byte)0xFF} );
-        assertEquals( 0x0000FFFF, zipShort.getValue() );
-    }
-}
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java
index 712c3fe33..d754357a9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java
@@ -9,10 +9,8 @@ package org.apache.tools.todo.taskdefs.archive;
 
 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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
index 355c730bb..1c8721076 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
@@ -19,14 +19,12 @@ import java.io.PrintWriter;
 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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java
index 8d46391f1..82ea159bc 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java
@@ -9,11 +9,8 @@ package org.apache.tools.todo.taskdefs.archive;
 
 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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
index b2a5eba4e..cb0fc310a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
@@ -20,14 +20,11 @@ import java.util.Hashtable;
 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 @@ public class Zip
      * @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 )