You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2009/04/28 16:41:40 UTC
svn commit: r769424 - in /lucene/tika/trunk/tika-core: pom.xml
src/main/java/org/apache/tika/utils/ParseUtils.java
src/main/java/org/apache/tika/utils/Utils.java
Author: jukka
Date: Tue Apr 28 14:41:40 2009
New Revision: 769424
URL: http://svn.apache.org/viewvc?rev=769424&view=rev
Log:
TIKA-221: Drop log4j dependency from tika-core
Modified:
lucene/tika/trunk/tika-core/pom.xml
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/Utils.java
Modified: lucene/tika/trunk/tika-core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/pom.xml?rev=769424&r1=769423&r2=769424&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/pom.xml (original)
+++ lucene/tika/trunk/tika-core/pom.xml Tue Apr 28 14:41:40 2009
@@ -62,11 +62,6 @@
<version>1.4</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java?rev=769424&r1=769423&r2=769424&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java (original)
+++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ParseUtils.java Tue Apr 28 14:41:40 2009
@@ -108,13 +108,17 @@
*/
private static List<Parser> getParsersFromZip(InputStream zipIs,
TikaConfig config) throws TikaException {
- List<Parser> parsers = new ArrayList<Parser>();
- List<File> zipFiles = Utils.unzip(zipIs);
- for (int i = 0; i < zipFiles.size(); i++) {
- File zipEntry = zipFiles.get(i);
- parsers.add(getParser(zipEntry, config));
+ try {
+ List<Parser> parsers = new ArrayList<Parser>();
+ List<File> zipFiles = Utils.unzip(zipIs);
+ for (int i = 0; i < zipFiles.size(); i++) {
+ File zipEntry = zipFiles.get(i);
+ parsers.add(getParser(zipEntry, config));
+ }
+ return parsers;
+ } catch (IOException e) {
+ throw new TikaException("Failed to read zip file", e);
}
- return parsers;
}
/**
Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/Utils.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/Utils.java?rev=769424&r1=769423&r2=769424&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/Utils.java (original)
+++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/Utils.java Tue Apr 28 14:41:40 2009
@@ -16,7 +16,6 @@
*/
package org.apache.tika.utils;
-import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,14 +24,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.log4j.Logger;
-
/**
* Class util
*
@@ -41,12 +37,10 @@
public class Utils {
- static Logger logger = Logger.getRootLogger();
-
- public static List unzip(InputStream is) {
- List res = new ArrayList();
+ public static List<File> unzip(InputStream is) throws IOException {
+ List<File> res = new ArrayList<File>();
+ ZipInputStream in = new ZipInputStream(is);
try {
- ZipInputStream in = new ZipInputStream(is);
ZipEntry entry = null;
while ((entry = in.getNextEntry()) != null) {
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -58,7 +52,7 @@
InputStream isEntry = new ByteArrayInputStream(stream
.toByteArray());
File file = File.createTempFile("TIKA_unzip_", "_" + entry.getName());
-
+
// TODO we might want to delete the file earlier than on exit,
// in case Tika is used inside a long-running app
file.deleteOnExit();
@@ -67,9 +61,8 @@
res.add(file);
isEntry.close();
}
+ } finally {
in.close();
- } catch (IOException e) {
- logger.error(e.getMessage());
}
return res;
}