You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2016/03/02 06:42:17 UTC
[08/20] tika git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/f054bcd1
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/f054bcd1
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/f054bcd1
Branch: refs/heads/master
Commit: f054bcd1a0a57a730ebc53e7a2cfd4215a7526fb
Parents: 1b14b39 28b9a66
Author: manali <ma...@gmail.com>
Authored: Fri Feb 19 17:37:29 2016 -0800
Committer: manali <ma...@gmail.com>
Committed: Fri Feb 19 17:37:29 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 8 +
tika-bundle/pom.xml | 6 +-
.../apache/tika/metadata/TikaMetadataKeys.java | 2 +
.../org/apache/tika/mime/tika-mimetypes.xml | 17 +-
tika-parsers/pom.xml | 6 +-
.../microsoft/AbstractPOIFSExtractor.java | 16 +-
.../ooxml/XSLFPowerPointExtractorDecorator.java | 9 +-
.../tika/parser/pot/PooledTimeSeriesParser.java | 7 +
.../tika/parser/rtf/RTFEmbObjHandler.java | 2 +-
.../org/apache/tika/mime/TestMimeTypes.java | 25 +
.../microsoft/POIContainerExtractionTest.java | 36 +
.../parser/microsoft/PowerPointParserTest.java | 4 +-
.../apache/tika/parser/rtf/RTFParserTest.java | 9 +-
.../resources/test-documents/testJS_HTML.js | 91 +
.../test-documents/testPKCS17Sig-v2.xml.p7m | Bin 0 -> 9682 bytes
.../test-documents/testPKCS17Sig-v3.xml.p7m | 305 ++
.../test-documents/testPKCS17Sig-v4.xml.p7m | 1606 +++++++
.../test-documents/testPKCS17Sig.xml.p7m | 4333 ++++++++++++++++++
.../tika/server/resource/TikaResource.java | 14 +-
.../apache/tika/server/StackTraceOffTest.java | 2 -
.../org/apache/tika/server/StackTraceTest.java | 2 -
.../apache/tika/server/TikaResourceTest.java | 12 +
.../services/org.apache.tika.parser.Parser | 16 -
.../testRTF_npeFromWMFInTikaServer.rtf | 235 +
24 files changed, 6713 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/f054bcd1/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/f054bcd1/tika-parsers/pom.xml
----------------------------------------------------------------------