Author: bodewig
Date: Mon Jul 25 08:49:09 2011
New Revision: 1150582
URL: http://svn.apache.org/viewvc?rev=1150582&view=rev
Log:
sync with trunk - note to self, don't use svn merge without a prior svn up on
trunk's root
Added:
commons/proper/compress/branches/zip64/pmd-ruleset.xml
- copied unchanged from r1150581,
commons/proper/compress/trunk/pmd-ruleset.xml
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
- copied unchanged from r1150581,
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
commons/proper/compress/branches/zip64/src/test/resources/oldgnu_sparse.tar
- copied unchanged from r1150581,
commons/proper/compress/trunk/src/test/resources/oldgnu_sparse.tar
commons/proper/compress/branches/zip64/src/test/resources/posix00_sparse.tar
- copied unchanged from r1150581,
commons/proper/compress/trunk/src/test/resources/posix00_sparse.tar
commons/proper/compress/branches/zip64/src/test/resources/posix01_sparse.tar
- copied unchanged from r1150581,
commons/proper/compress/trunk/src/test/resources/posix01_sparse.tar
commons/proper/compress/branches/zip64/src/test/resources/posix10_sparse.tar
- copied unchanged from r1150581,
commons/proper/compress/trunk/src/test/resources/posix10_sparse.tar
Modified:
commons/proper/compress/branches/zip64/ (props changed)
commons/proper/compress/branches/zip64/pom.xml
commons/proper/compress/branches/zip64/src/changes/changes.xml
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/ZipArchiveEntryTest.java
(props changed)
Propchange: commons/proper/compress/branches/zip64/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk:1149597-1150546
+/commons/proper/compress/trunk:1149597-1150581
Modified: commons/proper/compress/branches/zip64/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/pom.xml?rev=1150582&r1=1150581&r2=1150582&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/pom.xml (original)
+++ commons/proper/compress/branches/zip64/pom.xml Mon Jul 25 08:49:09 2011
@@ -181,10 +181,7 @@
<minimumTokens>200</minimumTokens>
<targetJdk>${maven.compile.source}</targetJdk>
<rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/finalizers.xml</ruleset>
- <ruleset>/rulesets/imports.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
+ <ruleset>${basedir}/pmd-ruleset.xml</ruleset>
</rulesets>
</configuration>
</plugin>
Modified: commons/proper/compress/branches/zip64/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/changes/changes.xml?rev=1150582&r1=1150581&r2=1150582&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/src/changes/changes.xml (original)
+++ commons/proper/compress/branches/zip64/src/changes/changes.xml Mon Jul 25
08:49:09 2011
@@ -47,8 +47,9 @@ The <action> type attribute can be add,u
<release version="1.2" date="as in SVN" description="Release 1.2">
<action issue="COMPRESS-145" type="fix" date="2011-07-23"
due-tue="Patrick Dreyer">
- TarArchiveInputStream now detects sparse entries and properly
- reports it cannot extract their contents.
+ TarArchiveInputStream now detects sparse entries using the
+ oldgnu format and properly reports it cannot extract their
+ contents.
</action>
<action issue="COMPRESS-123" type="add" date="2011-07-23">
ZipArchiveEntry has a new method getRawName that provides the
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 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-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar:1149597-1150581
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 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-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:1149597-1150581
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 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-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1149597-1150581
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 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-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:1149597-1150581
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:1149597-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:1149597-1150581
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 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-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:1149597-1150581
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:1149597-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:1149597-1150581
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 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-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:1149597-1150581
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 08:49:09 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-1150546
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java:1149597-1150581
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=1150582&r1=1150581&r2=1150582&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/src/site/xdoc/examples.xml (original)
+++ commons/proper/compress/branches/zip64/src/site/xdoc/examples.xml Mon Jul
25 08:49:09 2011
@@ -163,6 +163,14 @@ LOOP UNTIL entry.getSize() HAS BEEN READ
tar extension for long file names and read the longer names
accordingly.</p>
+ <p><code>TarArchiveInputStream</code> will recognize sparse
+ file entries stored using the "oldgnu" format
+ (<code>--sparse-version=0.0</code> in GNU tar) but is
+ not able to extract them correctly.
+ <a href="#Unsupported Features"><code>canReadEntryData</code></a>
+ will return false on such entries. The other variants of
+ sparse files can currently not be detected at all.</p>
+
<p>Adding an entry to a tar archive:</p>
<source><