This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4628
in repository https://gitbox.apache.org/repos/asf/tika.git
from c8c908f40a TIKA-4628 -- git add <face-palm/>
add 5e21b45b3c TIKA-4626 (#2545)
add daa116419a Merge remote-tracking branch 'origin/main' into TIKA-4628
No new revisions were added by this update.
Summary of changes:
docs/migrating-tika-server-4x.adoc | 149 +++++
.../org/apache/tika/parser/PasswordProvider.java | 4 +-
.../apache/tika/parser/SimplePasswordProvider.java | 2 +
.../apache/tika/pipes/core/EmitStrategyConfig.java | 24 +-
.../tika/pipes/core/EmitStrategyOverride.java | 82 ---
.../org/apache/tika/pipes/core/PipesClient.java | 1 +
.../org/apache/tika/pipes/core/PipesConfig.java | 29 +-
.../apache/tika/pipes/core/server/EmitHandler.java | 10 +-
.../tika/pipes/core/server/ParseHandler.java | 8 +
.../apache/tika/pipes/core/server/PipesServer.java | 1 +
.../apache/tika/pipes/core/server/PipesWorker.java | 12 +-
.../server/core/DefaultInputStreamFactory.java | 37 --
.../tika/server/core/FetcherStreamFactory.java | 140 ----
.../tika/server/core/InputStreamFactory.java | 38 --
.../org/apache/tika/server/core/ServerStatus.java | 79 +--
.../tika/server/core/ServerStatusWatcher.java | 84 ---
.../org/apache/tika/server/core/TaskStatus.java | 20 +-
.../apache/tika/server/core/TikaServerConfig.java | 60 +-
.../apache/tika/server/core/TikaServerProcess.java | 201 +++---
.../server/core/resource/DetectorResource.java | 6 +-
.../server/core/resource/MetadataResource.java | 4 +-
.../server/core/resource/PipesParsingHelper.java | 236 +++++++
.../core/resource/RecursiveMetadataResource.java | 130 ++--
.../tika/server/core/resource/TikaResource.java | 685 +++++++++++---------
.../server/core/resource/TikaServerStatus.java | 3 +-
.../tika/server/core/resource/TikaVersion.java | 1 -
.../tika/server/core/resource/TikaWelcome.java | 3 -
.../server/core/resource/TranslateResource.java | 13 +-
.../server/core/resource/UnpackerResource.java | 4 +-
.../main/resources/tika-server-config-default.xml | 8 -
.../org/apache/tika/server/core/CXFTestBase.java | 126 +++-
.../apache/tika/server/core/ServerStatusTest.java | 5 +-
.../apache/tika/server/core/StackTraceOffTest.java | 163 -----
.../apache/tika/server/core/StackTraceTest.java | 36 +-
.../org/apache/tika/server/core/TikaPipesTest.java | 12 -
.../tika/server/core/TikaResourceFetcherTest.java | 160 -----
.../core/TikaResourceMetadataFilterTest.java | 79 ---
.../tika/server/core/TikaResourceNoStackTest.java | 98 ---
.../apache/tika/server/core/TikaResourceTest.java | 74 +--
.../tika/server/core/TikaServerConfigTest.java | 2 -
.../server/core/TikaServerIntegrationTest.java | 134 ++--
.../tika/server/core/TranslateResourceTest.java | 2 +-
.../server/core/benchmark/TikaServerBenchmark.java | 716 +++++++++++++++++++++
.../resources/configs/cxf-test-base-template.json | 2 -
.../configs/tika-config-server-basic.json | 20 +-
.../configs/tika-config-server-emitter.json | 19 +-
.../tika-config-server-fetcher-template.json | 19 +-
.../tika-config-server-fetchers-emitters.json | 14 +-
.../configs/tika-config-server-pipes-basic.json | 25 +
.../configs/tika-config-server-timeout-5000.json | 7 -
.../tika-config-server-tls-one-way-template.json | 20 +-
.../tika-config-server-tls-two-way-template.json | 20 +-
.../resources/configs/tika-config-server-tls.json | 15 +-
.../test/resources/configs/tika-config-server.json | 15 +-
tika-server/tika-server-standard/pom.xml | 11 +-
.../src/main/assembly/assembly.xml | 4 +
.../standard/resource/XMPMetadataResource.java | 3 +-
.../apache/tika/server/standard/FetcherTest.java | 107 ---
.../server/standard/JsonMaxFieldLengthTest.java | 8 +-
.../server/standard/OpenNLPMetadataFilterTest.java | 8 +-
.../standard/OptimaizeMetadataFilterTest.java | 8 +-
.../standard/RecursiveMetadataResourceTest.java | 35 +-
.../apache/tika/server/standard/TikaPipesTest.java | 7 +-
.../tika/server/standard/TikaResourceTest.java | 172 ++---
.../configs/tika-config-for-server-tests.json | 14 +-
.../test/resources/configs/tika-config-json.json | 15 +-
.../tika-config-langdetect-opennlp-filter.json | 14 +-
.../tika-config-langdetect-optimaize-filter.json | 14 +-
68 files changed, 2291 insertions(+), 1986 deletions(-)
create mode 100644 docs/migrating-tika-server-4x.adoc
delete mode 100644
tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/EmitStrategyOverride.java
delete mode 100644
tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java
delete mode 100644
tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java
delete mode 100644
tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java
delete mode 100644
tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ServerStatusWatcher.java
create mode 100644
tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesParsingHelper.java
delete mode 100644
tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
delete mode 100644
tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java
delete mode 100644
tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java
delete mode 100644
tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java
create mode 100644
tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/benchmark/TikaServerBenchmark.java
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-pipes-basic.json
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-timeout-5000.json
delete mode 100644
tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java