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/02/19 03:29:18 UTC

[2/2] tika git commit: Merge remote-tracking branch 'origin/2.x' into 2.x

Merge remote-tracking branch 'origin/2.x' into 2.x


Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/67cb89a1
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/67cb89a1
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/67cb89a1

Branch: refs/heads/2.x
Commit: 67cb89a10e64999174aeba5856e06b146e2cf873
Parents: 8debbe1 6178e98
Author: tballison <ta...@mitre.org>
Authored: Thu Feb 18 21:28:12 2016 -0500
Committer: tballison <ta...@mitre.org>
Committed: Thu Feb 18 21:28:12 2016 -0500

----------------------------------------------------------------------
 tika-app/pom.xml                                |    5 +
 .../main/java/org/apache/tika/cli/TikaCLI.java  |   41 +-
 .../java/org/apache/tika/cli/TikaCLITest.java   |   12 -
 tika-core/pom.xml                               |    4 +-
 .../tika/language/LanguageIdentifier.java       |  240 --
 .../apache/tika/language/LanguageProfile.java   |  314 ---
 .../tika/language/LanguageProfilerBuilder.java  |  770 ------
 .../apache/tika/language/ProfilingHandler.java  |   67 -
 .../apache/tika/language/ProfilingWriter.java   |  103 -
 .../org/apache/tika/language/package-info.java  |   22 -
 .../tika/language/LanguageIdentifierTest.java   |  183 --
 .../tika/language/LanguageProfileTest.java      |   58 -
 .../language/LanguageProfilerBuilderTest.java   |  100 -
 .../tika/language/ProfilingWriterTest.java      |   44 -
 .../resources/org/apache/tika/language/da.test  |  108 -
 .../resources/org/apache/tika/language/de.test  |  104 -
 .../resources/org/apache/tika/language/el.test  |  109 -
 .../resources/org/apache/tika/language/en.test  |  105 -
 .../resources/org/apache/tika/language/es.test  |  107 -
 .../resources/org/apache/tika/language/et.test  |   17 -
 .../resources/org/apache/tika/language/fi.test  |  106 -
 .../resources/org/apache/tika/language/fr.test  |  105 -
 .../resources/org/apache/tika/language/it.test  |  109 -
 .../tika/language/langbuilder/welsh_corpus.txt  | 2602 ------------------
 .../resources/org/apache/tika/language/lt.test  |   32 -
 .../resources/org/apache/tika/language/nl.test  |  105 -
 .../resources/org/apache/tika/language/pt.test  |  105 -
 .../resources/org/apache/tika/language/sv.test  |  108 -
 tika-example/pom.xml                            |    5 +
 .../java/org/apache/tika/example/Language.java  |   32 +-
 .../tika/example/LanguageDetectingParser.java   |   15 +-
 .../tika/example/LanguageDetectorExample.java   |   33 +
 .../tika/example/LanguageIdentifierExample.java |   27 -
 .../org/apache/tika/example/MyFirstTika.java    |   14 +-
 .../example/LanguageDetectorExampleTest.java    |   39 +
 .../example/LanguageIdentifierExampleTest.java  |   37 -
 tika-langdetect/pom.xml                         |    2 +-
 .../tika/langdetect/LanguageConfidence.java     |    3 +-
 .../tika/langdetect/LanguageDetector.java       |    7 +-
 .../apache/tika/langdetect/LanguageHandler.java |   14 +
 .../apache/tika/langdetect/LanguageResult.java  |    7 +
 .../apache/tika/langdetect/LanguageWriter.java  |    9 +
 .../tika/langdetect/OptimaizeLangDetector.java  |   10 +-
 .../langdetect/OptimaizeLangDetectorTest.java   |    4 +-
 tika-parent/pom.xml                             |    5 +-
 tika-server/pom.xml                             |    5 +
 .../tika/server/resource/LanguageResource.java  |   27 +-
 .../tika/server/resource/MetadataResource.java  |    9 +-
 .../resource/RecursiveMetadataResource.java     |    7 +-
 .../tika/server/resource/TranslateResource.java |   23 +-
 tika-translate/pom.xml                          |    5 +
 .../language/translate/AbstractTranslator.java  |   16 +
 .../language/translate/CachedTranslator.java    |   26 +-
 .../language/translate/ExternalTranslator.java  |   13 +-
 .../language/translate/GoogleTranslator.java    |   20 +-
 .../language/translate/Lingo24Translator.java   |   20 +-
 .../language/translate/MosesTranslator.java     |    7 +-
 57 files changed, 272 insertions(+), 5954 deletions(-)
----------------------------------------------------------------------