You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2017/02/06 14:23:33 UTC
tika git commit: TIKA 2181 upgrade to POI 3 16 beta2
Repository: tika
Updated Branches:
refs/heads/2.x 7b0655cc1 -> cf3996ed0
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/cf3996ed
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/cf3996ed
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/cf3996ed
Branch: refs/heads/2.x
Commit: cf3996ed0784fe1fd79371cc5854be57bbdeb360
Parents: 7b0655c
Author: tballison <ta...@mitre.org>
Authored: Mon Feb 6 09:21:02 2017 -0500
Committer: tballison <ta...@mitre.org>
Committed: Mon Feb 6 09:21:02 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../tika-parser-office-bundle/pom.xml | 1 +
tika-parser-modules/pom.xml | 2 +-
.../tika/parser/microsoft/OutlookExtractor.java | 18 +++++++++---------
4 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/cf3996ed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8d099b8..45e9651 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -62,7 +62,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/cf3996ed/tika-parser-bundles/tika-parser-office-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/tika-parser-bundles/tika-parser-office-bundle/pom.xml b/tika-parser-bundles/tika-parser-office-bundle/pom.xml
index 1ef8b05..7acddad 100644
--- a/tika-parser-bundles/tika-parser-office-bundle/pom.xml
+++ b/tika-parser-bundles/tika-parser-office-bundle/pom.xml
@@ -111,6 +111,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/cf3996ed/tika-parser-modules/pom.xml
----------------------------------------------------------------------
diff --git a/tika-parser-modules/pom.xml b/tika-parser-modules/pom.xml
index cfa1109..af70259 100644
--- a/tika-parser-modules/pom.xml
+++ b/tika-parser-modules/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>
<pdfbox.version>2.0.4</pdfbox.version>
http://git-wip-us.apache.org/repos/asf/tika/blob/cf3996ed/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java b/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
index 17d45d2..8285149 100644
--- a/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
+++ b/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
@@ -260,25 +260,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
);
}
@@ -449,7 +449,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());