[tika] branch branch_1x updated (0a3a8be -> c7bb0c9)

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a change to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git.


    from 0a3a8be  TIKA-2776 -- update CHANGES.txt
     add 9137249  TIKA-2784 -- MockParser should allow us to simulate a parser grabbing stdout/stderr during static initialization.
     add c7bb0c9  TIKA-2785 -- switch communication from child to parent to a shared memory-mapped file in -spawnChild mode in tika-server.

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt                                        |   3 +
 .../org/apache/tika/io/MappedBufferCleaner.java    | 159 ++++++++++++
 .../org/apache/tika/parser/mock/MockParser.java    |  51 +++-
 .../java/org/apache/tika/server/ServerStatus.java  |  16 +-
 .../apache/tika/server/ServerStatusWatcher.java    |  61 +++--
 .../org/apache/tika/server/ServerTimeouts.java     |  20 ++
 .../java/org/apache/tika/server/TikaServerCli.java |  26 +-
 .../org/apache/tika/server/TikaServerWatchDog.java | 274 +++++++++++++--------
 .../tika/server/TikaServerIntegrationTest.java     | 102 ++++++--
 .../src/test/resources/logging/log4j_child.xml     |   8 +-
 .../src/test/resources/mock/heavy_hand_100.xml     |  25 --
 .../src/test/resources/mock/heavy_hang_100.xml     |   2 +-
 .../{testStdOutErr.xml => testStaticStdOutErr.xml} |  10 +-
 13 files changed, 558 insertions(+), 199 deletions(-)
 create mode 100644 tika-core/src/main/java/org/apache/tika/io/MappedBufferCleaner.java
 delete mode 100644 tika-server/src/test/resources/mock/heavy_hand_100.xml
 copy tika-parsers/src/test/resources/test-documents/mock/sleep.xml => tika-server/src/test/resources/mock/heavy_hang_100.xml (93%)
 copy tika-server/src/test/resources/mock/{testStdOutErr.xml => testStaticStdOutErr.xml} (92%)