Added: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/io/NullOutputStream.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/io/NullOutputStream.java?rev=788359&view=auto ============================================================================== --- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/io/NullOutputStream.java (added) +++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/io/NullOutputStream.java Thu Jun 25 13:52:29 2009 @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tika.io; + +import java.io.IOException; +import java.io.OutputStream; + +/** + * This OutputStream writes all data to the famous <b>/dev/null</b>. + * <p> + * This output stream has no destination (file/socket etc.) and all + * bytes written to it are ignored and lost. + * + * @author Jeremias Maerki + * @since Apache Tika 0.4, copied from Commons IO 1.4 + */ +public class NullOutputStream extends OutputStream { + + /** + * A singleton. + */ + public static final NullOutputStream NULL_OUTPUT_STREAM = new NullOutputStream(); + + /** + * Does nothing - output to <code>/dev/null</code>. + * @param b The bytes to write + * @param off The start offset + * @param len The number of bytes to write + */ + @Override + public void write(byte[] b, int off, int len) { + //to /dev/null + } + + /** + * Does nothing - output to <code>/dev/null</code>. + * @param b The byte to write + */ + @Override + public void write(int b) { + //to /dev/null + } + + /** + * Does nothing - output to <code>/dev/null</code>. + * @param b The bytes to write + * @throws IOException never + */ + @Override + public void write(byte[] b) throws IOException { + //to /dev/null + } + +}
Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java (original) +++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/io/TaggedIOException.java Thu Jun 25 13:52:29 2009 @@ -18,8 +18,6 @@ import java.io.IOException; -import org.apache.commons.io.IOExceptionWithCause; - /** * An {...@link IOException} wrapper that tags the wrapped exception with * a given object reference. Both the tag and the wrapped original exception Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java (original) +++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java Thu Jun 25 13:52:29 2009 @@ -20,9 +20,9 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.commons.io.input.CountingInputStream; import org.apache.tika.config.TikaConfig; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CountingInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.mime.MimeTypes; Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java (original) +++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java Thu Jun 25 13:52:29 2009 @@ -22,9 +22,9 @@ import java.io.OutputStream; import java.io.Reader; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.output.NullOutputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.IOUtils; +import org.apache.tika.io.NullOutputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.sax.XHTMLContentHandler; import org.xml.sax.ContentHandler; Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java (original) +++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/OfflineContentHandler.java Thu Jun 25 13:52:29 2009 @@ -16,7 +16,7 @@ */ package org.apache.tika.sax; -import org.apache.commons.io.input.ClosedInputStream; +import org.apache.tika.io.ClosedInputStream; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; @@ -39,7 +39,7 @@ */ @Override public InputSource resolveEntity(String publicId, String systemId) { - return new InputSource(ClosedInputStream.CLOSED_INPUT_STREAM); + return new InputSource(new ClosedInputStream()); } } Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/SecureContentHandler.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/SecureContentHandler.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/SecureContentHandler.java (original) +++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/SecureContentHandler.java Thu Jun 25 13:52:29 2009 @@ -16,8 +16,8 @@ */ package org.apache.tika.sax; -import org.apache.commons.io.input.CountingInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CountingInputStream; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: lucene/tika/trunk/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java (original) +++ lucene/tika/trunk/tika-core/src/test/java/org/apache/tika/sax/SecureContentHandlerTest.java Thu Jun 25 13:52:29 2009 @@ -18,8 +18,8 @@ import java.io.IOException; -import org.apache.commons.io.input.CountingInputStream; -import org.apache.commons.io.input.NullInputStream; +import org.apache.tika.io.CountingInputStream; +import org.apache.tika.io.NullInputStream; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java Thu Jun 25 13:52:29 2009 @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.Parser; import org.apache.tika.sax.TeeContentHandler; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java Thu Jun 25 13:52:29 2009 @@ -16,15 +16,15 @@ */ package org.apache.tika.parser.image; -import java.io.IOException; + import java.io.IOException; import java.io.InputStream; import java.util.Iterator; import javax.imageio.ImageIO; import javax.imageio.ImageReader; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.Parser; import org.apache.tika.sax.XHTMLContentHandler; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/opendocument/OpenOfficeContentParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/opendocument/OpenOfficeContentParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/opendocument/OpenOfficeContentParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/opendocument/OpenOfficeContentParser.java Thu Jun 25 13:52:29 2009 @@ -29,8 +29,8 @@ import javax.xml.parsers.SAXParserFactory; import javax.xml.namespace.QName; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.Parser; import org.apache.tika.sax.ElementMappingContentHandler; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/opendocument/OpenOfficeParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/opendocument/OpenOfficeParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/opendocument/OpenOfficeParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/opendocument/OpenOfficeParser.java Thu Jun 25 13:52:29 2009 @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.tika.parser.opendocument; import java.io.IOException; @@ -22,8 +21,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import org.apache.commons.io.IOUtils; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.IOUtils; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.Parser; import org.xml.sax.ContentHandler; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDF2XHTML.java Thu Jun 25 13:52:29 2009 @@ -18,8 +18,8 @@ import java.io.IOException; -import org.apache.commons.io.IOExceptionWithCause; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.IOExceptionWithCause; import org.apache.tika.metadata.Metadata; import org.apache.tika.sax.XHTMLContentHandler; import org.pdfbox.pdmodel.PDDocument; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ArParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ArParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ArParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ArParser.java Thu Jun 25 13:52:29 2009 @@ -20,8 +20,8 @@ import java.io.InputStream; import org.apache.commons.compress.archivers.ar.ArArchiveInputStream; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/Bzip2Parser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/Bzip2Parser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/Bzip2Parser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/Bzip2Parser.java Thu Jun 25 13:52:29 2009 @@ -20,8 +20,8 @@ import java.io.InputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.DelegatingParser; import org.apache.tika.sax.BodyContentHandler; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CpioParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CpioParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CpioParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CpioParser.java Thu Jun 25 13:52:29 2009 @@ -20,8 +20,8 @@ import java.io.InputStream; import org.apache.commons.compress.archivers.cpio.CpioArchiveInputStream; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/GzipParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/GzipParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/GzipParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/GzipParser.java Thu Jun 25 13:52:29 2009 @@ -21,8 +21,8 @@ import java.util.zip.GZIPInputStream; import org.apache.commons.compress.compressors.gzip.GzipUtils; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.DelegatingParser; import org.apache.tika.sax.BodyContentHandler; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java Thu Jun 25 13:52:29 2009 @@ -21,8 +21,8 @@ import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveInputStream; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.DelegatingParser; import org.apache.tika.sax.BodyContentHandler; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/TarParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/TarParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/TarParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/TarParser.java Thu Jun 25 13:52:29 2009 @@ -20,8 +20,8 @@ import java.io.InputStream; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipParser.java Thu Jun 25 13:52:29 2009 @@ -20,8 +20,8 @@ import java.io.InputStream; import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java?rev=788359&r1=788358&r2=788359&view=diff ============================================================================== --- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java (original) +++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java Thu Jun 25 13:52:29 2009 @@ -24,8 +24,8 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.tika.exception.TikaException; +import org.apache.tika.io.CloseShieldInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.Parser; import org.apache.tika.sax.OfflineContentHandler;
