Author: bodewig
Date: Mon Jul 25 19:37:08 2011
New Revision: 1150863
URL: http://svn.apache.org/viewvc?rev=1150863&view=rev
Log:
sync with trunk
Modified:
commons/proper/compress/branches/zip64/ (props changed)
commons/proper/compress/branches/zip64/NOTICE.txt
commons/proper/compress/branches/zip64/pmd-ruleset.xml
commons/proper/compress/branches/zip64/pom.xml
commons/proper/compress/branches/zip64/src/assembly/src.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
(contents, 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/download_compress.xml
commons/proper/compress/branches/zip64/src/site/xdoc/index.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 19:37:08 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk:1149597-1150581
+/commons/proper/compress/trunk:1149597-1150859
Modified: commons/proper/compress/branches/zip64/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/NOTICE.txt?rev=1150863&r1=1150862&r2=1150863&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/NOTICE.txt (original)
+++ commons/proper/compress/branches/zip64/NOTICE.txt Mon Jul 25 19:37:08 2011
@@ -1,5 +1,5 @@
Apache Commons Compress
-Copyright 2002-2010 The Apache Software Foundation
+Copyright 2002-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: commons/proper/compress/branches/zip64/pmd-ruleset.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/pmd-ruleset.xml?rev=1150863&r1=1150862&r2=1150863&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/pmd-ruleset.xml (original)
+++ commons/proper/compress/branches/zip64/pmd-ruleset.xml Mon Jul 25 19:37:08
2011
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<ruleset name="compress"
xmlns="http://pmd.sf.net/ruleset/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
Modified: commons/proper/compress/branches/zip64/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/pom.xml?rev=1150863&r1=1150862&r2=1150863&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/pom.xml (original)
+++ commons/proper/compress/branches/zip64/pom.xml Mon Jul 25 19:37:08 2011
@@ -42,8 +42,8 @@
<commons.jira.id>COMPRESS</commons.jira.id>
<commons.jira.pid>12310904</commons.jira.pid>
<!-- configuration bits for cutting a release candidate -->
- <commons.release.version>1.1</commons.release.version>
- <commons.rc.version>RC2</commons.rc.version>
+ <commons.release.version>1.2</commons.release.version>
+ <commons.rc.version></commons.rc.version>
</properties>
<issueManagement>
@@ -138,6 +138,7 @@
<archive>
<manifestEntries>
<Main-Class>org.apache.commons.compress.archivers.Lister</Main-Class>
+ <Extension-Name>org.apache.commons.compress</Extension-Name>
</manifestEntries>
</archive>
</configuration>
Modified: commons/proper/compress/branches/zip64/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/assembly/src.xml?rev=1150863&r1=1150862&r2=1150863&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/src/assembly/src.xml (original)
+++ commons/proper/compress/branches/zip64/src/assembly/src.xml Mon Jul 25
19:37:08 2011
@@ -32,6 +32,7 @@
<include>pom.xml</include>
<include>STATUS</include>
<include>findbugs-exclude-filter.xml</include>
+ <include>pmd-ruleset.xml</include>
</includes>
</fileSet>
<fileSet>
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 19:37:08 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-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar:1149597-1150859
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 19:37:08 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-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:1149597-1150859
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 19:37:08 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-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1149597-1150859
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 19:37:08 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-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:1149597-1150859
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 19:37:08 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:1149597-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:1149597-1150859
Modified:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java?rev=1150863&r1=1150862&r2=1150863&view=diff
==============================================================================
---
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
(original)
+++
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Mon Jul 25 19:37:08 2011
@@ -533,11 +533,15 @@ public class ZipArchiveEntry extends jav
}
/**
- * Package private setter that sets the name using the raw bytes
- * and the string created from it by guessing or suing the
- * configured encoding.
+ * Sets the name using the raw bytes and the string created from
+ * it by guessing or using the configured encoding.
+ * @param name the name to use created from the raw bytes using
+ * the guessed or configured encoding
+ * @param rawName the bytes originally read as name from the
+ * archive
+ * @since Apache Commons Compress 1.2
*/
- void setName(String name, byte[] rawName) {
+ protected void setName(String name, byte[] rawName) {
setName(name);
this.rawName = rawName;
}
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 19:37:08 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-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:1149597-1150859
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 19:37:08 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:1149597-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:1149597-1150859
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 19:37:08 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-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:1149597-1150859
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 19:37:08 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-1150581
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java:1149597-1150859
Modified:
commons/proper/compress/branches/zip64/src/site/xdoc/download_compress.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/site/xdoc/download_compress.xml?rev=1150863&r1=1150862&r2=1150863&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/src/site/xdoc/download_compress.xml
(original)
+++ commons/proper/compress/branches/zip64/src/site/xdoc/download_compress.xml
Mon Jul 25 19:37:08 2011
@@ -95,32 +95,32 @@ limitations under the License.
</p>
</subsection>
</section>
- <section name="Commons Compress 1.1 ">
+ <section name="Commons Compress 1.2 ">
<subsection name="Binaries">
<table>
<tr>
- <td><a
href="[preferred]/commons/compress/binaries/commons-compress-1.1-bin.tar.gz">commons-compress-1.1-bin.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.1-bin.tar.gz.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.1-bin.tar.gz.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/compress/binaries/commons-compress-1.2-bin.tar.gz">commons-compress-1.2-bin.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.2-bin.tar.gz.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.2-bin.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/compress/binaries/commons-compress-1.1-bin.zip">commons-compress-1.1-bin.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.1-bin.zip.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.1-bin.zip.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/compress/binaries/commons-compress-1.2-bin.zip">commons-compress-1.2-bin.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.2-bin.zip.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.2-bin.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a
href="[preferred]/commons/compress/source/commons-compress-1.1-src.tar.gz">commons-compress-1.1-src.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.1-src.tar.gz.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.1-src.tar.gz.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/compress/source/commons-compress-1.2-src.tar.gz">commons-compress-1.2-src.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.2-src.tar.gz.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.2-src.tar.gz.asc";>pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/compress/source/commons-compress-1.1-src.zip">commons-compress-1.1-src.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.1-src.zip.md5";>md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.1-src.zip.asc";>pgp</a></td>
+ <td><a
href="[preferred]/commons/compress/source/commons-compress-1.2-src.zip">commons-compress-1.2-src.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.2-src.zip.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.2-src.zip.asc";>pgp</a></td>
</tr>
</table>
</subsection>
Modified: commons/proper/compress/branches/zip64/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/site/xdoc/index.xml?rev=1150863&r1=1150862&r2=1150863&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/src/site/xdoc/index.xml (original)
+++ commons/proper/compress/branches/zip64/src/site/xdoc/index.xml Mon Jul 25
19:37:08 2011
@@ -46,12 +46,13 @@
</ul>
<subsection name="Status">
<ul>
- <li>The code has been released as version 1.1</li>
+ <li>The code has been released as version 1.2</li>
</ul>
</subsection>
</section>
<section name="Documentation">
- <p>Commons Compress requires Java 1.4 or later.</p>
+ <p>Commons Compress 1.2 requires Java 1.4 or later and will
+ be the last version that doesn't require Java 5.</p>
<p>The compress component is split into <em>compressors</em> and
<em>archivers</em>. While <em>compressors</em>
@@ -88,7 +89,7 @@
</section>
<section name="Releases">
<p>
- The latest version v1.1, is JDK 1.4 compatible -
+ The latest version v1.2, is JDK 1.4 compatible -
<a
href="http://commons.apache.org/compress/download_compress.cgi";>Download
now!</a>
</p>
</section>
Propchange:
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 19:37:08 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-1150581
+/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:1149597-1150859
