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/08/14 18:46:20 UTC
[08/15] tika git commit: Pulled upstream changes (TIKA-1508) and
resolved merge Conflicts
Pulled upstream changes (TIKA-1508) and resolved merge Conflicts
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/027625dd
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/027625dd
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/027625dd
Branch: refs/heads/TIKA-1508
Commit: 027625dd71fe9f5c33a546b7395aee744adb2ae0
Parents: 2a61205 4c7481e
Author: Thamme Gowda <th...@apache.org>
Authored: Wed Jun 15 14:24:13 2016 -0700
Committer: Thamme Gowda <th...@apache.org>
Committed: Wed Jun 15 14:24:13 2016 -0700
----------------------------------------------------------------------
CHANGES.txt | 12 ++
.../java/org/apache/tika/base/Configurable.java | 44 -----
.../main/java/org/apache/tika/config/Field.java | 4 +-
.../org/apache/tika/config/Initializable.java | 33 ++++
.../java/org/apache/tika/config/TikaConfig.java | 20 +--
.../org/apache/tika/parser/AbstractParser.java | 24 +--
.../apache/tika/parser/ConfigurableParser.java | 32 ----
.../org/apache/tika/parser/ParseContext.java | 40 -----
.../org/apache/tika/utils/AnnotationUtils.java | 20 ++-
.../org/apache/tika/mime/tika-mimetypes.xml | 41 ++++-
.../java/org/apache/tika/TikaDetectionTest.java | 2 +-
.../tika/parser/ConfigurableParserTest.java | 75 --------
.../tika/parser/DummyConfigurableParser.java | 67 -------
.../tika/parser/DummyInitializableParser.java | 68 +++++++
.../tika/parser/DummyParameterizedParser.java | 4 +-
.../tika/parser/InitializableParserTest.java | 45 +++++
.../tika/parser/ParameterizedParserTest.java | 3 +-
.../apache/tika/utils/AnnotationUtilsTest.java | 10 +-
.../tika/config/TIKA-1986-initializable.xml | 28 +++
.../tika/config/TIKA-1986-some-parameters.xml | 2 +-
tika-parsers/pom.xml | 2 +-
.../tika/parser/image/xmp/JempboxExtractor.java | 30 ++++
.../parser/microsoft/MSOwnerFileParser.java | 81 +++++++++
.../tika/parser/pdf/AbstractPDF2XHTML.java | 10 +-
.../org/apache/tika/parser/pdf/PDFParser.java | 37 ++--
.../apache/tika/parser/pdf/PDFParserConfig.java | 86 ++++++---
.../services/org.apache.tika.parser.Parser | 1 +
.../org/apache/tika/mime/TestMimeTypes.java | 33 +++-
.../parser/image/xmp/JempboxExtractorTest.java | 29 ++-
.../parser/microsoft/MSOwnerFileParserTest.java | 31 ++++
.../apache/tika/parser/pdf/PDFParserTest.java | 27 ++-
.../parser/pdf/tika-config-non-primitives.xml | 29 +++
.../org/apache/tika/parser/pdf/tika-config.xml | 1 -
.../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 +
.../test/resources/test-documents/testXMP.xmp | 178 +++++++++++++++++++
40 files changed, 820 insertions(+), 370 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/027625dd/tika-core/src/main/java/org/apache/tika/utils/AnnotationUtils.java
----------------------------------------------------------------------