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 2016/06/15 17:33:19 UTC
[09/10] tika git commit: Merge remote-tracking branch 'origin/master'
into TIKA-1508
Merge remote-tracking branch 'origin/master' into TIKA-1508
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/d9dcd59a
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/d9dcd59a
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/d9dcd59a
Branch: refs/heads/TIKA-1508
Commit: d9dcd59ae01c6ae2c8bded94bc9b04d795face9e
Parents: 03d3824 ade60ed
Author: tballison <ta...@mitre.org>
Authored: Wed Jun 15 12:42:28 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Wed Jun 15 12:42:28 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 7 ++
.../org/apache/tika/mime/tika-mimetypes.xml | 41 +++++++++-
.../java/org/apache/tika/TikaDetectionTest.java | 2 +-
.../parser/microsoft/MSOwnerFileParser.java | 81 +++++++++++++++++++
.../services/org.apache.tika.parser.Parser | 1 +
.../org/apache/tika/mime/TestMimeTypes.java | 33 +++++++-
.../parser/microsoft/MSOwnerFileParserTest.java | 31 +++++++
.../test/resources/test-documents/testDJVU.djvu | Bin 0 -> 89 bytes
.../test-documents/testEndNoteImportFile.enw | 10 +++
.../resources/test-documents/testICalendar.ics | 15 ++++
.../resources/test-documents/testMSOwnerFile | Bin 0 -> 162 bytes
.../resources/test-documents/testVCalendar.vcs | 10 +++
.../test-documents/testWindowsMediaMeta.asx | 6 ++
13 files changed, 234 insertions(+), 3 deletions(-)
----------------------------------------------------------------------