You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2009/02/18 16:01:40 UTC
svn commit: r745531 - in /ant/core/trunk: ./ src/main/org/apache/tools/zip/

Author: bodewig
Date: Wed Feb 18 15:01:39 2009
New Revision: 745531

URL: http://svn.apache.org/viewvc?rev=745531&view=rev
Log:
Add support for InfoZIP invented extra fields for Unicode file names and comments.  Submitted by Wolfgang Glas.  Merge from commons-compress revision 745528

Added:
    ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java   (contents, props changed)
      - copied, changed from r745529, commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
    ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java   (contents, props changed)
      - copied, changed from r745529, commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
    ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java   (contents, props changed)
      - copied, changed from r745530, commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
    ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java   (contents, props changed)
      - copied, changed from r745530, commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java   (contents, props changed)

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=745531&r1=745530&r2=745531&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Feb 18 15:01:39 2009
@@ -348,6 +348,9 @@
    VM was running) for files with an unexpected internal structure.
    Bugzilla Report 46559.
 
+ * The zip package now supports the extra fields invented by InfoZIP
+   in order to store Unicode file names and comments.
+
 Other changes:
 --------------
  * A HostInfo task was added performing information on hosts, including info on 

Copied: ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java (from r745529, commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java)
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java?p2=ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java&p1=commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java&r1=745529&r2=745531&rev=745531&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java Wed Feb 18 15:01:39 2009
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.commons.compress.archivers.zip;
+package org.apache.tools.zip;
 
 import java.io.UnsupportedEncodingException;
 import java.util.zip.CRC32;

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 18 15:01:39 2009
@@ -0,0 +1 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089

Modified: ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java?rev=745531&r1=745530&r2=745531&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java Wed Feb 18 15:01:39 2009
@@ -44,6 +44,8 @@
         implementations = new HashMap();
         register(AsiExtraField.class);
         register(JarMarker.class);
+        register(UnicodePathExtraField.class);
+        register(UnicodeCommentExtraField.class);
     }
 
     /**

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 18 15:01:39 2009
@@ -0,0 +1 @@
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:745528

Copied: ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java (from r745529, commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java)
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java?p2=ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java&p1=commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java&r1=745529&r2=745531&rev=745531&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java Wed Feb 18 15:01:39 2009
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.commons.compress.archivers.zip;
+package org.apache.tools.zip;
 
 /**
  * Info-ZIP Unicode Comment Extra Field (0x6375):

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 18 15:01:39 2009
@@ -0,0 +1 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089

Copied: ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java (from r745530, commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java)
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java?p2=ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java&p1=commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java&r1=745530&r2=745531&rev=745531&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java Wed Feb 18 15:01:39 2009
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.commons.compress.archivers.zip;
+package org.apache.tools.zip;
 
 /**
  * Info-ZIP Unicode Path Extra Field (0x7075):

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 18 15:01:39 2009
@@ -0,0 +1 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089

Copied: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java (from r745530, commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java)
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java?p2=ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java&p1=commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java&r1=745530&r2=745531&rev=745531&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java Wed Feb 18 15:01:39 2009
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.commons.compress.archivers.zip;
+package org.apache.tools.zip;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 18 15:01:39 2009
@@ -0,0 +1 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089