Author: lehmi
Date: Fri Oct 27 06:11:50 2023
New Revision: 1913380
URL: http://svn.apache.org/viewvc?rev=1913380&view=rev
Log:
PDFBOX-5695: switch to log4j as suggested by Axel Howind
Modified:
pdfbox/trunk/tools/pom.xml
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/MetaUtil.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
Modified: pdfbox/trunk/tools/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/pom.xml?rev=1913380&r1=1913379&r2=1913380&view=diff
==============================================================================
--- pdfbox/trunk/tools/pom.xml (original)
+++ pdfbox/trunk/tools/pom.xml Fri Oct 27 06:11:50 2023
@@ -44,6 +44,23 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>compile</scope>
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java?rev=1913380&r1=1913379&r2=1913380&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
(original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
Fri Oct 27 06:11:50 2023
@@ -29,8 +29,8 @@ import java.util.TreeSet;
import java.util.concurrent.Callable;
import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSName;
@@ -62,7 +62,7 @@ import picocli.CommandLine.Option;
@Command(name = "extracttext", header = "Extracts the text from a PDF
document", versionProvider = Version.class, mixinStandardHelpOptions = true)
public final class ExtractText implements Callable<Integer>
{
- private static final Log LOG = LogFactory.getLog(ExtractText.class);
+ private static final Logger LOG = LogManager.getLogger(ExtractText.class);
private static final String STD_ENCODING = "UTF-8";
@@ -349,7 +349,7 @@ public final class ExtractText implemen
{
throw ex;
}
- LOG.error("Failed to process page " + p, ex);
+ LOG.error("Failed to process page {}", p, ex);
}
}
}
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java?rev=1913380&r1=1913379&r2=1913380&view=diff
==============================================================================
---
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java
(original)
+++
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java
Fri Oct 27 06:11:50 2023
@@ -41,8 +41,8 @@ import javax.imageio.metadata.IIOMetadat
import javax.imageio.metadata.IIOMetadataNode;
import javax.imageio.stream.ImageOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -55,7 +55,7 @@ public final class ImageIOUtil
/**
* Log instance
*/
- private static final Log LOG = LogFactory.getLog(ImageIOUtil.class);
+ private static final Logger LOG = LogManager.getLogger(ImageIOUtil.class);
private ImageIOUtil()
{
@@ -236,8 +236,8 @@ public final class ImageIOUtil
}
if (writer == null)
{
- LOG.error("No ImageWriter found for '" + formatName + "'
format");
- LOG.error("Supported formats: " +
Arrays.toString(ImageIO.getWriterFormatNames()));
+ LOG.error("No ImageWriter found for '{}' format", formatName);
+ LOG.error("Supported formats: {}",
Arrays.toString(ImageIO.getWriterFormatNames()));
return false;
}
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/MetaUtil.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/MetaUtil.java?rev=1913380&r1=1913379&r2=1913380&view=diff
==============================================================================
---
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/MetaUtil.java
(original)
+++
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/MetaUtil.java
Fri Oct 27 06:11:50 2023
@@ -26,8 +26,8 @@ import javax.xml.transform.TransformerEx
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
*
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
*/
public final class MetaUtil
{
- private static final Log LOG = LogFactory.getLog(MetaUtil.class);
+ private static final Logger LOG = LogManager.getLogger(MetaUtil.class);
static final String SUN_TIFF_FORMAT =
"com_sun_media_imageio_plugins_tiff_image_1.0";
static final String JPEG_NATIVE_FORMAT = "javax_imageio_jpeg_image_1.0";
@@ -70,7 +70,7 @@ public final class MetaUtil
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount";, "2");
DOMSource domSource = new DOMSource(root);
transformer.transform(domSource, streamResult);
- LOG.debug("\n" + xmlStringWriter);
+ LOG.debug("\n{}", xmlStringWriter);
}
catch (IllegalArgumentException | TransformerException ex)
{
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java?rev=1913380&r1=1913379&r2=1913380&view=diff
==============================================================================
---
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java
(original)
+++
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/imageio/TIFFUtil.java
Fri Oct 27 06:11:50 2023
@@ -16,8 +16,8 @@
*/
package org.apache.pdfbox.tools.imageio;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import javax.imageio.ImageWriteParam;
import javax.imageio.metadata.IIOInvalidTreeException;
@@ -33,7 +33,7 @@ import org.w3c.dom.NodeList;
*/
final class TIFFUtil
{
- private static final Log LOG = LogFactory.getLog(TIFFUtil.class);
+ private static final Logger LOG = LogManager.getLogger(TIFFUtil.class);
private TIFFUtil()
{
Modified:
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java?rev=1913380&r1=1913379&r2=1913380&view=diff
==============================================================================
---
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
(original)
+++
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
Fri Oct 27 06:11:50 2023
@@ -47,8 +47,8 @@ import javax.imageio.ImageReader;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.stream.ImageInputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSName;
@@ -74,7 +74,7 @@ import org.w3c.dom.NodeList;
*/
class TestImageIOUtils
{
- private static final Log LOG = LogFactory.getLog(TestImageIOUtils.class);
+ private static final Logger LOG =
LogManager.getLogger(TestImageIOUtils.class);
/**
* Check whether the resource images can be saved.
@@ -128,7 +128,7 @@ class TestImageIOUtils
private void doTestFile(File file, String outDir) throws IOException
{
PDDocument document = null;
- LOG.info("Preparing to convert " + file.getName());
+ LOG.info("Preparing to convert {}", file.getName());
try
{
float dpi = 36; // low DPI so that rendering is FAST
@@ -269,7 +269,7 @@ class TestImageIOUtils
PDFRenderer renderer = new PDFRenderer(document);
BufferedImage image = renderer.renderImageWithDPI(0, dpi, imageType);
String fileName = outputPrefix + 1;
- LOG.info("Writing: " + fileName + "." + imageFormat);
+ LOG.info("Writing: {}.{}", fileName, imageFormat);
System.out.println(" " + fileName + "." + imageFormat); // for Maven
(keep me!)
try (OutputStream os = new FileOutputStream(fileName + "." +
imageFormat))
{
