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 2018/05/31 19:39:23 UTC

[tika] 01/02: Merge remote-tracking branch 'origin/master' into TIKA-2653

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

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

commit cb1bbc052188bf5e45e5dc17570180df1fe27df9
Merge: 56ff337 5ae7cc5
Author: tballison <ta...@mitre.org>
AuthorDate: Thu May 31 15:25:08 2018 -0400

    Merge remote-tracking branch 'origin/master' into TIKA-2653
    
    # Conflicts:
    #	tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
    #	tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java

 .../main/java/org/apache/tika/fork/ForkClient.java |  10 +-
 .../main/java/org/apache/tika/fork/ForkParser.java |  44 ++-
 .../main/java/org/apache/tika/fork/ForkServer.java |   1 -
 .../fork/RecursiveMetadataContentHandlerProxy.java | 147 ++++++++
 .../RecursiveMetadataContentHandlerResource.java   |  87 +++++
 .../apache/tika/parser/RecursiveParserWrapper.java |   3 +
 .../sax/AbstractRecursiveParserWrapperHandler.java |   6 +-
 .../org/apache/tika/sax/ContentHandlerFactory.java |   3 +-
 .../tika/sax/RecursiveParserWrapperHandler.java    |   4 +-
 .../org/apache/tika/sax/XHTMLContentHandler.java   |   7 +-
 .../java/org/apache/tika/fork/ForkParserTest.java  | 378 ++++++++++++++++++++-
 .../org/apache/tika/fork/basic_embedded.xml        |  35 ++
 .../org/apache/tika/fork/embedded_then_npe.xml     |  36 ++
 .../org/apache/tika/fork/embedded_with_npe.xml     |  37 ++
 .../org/apache/tika/parser/audio/AudioParser.java  |  16 +
 .../org/apache/tika/parser/html/HtmlHandler.java   |   3 +
 .../apache/tika/parser/html/HtmlParserTest.java    |  21 +-
 17 files changed, 827 insertions(+), 11 deletions(-)

diff --cc tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
index 8a76b2a,0dffd08..fc86784
--- a/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
+++ b/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
@@@ -34,7 -33,8 +34,9 @@@ import java.util.zip.ZipEntry
  
  import org.apache.tika.exception.TikaException;
  import org.apache.tika.io.IOUtils;
 +import org.apache.tika.utils.ProcessUtils;
+ import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
+ import org.apache.tika.sax.RecursiveParserWrapperHandler;
  import org.xml.sax.ContentHandler;
  
  class ForkClient {
diff --cc tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
index 7c6544f,029fcee..1759d5b
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
@@@ -21,24 -21,47 +21,48 @@@ import static org.junit.Assert.assertTr
  import static org.junit.Assert.fail;
  
  import java.io.ByteArrayInputStream;
+ import java.io.File;
  import java.io.IOException;
  import java.io.InputStream;
+ import java.io.OutputStream;
  import java.io.PipedInputStream;
  import java.io.PipedOutputStream;
+ import java.io.Reader;
+ import java.io.Serializable;
+ import java.io.StringWriter;
+ import java.io.UnsupportedEncodingException;
+ import java.nio.charset.Charset;
  import java.nio.charset.StandardCharsets;
 +import java.nio.file.Paths;
+ import java.nio.file.Files;
+ import java.nio.file.Path;
+ import java.util.ArrayList;
+ import java.util.LinkedList;
+ import java.util.List;
  import java.util.concurrent.Semaphore;
  
+ import org.apache.tika.TikaTest;
  import org.apache.tika.exception.TikaException;
+ import org.apache.tika.io.IOUtils;
  import org.apache.tika.metadata.Metadata;
+ import org.apache.tika.metadata.TikaCoreProperties;
+ import org.apache.tika.parser.AutoDetectParser;
  import org.apache.tika.parser.ParseContext;
+ import org.apache.tika.parser.Parser;
+ import org.apache.tika.parser.RecursiveParserWrapper;
  import org.apache.tika.parser.mock.MockParser;
+ import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
+ import org.apache.tika.sax.BasicContentHandlerFactory;
  import org.apache.tika.sax.BodyContentHandler;
+ import org.apache.tika.sax.ContentHandlerFactory;
+ import org.apache.tika.sax.RecursiveParserWrapperHandler;
+ import org.apache.tika.sax.ToTextContentHandler;
  import org.junit.Test;
  import org.xml.sax.ContentHandler;
+ import org.xml.sax.SAXException;
  import org.xml.sax.helpers.DefaultHandler;
  
- public class ForkParserTest {
+ public class ForkParserTest extends TikaTest {
  
      @Test
      public void testHelloWorld() throws Exception {

-- 
To stop receiving notification emails like this one, please contact
tallison@apache.org.