Author: tilman
Date: Thu Jun 19 05:49:28 2014
New Revision: 1603718
URL: http://svn.apache.org/r1603718
Log:
PDFBOX-2151: Replace log4j with commons logging, as suggested by Simon Steiner
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartor.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/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java?rev=1603718&r1=1603717&r2=1603718&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java
(original)
+++
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/Type1Parser.java
Thu Jun 19 05:49:28 2014
@@ -34,9 +34,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.fontbox.cff.Type1CharStringParser;
import org.apache.fontbox.cff.Type1FontUtil;
-import org.apache.log4j.Logger;
import org.apache.pdfbox.encoding.Encoding;
import org.apache.pdfbox.encoding.MacRomanEncoding;
import org.apache.pdfbox.encoding.PdfDocEncoding;
@@ -46,7 +47,7 @@ import org.apache.pdfbox.encoding.WinAns
public final class Type1Parser
{
- public static final Logger LOGGER = Logger.getLogger(Type1Parser.class);
+ private static final Log LOGGER = LogFactory.getLog(Type1Parser.class);
protected static final char NAME_START = '/';
protected static final String NOTDEF = NAME_START + ".notdef";
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java?rev=1603718&r1=1603717&r2=1603718&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java
(original)
+++
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/utils/COSUtils.java
Thu Jun 19 05:49:28 2014
@@ -22,8 +22,9 @@
package org.apache.pdfbox.preflight.utils;
import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Logger;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -40,7 +41,7 @@ import org.apache.pdfbox.persistence.uti
public class COSUtils
{
- public static final Logger LOGGER = Logger.getLogger(COSUtils.class);
+ private static final Log LOGGER = LogFactory.getLog(COSUtils.class);
/**
* return true if the elt is a COSDictionary or a reference to a
COSDictionary
@@ -482,9 +483,9 @@ public class COSUtils
}
/**
- * Close the given Document. If the close method of the document throws an
exception, it is logged using a log4j
- * logger (Level : WARN)
- *
+ * Close the given Document. If the close method of the document throws an
+ * exception, it is logged using a commons logger (Level : WARN)
+ *
* @param document
*/
public static void closeDocumentQuietly(COSDocument document)
@@ -503,9 +504,9 @@ public class COSUtils
}
/**
- * Close the given Document. If the close method of the document throws an
exception, it is logged using a log4j
- * logger (Level : WARN)
- *
+ * Close the given Document. If the close method of the document throws an
+ * exception, it is logged using a commons logger (Level : WARN)
+ *
* @param document
*/
public static void closeDocumentQuietly(PDDocument document)
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartor.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartor.java?rev=1603718&r1=1603717&r2=1603718&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartor.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartor.java
Thu Jun 19 05:49:28 2014
@@ -32,7 +32,8 @@ import java.util.Properties;
import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
import org.apache.pdfbox.preflight.exception.SyntaxValidationException;
import org.apache.pdfbox.preflight.exception.ValidationException;
@@ -58,7 +59,7 @@ public class TestIsartor
protected File path;
- protected static Logger logger = Logger.getLogger(TestIsartor.class);
+ protected static final Log logger = LogFactory.getLog(TestIsartor.class);
public TestIsartor(File path, String error)
{
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=1603718&r1=1603717&r2=1603718&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
Thu Jun 19 05:49:28 2014
@@ -30,7 +30,8 @@ import javax.activation.FileDataSource;
import org.junit.Assert;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.preflight.PreflightDocument;
import org.apache.pdfbox.preflight.ValidationResult;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
@@ -61,9 +62,9 @@ public abstract class AbstractInvalidFil
*/
protected File path;
- protected static Logger staticLogger = Logger.getLogger("Test");
+ protected static Log staticLogger = LogFactory.getLog("Test");
- protected Logger logger = null;
+ protected Log logger = null;
/**
* Prepare the test for one file
@@ -77,7 +78,7 @@ public abstract class AbstractInvalidFil
{
this.path = path;
this.expectedError = error;
- this.logger = Logger.getLogger(this.getClass());
+ this.logger = LogFactory.getLog(this.getClass());
}
@Test()
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=1603718&r1=1603717&r2=1603718&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
Thu Jun 19 05:49:28 2014
@@ -32,7 +32,8 @@ import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -47,7 +48,7 @@ public class TestInvalidFiles extends Ab
private static final String ISARTOR_FILES = "invalid.files";
- protected static Logger staticLogger = Logger.getLogger("Test");
+ protected static Log staticLogger = LogFactory.getLog("Test");
public TestInvalidFiles(File path, String error)
{
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=1603718&r1=1603717&r2=1603718&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
Thu Jun 19 05:49:28 2014
@@ -32,7 +32,8 @@ import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -47,7 +48,7 @@ public class TestIsartorValidation exten
private static final String ISARTOR_FILES = "isartor.files";
- protected static Logger staticLogger = Logger.getLogger("Test");
+ protected static Log staticLogger = LogFactory.getLog("Test");
public TestIsartorValidation(File path, String error)
{
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=1603718&r1=1603717&r2=1603718&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
Thu Jun 19 05:49:28 2014
@@ -34,7 +34,8 @@ import org.junit.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.preflight.PreflightDocument;
import org.apache.pdfbox.preflight.ValidationResult;
import org.apache.pdfbox.preflight.exception.ValidationException;
@@ -58,14 +59,14 @@ public class TestValidFiles
protected File path;
- protected static Logger staticLogger = Logger.getLogger("Test");
+ protected static Log staticLogger = LogFactory.getLog("Test");
- protected Logger logger = null;
+ protected Log logger = null;
public TestValidFiles(File path)
{
this.path = path;
- this.logger = Logger.getLogger(path != null ? path.getName() :
"dummy");
+ this.logger = LogFactory.getLog(path != null ? path.getName() :
"dummy");
}
protected static Collection<Object[]> stopIfExpected() throws Exception
