Repository: tika Updated Branches: refs/heads/2.x 04d8c5cd9 -> 28dcca907
TIKA-1915 - Remove POI from Code Module Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/28dcca90 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/28dcca90 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/28dcca90 Branch: refs/heads/2.x Commit: 28dcca907fb71cfdbe3abc20be02a7fcab67b98c Parents: 04d8c5c Author: Bob Paulin <[email protected]> Authored: Wed Mar 30 21:46:55 2016 -0500 Committer: Bob Paulin <[email protected]> Committed: Wed Mar 30 21:46:55 2016 -0500 ---------------------------------------------------------------------- .../tika-parser-code-bundle/pom.xml | 3 +-- .../tika-parser-code-module/pom.xml | 5 ----- .../tika/parser/executable/ExecutableParser.java | 19 +++++++++---------- 3 files changed, 10 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/28dcca90/tika-parser-bundles/tika-parser-code-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-bundles/tika-parser-code-bundle/pom.xml b/tika-parser-bundles/tika-parser-code-bundle/pom.xml index c900de4..fcf4757 100644 --- a/tika-parser-bundles/tika-parser-code-bundle/pom.xml +++ b/tika-parser-bundles/tika-parser-code-bundle/pom.xml @@ -47,8 +47,7 @@ tagsoup;inline=true, jhighlight;inline=true, commons-io;inline=true, - commons-codec;inline=true, - poi;inline=true + commons-codec;inline=true </Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> <Export-Package> http://git-wip-us.apache.org/repos/asf/tika/blob/28dcca90/tika-parser-modules/tika-parser-code-module/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-code-module/pom.xml b/tika-parser-modules/tika-parser-code-module/pom.xml index c74455a..cf59c0e 100644 --- a/tika-parser-modules/tika-parser-code-module/pom.xml +++ b/tika-parser-modules/tika-parser-code-module/pom.xml @@ -50,11 +50,6 @@ <version>${commons.io.version}</version> </dependency> <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <version>${poi.version}</version> - </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>tika-parser-text-module</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/tika/blob/28dcca90/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java b/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java index 9ba3cc8..674f54f 100644 --- a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java +++ b/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/parser/executable/ExecutableParser.java @@ -24,8 +24,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.poi.util.IOUtils; -import org.apache.poi.util.LittleEndian; +import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; import org.apache.tika.io.EndianUtils; import org.apache.tika.metadata.Metadata; @@ -95,7 +94,7 @@ public class ExecutableParser extends AbstractParser implements MachineMetadata IOUtils.readFully(stream, msdosSection); // Grab the PE header offset - int peOffset = LittleEndian.readInt(stream); + int peOffset = EndianUtils.readIntLE(stream); // Sanity check - while it may go anywhere, it's normally in the first few kb if (peOffset > 4096 || peOffset < 0x3f) return; @@ -117,13 +116,13 @@ public class ExecutableParser extends AbstractParser implements MachineMetadata } // Read the header values - int machine = LittleEndian.getUShort(pe, 4); - int numSectors = LittleEndian.getUShort(pe, 6); - long createdAt = LittleEndian.getInt(pe, 8); - long symbolTableOffset = LittleEndian.getInt(pe, 12); - long numSymbols = LittleEndian.getInt(pe, 16); - int sizeOptHdrs = LittleEndian.getUShort(pe, 20); - int characteristcs = LittleEndian.getUShort(pe, 22); + int machine = EndianUtils.getUShortLE(pe, 4); + int numSectors = EndianUtils.getUShortLE(pe, 6); + long createdAt = EndianUtils.getIntLE(pe, 8); + long symbolTableOffset = EndianUtils.getIntLE(pe, 12); + long numSymbols = EndianUtils.getIntLE(pe, 16); + int sizeOptHdrs = EndianUtils.getUShortLE(pe, 20); + int characteristcs = EndianUtils.getUShortLE(pe, 22); // Turn this into helpful metadata Date createdAtD = new Date(createdAt*1000l);
