Repository: tika Updated Branches: refs/heads/2.x 28dcca907 -> 05f4af300
http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/main/java/org/apache/tika/io/StringUtil.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/io/StringUtil.java b/tika-core/src/main/java/org/apache/tika/io/StringUtil.java new file mode 100644 index 0000000..164765a --- /dev/null +++ b/tika-core/src/main/java/org/apache/tika/io/StringUtil.java @@ -0,0 +1,121 @@ +/* + * 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. + */ +package org.apache.tika.io; + +import java.nio.charset.Charset; + +/** + * General String Related Utilities. + * <p> + * This class provides static utility methods for string operations + * <p> + * Origin of code: Based on the version in POI + */ +public class StringUtil { + + protected static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1"); + protected static final Charset UTF16LE = Charset.forName("UTF-16LE"); + public static final Charset UTF8 = Charset.forName("UTF-8"); + + private StringUtil() { + // no instances of this class + } + + /** + * Given a byte array of 16-bit unicode characters in Little Endian + * format (most important byte last), return a Java String representation + * of it. + * + * { 0x16, 0x00 } -0x16 + * + * @param string the byte array to be converted + * @param offset the initial offset into the + * byte array. it is assumed that string[ offset ] and string[ offset + + * 1 ] contain the first 16-bit unicode character + * @param len the length of the final string + * @return the converted string, never <code>null</code>. + * @exception ArrayIndexOutOfBoundsException if offset is out of bounds for + * the byte array (i.e., is negative or is greater than or equal to + * string.length) + * @exception IllegalArgumentException if len is too large (i.e., + * there is not enough data in string to create a String of that + * length) + */ + public static String getFromUnicodeLE( + final byte[] string, + final int offset, + final int len) + throws ArrayIndexOutOfBoundsException, IllegalArgumentException { + if ((offset < 0) || (offset >= string.length)) { + throw new ArrayIndexOutOfBoundsException("Illegal offset " + offset + " (String data is of length " + string.length + ")"); + } + if ((len < 0) || (((string.length - offset) / 2) < len)) { + throw new IllegalArgumentException("Illegal length " + len); + } + + return new String(string, offset, len * 2, UTF16LE); + } + + /** + * Given a byte array of 16-bit unicode characters in little endian + * format (most important byte last), return a Java String representation + * of it. + * + * { 0x16, 0x00 } -0x16 + * + * @param string the byte array to be converted + * @return the converted string, never <code>null</code> + */ + public static String getFromUnicodeLE(byte[] string) { + if(string.length == 0) { return ""; } + return getFromUnicodeLE(string, 0, string.length / 2); + } + + /** + * Read 8 bit data (in ISO-8859-1 codepage) into a (unicode) Java + * String and return. + * (In Excel terms, read compressed 8 bit unicode as a string) + * + * @param string byte array to read + * @param offset offset to read byte array + * @param len length to read byte array + * @return String generated String instance by reading byte array + */ + public static String getFromCompressedUnicode( + final byte[] string, + final int offset, + final int len) { + int len_to_use = Math.min(len, string.length - offset); + return new String(string, offset, len_to_use, ISO_8859_1); + } + + /** + * Takes a unicode (java) string, and returns it as 8 bit data (in ISO-8859-1 + * codepage). + * (In Excel terms, write compressed 8 bit unicode) + * + * @param input the String containing the data to be written + * @param output the byte array to which the data is to be written + * @param offset an offset into the byte arrat at which the data is start + * when written + */ + public static void putCompressedUnicode(String input, byte[] output, int offset) { + byte[] bytes = input.getBytes(ISO_8859_1); + System.arraycopy(bytes, 0, output, offset, bytes.length); + } + +} http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java b/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java index 8b7b8ea..cc0e25e 100644 --- a/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java +++ b/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java @@ -18,6 +18,8 @@ package org.apache.tika.io; import java.io.IOException; +import org.apache.commons.io.IOExceptionWithCause; + /** * An {@link IOException} wrapper that tags the wrapped exception with * a given object reference. Both the tag and the wrapped original exception http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java b/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java index 0130005..ca5a5bf 100644 --- a/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java +++ b/tika-core/src/main/java/org/apache/tika/parser/NetworkParser.java @@ -28,8 +28,8 @@ import java.util.Collections; import java.util.Set; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.CloseShieldInputStream; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.input.CloseShieldInputStream; +import org.apache.commons.io.IOUtils; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java b/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java index ab50f01..ef312a0 100644 --- a/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java +++ b/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java @@ -32,8 +32,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.IOUtils; -import org.apache.tika.io.NullOutputStream; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.output.NullOutputStream; import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java b/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java index 9a0d560..6461e09 100644 --- a/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java +++ b/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java @@ -16,7 +16,7 @@ */ package org.apache.tika.sax; -import org.apache.tika.io.ClosedInputStream; +import org.apache.commons.io.input.ClosedInputStream; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/test/java/org/apache/tika/TikaTest.java ---------------------------------------------------------------------- diff --git a/tika-core/src/test/java/org/apache/tika/TikaTest.java b/tika-core/src/test/java/org/apache/tika/TikaTest.java index 1edf91c..77215d4 100644 --- a/tika-core/src/test/java/org/apache/tika/TikaTest.java +++ b/tika-core/src/test/java/org/apache/tika/TikaTest.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Set; import org.apache.tika.extractor.EmbeddedResourceHandler; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java ---------------------------------------------------------------------- diff --git a/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java b/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java index 550c8fe..7d124d3 100644 --- a/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java +++ b/tika-core/src/test/java/org/apache/tika/TypeDetectionBenchmark.java @@ -22,7 +22,7 @@ import java.io.FileInputStream; import java.io.InputStream; import java.util.Locale; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; public class TypeDetectionBenchmark { http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java ---------------------------------------------------------------------- diff --git a/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java b/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java index 229d310..d1cf9ad 100644 --- a/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java +++ b/tika-core/src/test/java/org/apache/tika/io/TikaInputStreamTest.java @@ -28,6 +28,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import org.apache.commons.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java ---------------------------------------------------------------------- diff --git a/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java index c892d35..36c14f4 100644 --- a/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java +++ b/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.fail; import java.io.IOException; import org.apache.tika.exception.TikaException; -import org.apache.tika.io.NullInputStream; +import org.apache.commons.io.input.NullInputStream; import org.apache.tika.io.TikaInputStream; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-langdetect/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java ---------------------------------------------------------------------- diff --git a/tika-langdetect/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java b/tika-langdetect/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java index 7bc2873..9008b83 100644 --- a/tika-langdetect/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java +++ b/tika-langdetect/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java @@ -7,17 +7,19 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.io.Writer; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; public abstract class LanguageDetectorTest { protected String[] getTestLanguages() throws IOException { List<String> result = new ArrayList<>(); - List<String> lines = IOUtils.readLines(LanguageDetectorTest.class.getResourceAsStream("language-codes.txt")); + List<String> lines = IOUtils.readLines(LanguageDetectorTest.class.getResourceAsStream("language-codes.txt"), + Charset.forName("UTF-8")); for (String line : lines) { line = line.trim(); if (line.isEmpty() || line.startsWith("#")) { http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-langdetect/src/test/java/org/apache/tika/langdetect/OptimaizeLangDetectorTest.java ---------------------------------------------------------------------- diff --git a/tika-langdetect/src/test/java/org/apache/tika/langdetect/OptimaizeLangDetectorTest.java b/tika-langdetect/src/test/java/org/apache/tika/langdetect/OptimaizeLangDetectorTest.java index d980b15..b58963d 100644 --- a/tika-langdetect/src/test/java/org/apache/tika/langdetect/OptimaizeLangDetectorTest.java +++ b/tika-langdetect/src/test/java/org/apache/tika/langdetect/OptimaizeLangDetectorTest.java @@ -6,12 +6,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.IOException; +import java.nio.charset.Charset; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.language.detect.LanguageConfidence; import org.apache.tika.language.detect.LanguageDetector; import org.apache.tika.language.detect.LanguageResult; @@ -227,7 +228,8 @@ public class OptimaizeLangDetectorTest extends LanguageDetectorTest { private Map<String, String> getTestLanguages(String resourceName) throws IOException { Map<String, String> result = new HashMap<>(); - List<String> languages = IOUtils.readLines(OptimaizeLangDetectorTest.class.getResourceAsStream(resourceName)); + List<String> languages = IOUtils.readLines(OptimaizeLangDetectorTest.class.getResourceAsStream(resourceName), + Charset.forName("UTF-8")); for (String line : languages) { line = line.trim(); if (line.isEmpty() || line.startsWith("#")) { http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-bundles/tika-parser-cad-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-bundles/tika-parser-cad-bundle/pom.xml b/tika-parser-bundles/tika-parser-cad-bundle/pom.xml index f269a7d..8570abe 100644 --- a/tika-parser-bundles/tika-parser-cad-bundle/pom.xml +++ b/tika-parser-bundles/tika-parser-cad-bundle/pom.xml @@ -47,7 +47,7 @@ <Bundle-Activator>org.apache.tika.module.cad.internal.Activator</Bundle-Activator> <Embed-Dependency> tika-parser-cad-module;inline=true, - poi;inline=true, + commons-io;inline=true, commons-codec;inline=true </Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-bundles/tika-parser-multimedia-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-bundles/tika-parser-multimedia-bundle/pom.xml b/tika-parser-bundles/tika-parser-multimedia-bundle/pom.xml index 067d6f3..6ed9e90 100644 --- a/tika-parser-bundles/tika-parser-multimedia-bundle/pom.xml +++ b/tika-parser-bundles/tika-parser-multimedia-bundle/pom.xml @@ -52,7 +52,6 @@ commons-io;inline=true, jempbox;inline=true, fontbox;inline=true, - poi;inline=true, isoparser;inline=true, aspectjrt;inline=true </Embed-Dependency> http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java b/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java index d42be94..54b6a08 100644 --- a/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java +++ b/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/corenlp/CoreNLPNERecogniser.java @@ -16,7 +16,7 @@ */ package org.apache.tika.parser.ner.corenlp; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.parser.ner.NERecogniser; import org.json.JSONObject; import org.slf4j.Logger; @@ -26,6 +26,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.nio.charset.Charset; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -159,7 +160,7 @@ public class CoreNLPNERecogniser implements NERecogniser { } try (FileInputStream stream = new FileInputStream(args[0])) { - String text = IOUtils.toString(stream); + String text = IOUtils.toString(stream, Charset.defaultCharset()); CoreNLPNERecogniser ner = new CoreNLPNERecogniser(); Map<String, Set<String>> names = ner.recognise(text); JSONObject jNames = new JSONObject(names); http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java b/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java index a1e19ae..8896093 100644 --- a/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java +++ b/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/parser/ner/opennlp/OpenNLPNameFinder.java @@ -20,7 +20,7 @@ package org.apache.tika.parser.ner.opennlp; import opennlp.tools.namefind.NameFinderME; import opennlp.tools.namefind.TokenNameFinderModel; import opennlp.tools.util.Span; -import org.apache.tika.io.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.parser.ner.NERecogniser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-cad-module/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-cad-module/pom.xml b/tika-parser-modules/tika-parser-cad-module/pom.xml index c606b06..6e7efb6 100644 --- a/tika-parser-modules/tika-parser-cad-module/pom.xml +++ b/tika-parser-modules/tika-parser-cad-module/pom.xml @@ -29,11 +29,13 @@ <artifactId>tika-core</artifactId> <version>${project.version}</version> </dependency> + <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <version>${poi.version}</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>tika-parser-text-module</artifactId> http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java b/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java index 78364fc..3f29c1f 100644 --- a/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java +++ b/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java @@ -21,8 +21,8 @@ import java.io.InputStream; import java.util.Collections; import java.util.Set; -import org.apache.poi.util.IOUtils; -import org.apache.poi.util.StringUtil; +import org.apache.commons.io.IOUtils; +import org.apache.tika.io.StringUtil; import org.apache.tika.exception.TikaException; import org.apache.tika.io.EndianUtils; import org.apache.tika.metadata.Metadata; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java b/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java index 2f4e5cd..92e3503 100644 --- a/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java +++ b/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/prt/PRTParser.java @@ -22,7 +22,7 @@ import java.io.UnsupportedEncodingException; import java.util.Collections; import java.util.Set; -import org.apache.poi.util.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; import org.apache.tika.io.EndianUtils; import org.apache.tika.metadata.Metadata; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-multimedia-module/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-multimedia-module/pom.xml b/tika-parser-modules/tika-parser-multimedia-module/pom.xml index 632ed86..ca601c7 100644 --- a/tika-parser-modules/tika-parser-multimedia-module/pom.xml +++ b/tika-parser-modules/tika-parser-multimedia-module/pom.xml @@ -56,31 +56,6 @@ <version>${commons.io.version}</version> </dependency> <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <version>${poi.version}</version> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-scratchpad</artifactId> - <version>${poi.version}</version> - </dependency> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - <version>${poi.version}</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.googlecode.mp4parser</groupId> <artifactId>isoparser</artifactId> <version>${isoparser.version}</version> http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/BPGParser.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/BPGParser.java b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/BPGParser.java index 2a48a55..142b863 100644 --- a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/BPGParser.java +++ b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/BPGParser.java @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.poi.util.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; import org.apache.tika.io.EndianUtils; import org.apache.tika.metadata.Metadata; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java index e321b95..447da73 100644 --- a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java +++ b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/ImageMetadataExtractor.java @@ -49,7 +49,7 @@ import com.drew.metadata.iptc.IptcDirectory; import com.drew.metadata.jpeg.JpegCommentDirectory; import com.drew.metadata.jpeg.JpegDirectory; import com.drew.metadata.xmp.XmpReader; -import org.apache.poi.util.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.IPTC; import org.apache.tika.metadata.Metadata; http://git-wip-us.apache.org/repos/asf/tika/blob/05f4af30/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/PSDParser.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/PSDParser.java b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/PSDParser.java index 9eb6eea..89d4a94 100644 --- a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/PSDParser.java +++ b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/parser/image/PSDParser.java @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.poi.util.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; import org.apache.tika.io.EndianUtils; import org.apache.tika.metadata.Metadata;
