Merge remote-tracking branch 'origin/TIKA-1508' 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/49ddf6e3 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/49ddf6e3 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/49ddf6e3 Branch: refs/heads/master Commit: 49ddf6e39615e8284a7c9e45e76a659725c0ad7a Parents: 1af1078 1202f45 Author: tballison <[email protected]> Authored: Fri Jun 3 15:09:33 2016 -0400 Committer: tballison <[email protected]> Committed: Fri Jun 3 15:09:33 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/tika/base/Configurable.java | 44 +++++ .../main/java/org/apache/tika/config/Field.java | 43 +++++ .../main/java/org/apache/tika/config/Param.java | 191 +++++++++++++++++++ .../java/org/apache/tika/config/ParamField.java | 158 +++++++++++++++ .../java/org/apache/tika/config/TikaConfig.java | 51 ++++- .../tika/exception/TikaConfigException.java | 39 ++++ .../org/apache/tika/parser/AbstractParser.java | 34 +++- .../apache/tika/parser/ConfigurableParser.java | 32 ++++ .../org/apache/tika/parser/ParseContext.java | 40 ++++ .../java/org/apache/tika/parser/Parser.java | 1 + .../org/apache/tika/utils/AnnotationUtils.java | 131 +++++++++++++ .../java/org/apache/tika/config/ParamTest.java | 71 +++++++ .../tika/parser/ConfigurableParserTest.java | 76 ++++++++ .../tika/parser/DummyConfigurableParser.java | 67 +++++++ .../tika/parser/DummyParametrizedParser.java | 97 ++++++++++ .../tika/parser/ParametrizedParserTest.java | 67 +++++++ .../apache/tika/utils/AnnotationUtilsTest.java | 190 ++++++++++++++++++ .../tika/config/TIKA-1508-configurable.xml | 37 ++++ .../tika/config/TIKA-1986-parametrized.xml | 37 ++++ 19 files changed, 1404 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
