Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 38B6B18E44 for ; Sun, 29 Nov 2015 15:23:31 +0000 (UTC) Received: (qmail 16215 invoked by uid 500); 29 Nov 2015 15:23:31 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 16189 invoked by uid 500); 29 Nov 2015 15:23:31 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 16180 invoked by uid 99); 29 Nov 2015 15:23:31 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Nov 2015 15:23:31 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id AEEB31A232B for ; Sun, 29 Nov 2015 15:23:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id jNc3gDYIt7Tb for ; Sun, 29 Nov 2015 15:23:24 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id D1962428E2 for ; Sun, 29 Nov 2015 15:23:23 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 53205E0280 for ; Sun, 29 Nov 2015 15:23:23 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 0D2FC3A0234 for ; Sun, 29 Nov 2015 15:23:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1717075 - in /pdfbox/trunk/preflight: ./ src/main/java/org/apache/pdfbox/preflight/ src/main/java/org/apache/pdfbox/preflight/font/ src/main/java/org/apache/pdfbox/preflight/font/descriptor/ src/main/java/org/apache/pdfbox/preflight/parser... Date: Sun, 29 Nov 2015 15:23:22 -0000 To: commits@pdfbox.apache.org From: lehmi@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151129152323.0D2FC3A0234@svn01-us-west.apache.org> Author: lehmi Date: Sun Nov 29 15:23:22 2015 New Revision: 1717075 URL: http://svn.apache.org/viewvc?rev=1717075&view=rev Log: PDFBOX-3137: reduce the dependency on commons.io in preflight to test Modified: pdfbox/trunk/preflight/pom.xml pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type0FontValidator.java pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ByteArrayDataSource.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorBavaria.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java Modified: pdfbox/trunk/preflight/pom.xml URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/pom.xml?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/pom.xml (original) +++ pdfbox/trunk/preflight/pom.xml Sun Nov 29 15:23:22 2015 @@ -173,7 +173,7 @@ commons-io commons-io - compile + test ${project.groupId} Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java Sun Nov 29 15:23:22 2015 @@ -39,7 +39,7 @@ import javax.xml.transform.TransformerFa import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.commons.io.IOUtils; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.preflight.ValidationResult.ValidationError; import org.apache.pdfbox.preflight.exception.SyntaxValidationException; import org.apache.pdfbox.preflight.parser.PreflightParser; Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type0FontValidator.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type0FontValidator.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type0FontValidator.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type0FontValidator.java Sun Nov 29 15:23:22 2015 @@ -39,7 +39,6 @@ import static org.apache.pdfbox.prefligh import java.io.IOException; import java.io.InputStream; -import org.apache.commons.io.IOUtils; import org.apache.fontbox.cmap.CMap; import org.apache.fontbox.cmap.CMapParser; import org.apache.pdfbox.cos.COSArray; @@ -48,6 +47,7 @@ import org.apache.pdfbox.cos.COSDictiona import org.apache.pdfbox.cos.COSDocument; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.cos.COSStream; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.pdmodel.font.PDCIDFontType0; import org.apache.pdfbox.pdmodel.font.PDCIDFontType2; import org.apache.pdfbox.pdmodel.font.PDFont; Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java Sun Nov 29 15:23:22 2015 @@ -45,10 +45,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.io.IOUtils; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.pdmodel.common.PDMetadata; import org.apache.pdfbox.pdmodel.common.PDStream; import org.apache.pdfbox.pdmodel.font.PDFont; @@ -282,7 +282,7 @@ public abstract class FontDescriptorHelp { bos = new ByteArrayOutputStream(); metaDataContent = metadata.createInputStream(); - IOUtils.copyLarge(metaDataContent, bos); + IOUtils.copy(metaDataContent, bos); result = bos.toByteArray(); } catch (IOException e) Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java Sun Nov 29 15:23:22 2015 @@ -33,7 +33,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.activation.DataSource; import javax.activation.FileDataSource; -import org.apache.commons.io.IOUtils; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDictionary; @@ -46,6 +45,7 @@ import org.apache.pdfbox.cos.COSObject; import org.apache.pdfbox.cos.COSObjectKey; import org.apache.pdfbox.cos.COSStream; import org.apache.pdfbox.cos.COSString; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.io.RandomAccessBufferedFileInputStream; import org.apache.pdfbox.pdfparser.PDFObjectStreamParser; import org.apache.pdfbox.pdfparser.PDFParser; Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/StreamValidationProcess.java Sun Nov 29 15:23:22 2015 @@ -31,13 +31,13 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -import org.apache.commons.io.IOUtils; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDocument; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.cos.COSObject; import org.apache.pdfbox.cos.COSStream; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.cos.COSObjectKey; import org.apache.pdfbox.preflight.PreflightContext; Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ByteArrayDataSource.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ByteArrayDataSource.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ByteArrayDataSource.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/ByteArrayDataSource.java Sun Nov 29 15:23:22 2015 @@ -29,7 +29,7 @@ import java.io.OutputStream; import javax.activation.DataSource; -import org.apache.commons.io.IOUtils; +import org.apache.pdfbox.io.IOUtils; public class ByteArrayDataSource implements DataSource { @@ -40,7 +40,7 @@ public class ByteArrayDataSource impleme public ByteArrayDataSource(InputStream is) throws IOException { data = new ByteArrayOutputStream(); - IOUtils.copyLarge(is, data); + IOUtils.copy(is, data); IOUtils.closeQuietly(is); } Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java Sun Nov 29 15:23:22 2015 @@ -30,7 +30,7 @@ import java.util.Date; import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.preflight.ValidationResult.ValidationError; import org.apache.pdfbox.preflight.parser.PreflightParser; Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorBavaria.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorBavaria.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorBavaria.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorBavaria.java Sun Nov 29 15:23:22 2015 @@ -34,7 +34,7 @@ import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.preflight.ValidationResult.ValidationError; import org.apache.pdfbox.preflight.exception.SyntaxValidationException; import org.apache.pdfbox.preflight.parser.PreflightParser; Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java Sun Nov 29 15:23:22 2015 @@ -25,9 +25,9 @@ import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.preflight.PreflightDocument; import org.apache.pdfbox.preflight.ValidationResult; import org.apache.pdfbox.preflight.ValidationResult.ValidationError; Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java Sun Nov 29 15:23:22 2015 @@ -31,9 +31,9 @@ import java.util.Properties; import java.util.StringTokenizer; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.pdfbox.io.IOUtils; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java Sun Nov 29 15:23:22 2015 @@ -31,9 +31,9 @@ import java.util.Properties; import java.util.StringTokenizer; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.pdfbox.io.IOUtils; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java?rev=1717075&r1=1717074&r2=1717075&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java Sun Nov 29 15:23:22 2015 @@ -29,9 +29,9 @@ import java.util.Collection; import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.preflight.PreflightDocument; import org.apache.pdfbox.preflight.ValidationResult; import org.apache.pdfbox.preflight.exception.ValidationException;