svn commit: r785014 - /lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java

[jukka]

Author: jukka
Date: Mon Jun 15 22:51:27 2009
New Revision: 785014

URL: http://svn.apache.org/viewvc?rev=785014&view=rev
Log:
TIKA-204: Use commons-compress for parsing packages

Use commons-compress also in the ZipParser.

Modified:
    
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java

Modified: 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java?rev=785014&r1=785013&r2=785014&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java
 (original)
+++ 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java
 Mon Jun 15 22:51:27 2009
@@ -18,9 +18,9 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
 import org.apache.commons.io.input.CloseShieldInputStream;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
@@ -46,10 +46,10 @@
 
         // At the end we want to close the Zip stream to release any associated
         // resources, but the underlying document stream should not be closed
-        ZipInputStream zip =
-            new ZipInputStream(new CloseShieldInputStream(stream));
+        ZipArchiveInputStream zip =
+            new ZipArchiveInputStream(new CloseShieldInputStream(stream));
         try {
-            ZipEntry entry = zip.getNextEntry();
+            ArchiveEntry entry = zip.getNextEntry();
             while (entry != null) {
                 Metadata entrydata = new Metadata();
                 entrydata.set(Metadata.RESOURCE_NAME_KEY, entry.getName());