Repository: tika Updated Branches: refs/heads/master 7555b136d -> 0d54f07fa
TIKA-2181 - upgrade to POI 3.16.beta2 Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/0d54f07f Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/0d54f07f Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/0d54f07f Branch: refs/heads/master Commit: 0d54f07facb23219a11f763e4c56cd40ec2bcd77 Parents: 7555b13 Author: tballison <[email protected]> Authored: Mon Feb 6 09:20:40 2017 -0500 Committer: tballison <[email protected]> Committed: Mon Feb 6 09:20:40 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- tika-bundle/pom.xml | 1 + tika-parsers/pom.xml | 2 +- .../tika/parser/microsoft/OutlookExtractor.java | 20 +++++++++----------- 4 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/0d54f07f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4256c69..bfe817d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -53,7 +53,7 @@ Release 1.15 - ?? * Add mime detection and parser for Word 2006ML format (TIKA-2179). - * Upgrade to POI 3.16-beta1 (TIKA-2116). + * Upgrade to POI 3.16-beta2 (TIKA-2116, TIKA-2181). * Allow configuration of timeout for ForkParser (TIKA-2170). http://git-wip-us.apache.org/repos/asf/tika/blob/0d54f07f/tika-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml index 069e26d..4e04451 100644 --- a/tika-bundle/pom.xml +++ b/tika-bundle/pom.xml @@ -221,6 +221,7 @@ org.apache.xml.resolver.tools;resolution:=optional, org.apache.xml.security;resolution:=optional, org.apache.xml.security.c14n;resolution:=optional, + org.apache.xml.security.signature;resolution:=optional, org.apache.xml.security.utils;resolution:=optional, org.apache.xmlbeans.impl.xpath.saxon;resolution:=optional, org.apache.xmlbeans.impl.xquery.saxon;resolution:=optional, http://git-wip-us.apache.org/repos/asf/tika/blob/0d54f07f/tika-parsers/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml index b64e1a3..c7debb8 100644 --- a/tika-parsers/pom.xml +++ b/tika-parsers/pom.xml @@ -35,7 +35,7 @@ <url>http://tika.apache.org/</url> <properties> - <poi.version>3.16-beta1</poi.version> + <poi.version>3.16-beta2</poi.version> <!-- NOTE: sync codec version with POI --> <codec.version>1.10</codec.version> <!-- NOTE: sync tukaani version with commons-compress in tika-parent--> http://git-wip-us.apache.org/repos/asf/tika/blob/0d54f07f/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java index 76ac17f..9818d30 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java @@ -36,8 +36,6 @@ import java.util.regex.Pattern; import org.apache.james.mime4j.codec.DecodeMonitor; import org.apache.james.mime4j.codec.DecoderUtil; -import org.apache.james.mime4j.dom.field.ParsedField; -import org.apache.james.mime4j.field.LenientFieldParser; import org.apache.poi.hmef.attribute.MAPIRtfAttribute; import org.apache.poi.hsmf.MAPIMessage; import org.apache.poi.hsmf.datatypes.AttachmentChunks; @@ -256,25 +254,25 @@ public class OutlookExtractor extends AbstractPOIFSExtractor { xhtml.startElement("div", "class", "attachment-entry"); String filename = null; - if (attachment.attachLongFileName != null) { - filename = attachment.attachLongFileName.getValue(); - } else if (attachment.attachFileName != null) { - filename = attachment.attachFileName.getValue(); + if (attachment.getAttachLongFileName() != null) { + filename = attachment.getAttachLongFileName().getValue(); + } else if (attachment.getAttachFileName() != null) { + filename = attachment.getAttachFileName().getValue(); } if (filename != null && filename.length() > 0) { xhtml.element("h1", filename); } - if (attachment.attachData != null) { + if (attachment.getAttachData() != null) { handleEmbeddedResource( - TikaInputStream.get(attachment.attachData.getValue()), + TikaInputStream.get(attachment.getAttachData().getValue()), filename, null, null, xhtml, true ); } - if (attachment.attachmentDirectory != null) { + if (attachment.getAttachmentDirectory() != null) { handleEmbeddedOfficeDoc( - attachment.attachmentDirectory.getDirectory(), + attachment.getAttachmentDirectory().getDirectory(), xhtml ); } @@ -445,7 +443,7 @@ public class OutlookExtractor extends AbstractPOIFSExtractor { } catch(ChunkNotFoundException e) {} //absolute last resort, try charset detector - StringChunk text = mainChunks.textBodyChunk; + StringChunk text = mainChunks.getTextBodyChunk(); if (text != null) { CharsetDetector detector = new CharsetDetector(); detector.setText(text.getRawValue());
