Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
From: "Conor MacNeill" <conor@m64.com>
To: <tomcat-dev@jakarta.apache.org>
Subject: RE: omission of items attribute in jar taskdef (ant)
Date: Wed, 8 Dec 1999 01:43:38 +1100
Message-ID: <001f01bf40c1$728492e0$80dc1fcb@cognetnt.cognet.com.au>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Importance: Normal
In-Reply-To: <B4712CB6.D874%jon@clearink.com>

>
> Take a look at the Zip taskdef and rip my code out of there. I
> was going to
> do this for the Jar one, but was going to wait until I had more
> time to deal
> with it in the proper way...which is to make a more generic file utility
> class instead of having all this duplicated code in each taskdef.
>
> -jon
>
>

Actually I have just changed the Jar class to extend Zip. I made most of the
methods in Zip protected and added an initZipOutputStream. In Zip this is
just implemented as

    protected void initZipOutputStream(ZipOutputStream zOut)
	throws IOException, BuildException
    {
	zOut.setMethod(ZipOutputStream.DEFLATED);
    }

but in Jar it is implemented as

    protected void initZipOutputStream(ZipOutputStream zOut)
	throws IOException, BuildException
    {
	zOut.setMethod(ZipOutputStream.DEFLATED);

	// add manifest first
	if (manifest != null) {
	    ZipEntry ze = new ZipEntry("META-INF/");
	    zOut.putNextEntry(ze);
	    zipFile(manifest, zOut, "META-INF/MANIFEST.MF");
	} else {
	    ZipEntry ze = new ZipEntry("META-INF/");
	    zOut.putNextEntry(ze);
	    String s = "/org/apache/tools/ant/defaultManifest.mf";
	    InputStream in = this.getClass().getResourceAsStream(s);
            if ( in == null )
		throw new BuildException ( "Could not find: " + s );
	    else
		zipFile(in, zOut, "META-INF/MANIFEST.MF");
	}
    }

Most of the methods in Jar disappear. I noticed that zipDir does not create
the directory entries whereas the Jar equivalent, jarDir, did. I have
preserved this behaviour by overriding zipDir in Jar. I'm not sure if this
difference is required, but if not then Jar.java could become even smaller.

I'd provide you with diffs but CVS appears to be down at the moment

Cheers

--
Conor MacNeill
conor@m64.com
M64 Pty Limited