Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 71860 invoked from network); 6 Feb 2009 17:24:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Feb 2009 17:24:28 -0000 Received: (qmail 22030 invoked by uid 500); 6 Feb 2009 17:24:26 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 21979 invoked by uid 500); 6 Feb 2009 17:24:26 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 21970 invoked by uid 99); 6 Feb 2009 17:24:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2009 09:24:26 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2009 17:24:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9B2BD238889D; Fri, 6 Feb 2009 17:24:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r741641 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers: ./ ar/ cpio/ jar/ tar/ zip/ Date: Fri, 06 Feb 2009 17:24:02 -0000 To: commits@commons.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090206172402.9B2BD238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Fri Feb 6 17:24:01 2009 New Revision: 741641 URL: http://svn.apache.org/viewvc?rev=741641&view=rev Log: merge ZipArchiveOutputStream and ZipOutputStream Removed: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java?rev=741641&r1=741640&r2=741641&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java Fri Feb 6 17:24:01 2009 @@ -19,11 +19,16 @@ package org.apache.commons.compress.archivers; import java.io.IOException; +import java.io.FilterOutputStream; import java.io.OutputStream; -public abstract class ArchiveOutputStream extends OutputStream { +public abstract class ArchiveOutputStream extends FilterOutputStream { - public abstract void putArchiveEntry(ArchiveEntry entry) throws IOException; + protected ArchiveOutputStream(OutputStream other) { + super(other); + } + + public abstract void putArchiveEntry(ArchiveEntry entry) throws IOException; public abstract void closeArchiveEntry() throws IOException; } Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java?rev=741641&r1=741640&r2=741641&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java Fri Feb 6 17:24:01 2009 @@ -31,7 +31,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; -import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; +import org.apache.commons.compress.archivers.zip.ZipOutputStream; /** * Factory to create Archive[In|Out]putStreams from names @@ -65,7 +65,7 @@ if ("ar".equalsIgnoreCase(archiverName)) { return new ArArchiveOutputStream(out); } else if("zip".equalsIgnoreCase(archiverName)) { - return new ZipArchiveOutputStream(out); + return new ZipOutputStream(out); } else if("tar".equalsIgnoreCase(archiverName)) { return new TarArchiveOutputStream(out); } else if("jar".equalsIgnoreCase(archiverName)) { Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java?rev=741641&r1=741640&r2=741641&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java Fri Feb 6 17:24:01 2009 @@ -26,13 +26,12 @@ public class ArArchiveOutputStream extends ArchiveOutputStream { - private final OutputStream out; private long archiveOffset = 0; private long entryOffset = 0; private ArArchiveEntry prevEntry; public ArArchiveOutputStream( final OutputStream pOut ) { - out = pOut; + super(pOut); } private long writeArchiveHeader() throws IOException { Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java?rev=741641&r1=741640&r2=741641&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java Fri Feb 6 17:24:01 2009 @@ -70,8 +70,6 @@ private long written; - private OutputStream out = null; - /** * Check to make sure that this stream has not been closed * @@ -90,7 +88,7 @@ * @param format The format of the stream */ public CpioArchiveOutputStream(final OutputStream out, final short format) { - this.out = new FilterOutputStream(out); + super(out); setFormat(format); } Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java?rev=741641&r1=741640&r2=741641&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java Fri Feb 6 17:24:01 2009 @@ -23,9 +23,9 @@ import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; -import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; +import org.apache.commons.compress.archivers.zip.ZipOutputStream; -public class JarArchiveOutputStream extends ZipArchiveOutputStream { +public class JarArchiveOutputStream extends ZipOutputStream { public JarArchiveOutputStream( final OutputStream out ) { super(out); Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java?rev=741641&r1=741640&r2=741641&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java Fri Feb 6 17:24:01 2009 @@ -26,10 +26,8 @@ public class TarArchiveOutputStream extends ArchiveOutputStream { - private final TarOutputStream out; - public TarArchiveOutputStream(OutputStream out) { - this.out = new TarOutputStream(out); + super(new TarOutputStream(out)); } public void close() throws IOException { @@ -37,11 +35,11 @@ } public void closeArchiveEntry() throws IOException { - this.out.closeEntry(); + ((TarOutputStream) out).closeEntry(); } public void putArchiveEntry(ArchiveEntry entry) throws IOException { - this.out.putNextEntry((TarArchiveEntry)entry); + ((TarOutputStream) out).putNextEntry((TarArchiveEntry)entry); } public void write(byte[] buffer, int offset, int length) throws IOException { Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java?rev=741641&r1=741640&r2=741641&view=diff ============================================================================== --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipOutputStream.java Fri Feb 6 17:24:01 2009 @@ -34,6 +34,9 @@ import java.util.zip.Deflater; import java.util.zip.ZipException; +import org.apache.commons.compress.archivers.ArchiveEntry; +import org.apache.commons.compress.archivers.ArchiveOutputStream; + /** * Reimplementation of {@link java.util.zip.ZipOutputStream * java.util.zip.ZipOutputStream} that does handle the extended @@ -54,7 +57,7 @@ * #putNextEntry putNextEntry} can be called.

* */ -public class ZipOutputStream extends FilterOutputStream { +public class ZipOutputStream extends ArchiveOutputStream { private static final int BYTE_MASK = 0xFF; private static final int SHORT = 2; @@ -562,6 +565,14 @@ } } + public void putArchiveEntry(ArchiveEntry entry) throws IOException { + putNextEntry((ZipArchiveEntry) entry); + } + + public void closeArchiveEntry() { + // do nothing + } + /* * Various ZIP constants */