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 2021/02/11 15:49:01 UTC
[tika] 01/01: Merge remote-tracking branch 'origin/TIKA-3293' into
main
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 0a8cec956667d5d36fba861c1c2b576b503490aa
Merge: 8239a25 918aff0
Author: tballison <ta...@apache.org>
AuthorDate: Thu Feb 11 10:48:35 2021 -0500
Merge remote-tracking branch 'origin/TIKA-3293' into main
.../tika/server/core/ServerStatusWatcher.java | 46 +-
.../tika/server/core/ServerTimeoutConfig.java | 136 -----
.../org/apache/tika/server/core/TikaServerCli.java | 286 +++------
.../apache/tika/server/core/TikaServerConfig.java | 645 +++++++++++++++++++++
.../apache/tika/server/core/TikaServerProcess.java | 318 +++++-----
.../tika/server/core/TikaServerWatchDog.java | 163 ++----
.../tika/server/core/resource/EmitterResource.java | 4 +-
.../core/writer/MetadataListMessageBodyWriter.java | 1 -
.../main/resources/tika-server-config-default.xml | 97 ++++
.../org/apache/tika/server/core/CXFTestBase.java | 2 +-
.../tika/server/core/IntegrationTestBase.java | 61 +-
.../core/TikaServerAsyncIntegrationTest.java | 27 -
.../tika/server/core/TikaServerConfigTest.java | 28 +
.../core/TikaServerEmitterIntegrationTest.java | 184 ++----
.../server/core/TikaServerIntegrationTest.java | 436 ++++++--------
.../configs/tika-config-server-badjvmargs.xml | 31 +
.../resources/configs/tika-config-server-basic.xml | 31 +
.../configs/tika-config-server-emitter.xml | 33 ++
.../configs/tika-config-server-timeout-10000.xml | 28 +
.../test/resources/configs/tika-config-server.xml | 29 +
.../src/test/resources/log4j.properties | 6 +-
21 files changed, 1506 insertions(+), 1086 deletions(-)