Merge branch 'TIKA-1508'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/afb7e364 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/afb7e364 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/afb7e364 Branch: refs/heads/master Commit: afb7e3643a61e9dc6c4921b12bc145b1be4e1402 Parents: 5495ffc 52be425 Author: Chris Mattmann <[email protected]> Authored: Sun Aug 14 11:46:30 2016 -0700 Committer: Chris Mattmann <[email protected]> Committed: Sun Aug 14 11:46:30 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/tika/config/Field.java | 45 +++ .../org/apache/tika/config/Initializable.java | 33 ++ .../main/java/org/apache/tika/config/Param.java | 191 +++++++++++ .../java/org/apache/tika/config/ParamField.java | 158 +++++++++ .../java/org/apache/tika/config/TikaConfig.java | 47 ++- .../tika/exception/TikaConfigException.java | 39 +++ .../org/apache/tika/parser/AbstractParser.java | 10 + .../java/org/apache/tika/parser/Parser.java | 1 + .../tika/parser/external/ExternalParser.java | 85 ++++- .../org/apache/tika/utils/AnnotationUtils.java | 138 ++++++++ .../apache/tika/utils/ServiceLoaderUtils.java | 30 ++ .../java/org/apache/tika/config/ParamTest.java | 71 +++++ .../tika/parser/DummyInitializableParser.java | 68 ++++ .../tika/parser/DummyParameterizedParser.java | 113 +++++++ .../tika/parser/InitializableParserTest.java | 45 +++ .../tika/parser/ParameterizedParserTest.java | 125 ++++++++ .../apache/tika/utils/AnnotationUtilsTest.java | 190 +++++++++++ .../tika/config/TIKA-1508-configurable.xml | 37 +++ .../tika/config/TIKA-1986-bad-parameters.xml | 26 ++ .../apache/tika/config/TIKA-1986-bad-types.xml | 26 ++ .../apache/tika/config/TIKA-1986-bad-values.xml | 26 ++ .../tika/config/TIKA-1986-initializable.xml | 28 ++ .../TIKA-1986-parameterized-decorated.xml | 39 +++ .../tika/config/TIKA-1986-parameterized.xml | 38 +++ .../tika/config/TIKA-1986-some-parameters.xml | 28 ++ .../tika/parser/pdf/AbstractPDF2XHTML.java | 10 +- .../org/apache/tika/parser/pdf/PDF2XHTML.java | 1 - .../org/apache/tika/parser/pdf/PDFParser.java | 28 +- .../apache/tika/parser/pdf/PDFParserConfig.java | 86 +++-- .../parser/recognition/ObjectRecogniser.java | 75 +++++ .../recognition/ObjectRecognitionParser.java | 171 ++++++++++ .../parser/recognition/RecognisedObject.java | 91 ++++++ .../tf/TensorflowImageRecParser.java | 152 +++++++++ .../tf/TensorflowRESTRecogniser.java | 142 +++++++++ .../recognition/tf/InceptionRestDockerfile | 41 +++ .../parser/recognition/tf/classify_image.py | 212 ++++++++++++ .../tika/parser/recognition/tf/inceptionapi.py | 319 +++++++++++++++++++ .../apache/tika/parser/pdf/PDFParserTest.java | 41 ++- .../ObjectRecognitionParserTest.java | 89 ++++++ .../tf/TensorflowImageRecParserTest.java | 58 ++++ .../parser/pdf/tika-config-non-primitives.xml | 29 ++ .../org/apache/tika/parser/pdf/tika-config.xml | 26 ++ .../recognition/tika-config-tflow-rest.xml | 30 ++ .../parser/recognition/tika-config-tflow.xml | 29 ++ 44 files changed, 3207 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/afb7e364/tika-parsers/src/main/java/org/apache/tika/parser/pdf/AbstractPDF2XHTML.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/afb7e364/tika-parsers/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java ----------------------------------------------------------------------
