Author: bodewig
Date: Fri Jul 29 05:03:18 2011
New Revision: 1152106
URL: http://svn.apache.org/viewvc?rev=1152106&view=rev
Log:
sync with trunk, make archive itself available to writing ZIP64 tests
Modified:
commons/proper/compress/branches/zip64/ (props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
(props changed)
commons/proper/compress/branches/zip64/src/site/xdoc/examples.xml
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
(props changed)
Propchange: commons/proper/compress/branches/zip64/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk:1149597-1151719
+/commons/proper/compress/trunk:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/tar:741089
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1,3 +1,3 @@
/ant/core/trunk/src/main/org/apache/tools/tar/TarArchiveEntry.java:741089
/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:807513,823136
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:741089,789556
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip:738844,739300,741089
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:745537
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:738844,738853,739300,741089,747002,1146020
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:1149597-1152105
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java:741089
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java:1149597-1151719
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java:1149597-1152105
Modified: commons/proper/compress/branches/zip64/src/site/xdoc/examples.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/site/xdoc/examples.xml?rev=1152106&r1=1152105&r2=1152106&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/src/site/xdoc/examples.xml (original)
+++ commons/proper/compress/branches/zip64/src/site/xdoc/examples.xml Fri Jul
29 05:03:18 2011
@@ -81,7 +81,7 @@ ArchiveInputStream input = new ArchiveSt
<p>Adding an entry to an ar archive:</p>
<source><![CDATA[
ArArchiveEntry entry = new ArArchiveEntry(name, size);
-arOutput.putNextEntry(entry);
+arOutput.putArchiveEntry(entry);
arOutput.write(contentOfEntry);
arOutput.closeArchiveEntry();
]]></source>
@@ -119,7 +119,7 @@ LOOP UNTIL entry.getSize() HAS BEEN READ
<p>Adding an entry to a cpio archive:</p>
<source><![CDATA[
CpioArchiveEntry entry = new CpioArchiveEntry(name, size);
-cpioOutput.putNextEntry(entry);
+cpioOutput.putArchiveEntry(entry);
cpioOutput.write(contentOfEntry);
cpioOutput.closeArchiveEntry();
]]></source>
@@ -175,7 +175,7 @@ LOOP UNTIL entry.getSize() HAS BEEN READ
<source><![CDATA[
TarArchiveEntry entry = new TarArchiveEntry(name);
entry.setSize(size);
-tarOutput.putNextEntry(entry);
+tarOutput.putArchiveEntry(entry);
tarOutput.write(contentOfEntry);
tarOutput.closeArchiveEntry();
]]></source>
@@ -198,11 +198,19 @@ LOOP UNTIL entry.getSize() HAS BEEN READ
<source><![CDATA[
ZipArchiveEntry entry = new ZipArchiveEntry(name);
entry.setSize(size);
-zipOutput.putNextEntry(entry);
+zipOutput.putArchiveEntry(entry);
zipOutput.write(contentOfEntry);
zipOutput.closeArchiveEntry();
]]></source>
+ <p><code>ZipArchiveOutputStream</code> can use some internal
+ optimizations exploiting <code>RandomAccessFile</code> if it
+ knows it is writing to a file rather than a non-seekable
+ stream. If you are writing to a file, you should use the
+ constructor that accepts a <code>File</code> argument rather
+ than the one using an <code>OutputStream</code> or the
+ factory method in <code>ArchiveStreamFactory</code>.</p>
+
<p>Reading entries from an zip archive:</p>
<source><![CDATA[
ZipArchiveEntry entry = zipInput.getNextZipEntry();
@@ -253,7 +261,7 @@ try {
<source><![CDATA[
JarArchiveEntry entry = new JarArchiveEntry(name, size);
entry.setSize(size);
-jarOutput.putNextEntry(entry);
+jarOutput.putArchiveEntry(entry);
jarOutput.write(contentOfEntry);
jarOutput.closeArchiveEntry();
]]></source>
Modified:
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java?rev=1152106&r1=1152105&r2=1152106&view=diff
==============================================================================
---
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
(original)
+++
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
Fri Jul 29 05:03:18 2011
@@ -93,7 +93,7 @@ public class Zip64SupportTest {
@Test public void write100KFiles() throws Throwable {
withTemporaryArchive("write100KFiles", new ZipOutputTest() {
- public void test(ZipArchiveOutputStream zos)
+ public void test(File f, ZipArchiveOutputStream zos)
throws IOException {
for (int i = 0; i < ONE_HUNDRED_THOUSAND; i++) {
ZipArchiveEntry zae =
@@ -107,7 +107,7 @@ public class Zip64SupportTest {
}
static interface ZipOutputTest {
- void test(ZipArchiveOutputStream zos) throws IOException;
+ void test(File f, ZipArchiveOutputStream zos) throws IOException;
}
private static void withTemporaryArchive(String testName,
@@ -116,7 +116,7 @@ public class Zip64SupportTest {
File f = getTempFile(testName);
ZipArchiveOutputStream zos = new ZipArchiveOutputStream(f);
try {
- test.test(zos);
+ test.test(f, zos);
} catch (IOException ex) {
System.err.println("Failed to write archive because of: "
+ ex.getMessage()
Propchange:
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 05:03:18 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:745537
-/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:1149597-1151719
+/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:1149597-1152105
