Author: lehmi
Date: Fri Oct 27 06:14:24 2023
New Revision: 1913381
URL: http://svn.apache.org/viewvc?rev=1913381&view=rev
Log:
PDFBOX-5695: switch to log4j as suggested by Axel Howind
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
pdfbox/trunk/examples/pom.xml
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignedTimeStamp.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/SigUtils.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/OcspHelper.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFMergerExample.java
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
Fri Oct 27 06:14:24 2023
@@ -18,8 +18,6 @@ package org.apache.pdfbox.debugger.pagep
import java.awt.Graphics2D;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.debugger.PDFDebugger;
import org.apache.pdfbox.debugger.ui.ImageUtil;
Modified: pdfbox/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/pom.xml?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
--- pdfbox/trunk/examples/pom.xml (original)
+++ pdfbox/trunk/examples/pom.xml Fri Oct 27 06:14:24 2023
@@ -105,9 +105,9 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
+ <artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java
Fri Oct 27 06:14:24 2023
@@ -24,8 +24,8 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;
import javax.print.PrintServiceLookup;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.PDFStreamEngine;
@@ -118,7 +118,7 @@ public class OpaquePDFRenderer extends P
super(context);
}
- private static final Log LOG =
LogFactory.getLog(OpaqueDrawObject.class);
+ private static final Logger LOG =
LogManager.getLogger(OpaqueDrawObject.class);
@Override
public void process(Operator operator, List<COSBase> operands) throws
IOException
@@ -175,7 +175,7 @@ public class OpaquePDFRenderer extends P
// but resets ca and CA
private static class OpaqueSetGraphicsStateParameters extends
OperatorProcessor
{
- private static final Log LOG =
LogFactory.getLog(OpaqueSetGraphicsStateParameters.class);
+ private static final Logger LOG =
LogManager.getLogger(OpaqueSetGraphicsStateParameters.class);
public OpaqueSetGraphicsStateParameters(PDFStreamEngine context)
{
@@ -201,7 +201,8 @@ public class OpaquePDFRenderer extends P
PDExtendedGraphicsState gs =
context.getResources().getExtGState(graphicsName);
if (gs == null)
{
- LOG.error("name for 'gs' operator not found in resources: /" +
graphicsName.getName());
+ LOG.error("name for 'gs' operator not found in resources: /{}",
+ graphicsName.getName());
return;
}
gs.setNonStrokingAlphaConstant(1f);
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignedTimeStamp.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignedTimeStamp.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignedTimeStamp.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignedTimeStamp.java
Fri Oct 27 06:14:24 2023
@@ -25,8 +25,8 @@ import java.io.OutputStream;
import java.net.URISyntaxException;
import java.security.NoSuchAlgorithmException;
-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;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -45,7 +45,7 @@ import org.apache.pdfbox.pdmodel.interac
*/
public class CreateSignedTimeStamp implements SignatureInterface
{
- private static final Log LOG =
LogFactory.getLog(CreateSignedTimeStamp.class);
+ private static final Logger LOG =
LogManager.getLogger(CreateSignedTimeStamp.class);
private final String tsaUrl;
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
Fri Oct 27 06:14:24 2023
@@ -43,8 +43,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-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.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
@@ -90,7 +90,7 @@ import org.bouncycastle.util.Store;
*/
public final class ShowSignature
{
- private static final Log LOG = LogFactory.getLog(ShowSignature.class);
+ private static final Logger LOG =
LogManager.getLogger(ShowSignature.class);
private final SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy
HH:mm:ss");
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/SigUtils.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/SigUtils.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/SigUtils.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/SigUtils.java
Fri Oct 27 06:14:24 2023
@@ -36,8 +36,8 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
-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.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -73,7 +73,7 @@ import org.bouncycastle.util.Store;
*/
public class SigUtils
{
- private static final Log LOG = LogFactory.getLog(SigUtils.class);
+ private static final Logger LOG = LogManager.getLogger(SigUtils.class);
private SigUtils()
{
@@ -413,8 +413,9 @@ public class SigUtils
++n;
while (n < key.getNumber())
{
- LOG.warn("Object " + n + " missing, signature verification
may fail in " +
- "Adobe Reader, see
https://stackoverflow.com/questions/71267471/";);
+ LOG.warn(
+ "Object {} missing, signature verification may
fail in Adobe Reader, see https://stackoverflow.com/questions/71267471/";,
+ n);
++n;
}
}
@@ -439,7 +440,7 @@ public class SigUtils
}
HttpURLConnection con = (HttpURLConnection) url.openConnection();
int responseCode = con.getResponseCode();
- LOG.info(responseCode + " " + con.getResponseMessage());
+ LOG.info("{} {}", responseCode, con.getResponseMessage());
if (responseCode == HttpURLConnection.HTTP_MOVED_TEMP ||
responseCode == HttpURLConnection.HTTP_MOVED_PERM ||
responseCode == HttpURLConnection.HTTP_SEE_OTHER)
@@ -451,13 +452,13 @@ public class SigUtils
{
// redirection from http:// to https://
// change this code if you want to be more flexible (but think
about security!)
- LOG.info("redirection to " + location + " followed");
+ LOG.info("redirection to {} followed", location);
con.disconnect();
con = (HttpURLConnection) new
URI(location).toURL().openConnection();
}
else
{
- LOG.info("redirection to " + location + " ignored");
+ LOG.info("redirection to {} ignored", location);
}
}
return new ConnectedInputStream(con, con.getInputStream());
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
Fri Oct 27 06:14:24 2023
@@ -29,8 +29,8 @@ import java.security.SecureRandom;
import java.util.Base64;
import java.util.Random;
-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.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
import org.bouncycastle.operator.DigestAlgorithmIdentifierFinder;
@@ -47,7 +47,7 @@ import org.bouncycastle.tsp.TimeStampTok
*/
public class TSAClient
{
- private static final Log LOG = LogFactory.getLog(TSAClient.class);
+ private static final Logger LOG = LogManager.getLogger(TSAClient.class);
private static final DigestAlgorithmIdentifierFinder ALGORITHM_OID_FINDER =
new DefaultDigestAlgorithmIdentifierFinder();
@@ -160,7 +160,7 @@ public class TSAClient
}
catch (IOException ex)
{
- LOG.error("Exception when writing to " + this.url, ex);
+ LOG.error("Exception when writing to {}", this.url, ex);
throw ex;
}
@@ -173,7 +173,7 @@ public class TSAClient
}
catch (IOException ex)
{
- LOG.error("Exception when reading from " + this.url, ex);
+ LOG.error("Exception when reading from {}", this.url, ex);
throw ex;
}
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CRLVerifier.java
Fri Oct 27 06:14:24 2023
@@ -44,8 +44,8 @@ import javax.naming.directory.Attributes
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
-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.examples.signature.SigUtils;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
@@ -68,7 +68,7 @@ import org.bouncycastle.asn1.x509.Genera
*/
public final class CRLVerifier
{
- private static final Log LOG = LogFactory.getLog(CRLVerifier.class);
+ private static final Logger LOG = LogManager.getLogger(CRLVerifier.class);
private CRLVerifier()
{
@@ -99,7 +99,7 @@ public final class CRLVerifier
List<String> crlDistributionPointsURLs =
getCrlDistributionPoints(cert);
for (String crlDistributionPointsURL : crlDistributionPointsURLs)
{
- LOG.info("Checking distribution point URL: " +
crlDistributionPointsURL);
+ LOG.info("Checking distribution point URL: {}",
crlDistributionPointsURL);
X509CRL crl;
try
@@ -110,7 +110,9 @@ public final class CRLVerifier
{
// e.g. LDAP behind corporate proxy
// but couldn't get LDAP to work at all, see e.g. file
from PDFBOX-1452
- LOG.warn("Caught " + ex.getClass().getSimpleName() + "
downloading CRL, will try next distribution point if available");
+ LOG.warn(
+ "Caught {} downloading CRL, will try next
distribution point if available",
+ ex.getClass().getSimpleName());
if (firstException == null)
{
firstException = ex;
@@ -150,11 +152,11 @@ public final class CRLVerifier
// a PDF has a broken OCSP and a working CRL
if (crl.getThisUpdate().after(now))
{
- LOG.error("CRL not yet valid, thisUpdate is " +
crl.getThisUpdate());
+ LOG.error("CRL not yet valid, thisUpdate is {}",
crl.getThisUpdate());
}
if (crl.getNextUpdate().before(now))
{
- LOG.error("CRL no longer valid, nextUpdate is " +
crl.getNextUpdate());
+ LOG.error("CRL no longer valid, nextUpdate is {}",
crl.getNextUpdate());
}
if
(!crl.getIssuerX500Principal().equals(cert.getIssuerX500Principal()))
@@ -221,12 +223,12 @@ public final class CRLVerifier
}
else if (revokedCRLEntry != null)
{
- LOG.info("The certificate was revoked after signing by CRL " +
- crlDistributionPointsURL + " on " +
revokedCRLEntry.getRevocationDate());
+ LOG.info("The certificate was revoked after signing by CRL {} on
{}",
+ crlDistributionPointsURL,
revokedCRLEntry.getRevocationDate());
}
else
{
- LOG.info("The certificate was not revoked by CRL " +
crlDistributionPointsURL);
+ LOG.info("The certificate was not revoked by CRL {}",
crlDistributionPointsURL);
}
}
@@ -323,9 +325,9 @@ public final class CRLVerifier
}
if (!(derObjCrlDP instanceof ASN1OctetString))
{
- LOG.warn("CRL distribution points for certificate subject " +
- cert.getSubjectX500Principal().getName() +
- " should be an octet string, but is " + derObjCrlDP);
+ LOG.warn(
+ "CRL distribution points for certificate subject {} should
be an octet string, but is {}",
+ cert.getSubjectX500Principal().getName(), derObjCrlDP);
return new ArrayList<>();
}
ASN1OctetString dosCrlDP = (ASN1OctetString) derObjCrlDP;
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java
Fri Oct 27 06:14:24 2023
@@ -45,8 +45,8 @@ import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
-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.examples.signature.SigUtils;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
import org.bouncycastle.asn1.ASN1Encodable;
@@ -72,7 +72,7 @@ import org.bouncycastle.cert.ocsp.OCSPRe
*/
public final class CertificateVerifier
{
- private static final Log LOG =
LogFactory.getLog(CertificateVerifier.class);
+ private static final Logger LOG =
LogManager.getLogger(CertificateVerifier.class);
private CertificateVerifier()
{
@@ -144,7 +144,7 @@ public final class CertificateVerifier
}
if (downloadSize > 0)
{
- LOG.info("CA issuers: " + downloadSize + " downloaded
certificate(s) are new");
+ LOG.info("CA issuers: {} downloaded certificate(s) are new",
downloadSize);
}
// Prepare a set of trust anchors (set of root CA certificates)
@@ -172,7 +172,7 @@ public final class CertificateVerifier
PKIXCertPathBuilderResult verifiedCertChain = verifyCertificate(
cert, trustAnchors, intermediateCerts, signDate);
- LOG.info("Certification chain verified successfully up to this
root: " +
+ LOG.info("Certification chain verified successfully up to this
root: {}",
verifiedCertChain.getTrustAnchor().getTrustedCert().getSubjectX500Principal());
checkRevocations(cert, certSet, signDate);
@@ -243,7 +243,7 @@ public final class CertificateVerifier
// IOException happens with 021496.pdf because OCSP responder
no longer exists
// OCSPException happens with QV_RCA1_RCA3_CPCPS_V4_11.pdf
LOG.warn("Exception trying OCSP, will try CRL", ex);
- LOG.warn("Certificate# to check: " +
cert.getSerialNumber().toString(16));
+ LOG.warn("Certificate# to check: {}",
cert.getSerialNumber().toString(16));
CRLVerifier.verifyCertificateCRLs(cert, signDate,
additionalCerts);
}
}
@@ -314,7 +314,7 @@ public final class CertificateVerifier
}
if (!(asn1Prim instanceof ASN1Sequence))
{
- LOG.warn("ASN1Sequence expected, got " +
asn1Prim.getClass().getSimpleName());
+ LOG.warn("ASN1Sequence expected, got {}",
asn1Prim.getClass().getSimpleName());
return resultSet;
}
ASN1Sequence asn1Seq = (ASN1Sequence) asn1Prim;
@@ -331,24 +331,24 @@ public final class CertificateVerifier
ASN1TaggedObject location = (ASN1TaggedObject) obj.getObjectAt(1);
ASN1OctetString uri = (ASN1OctetString) location.getBaseObject();
String urlString = new String(uri.getOctets());
- LOG.info("CA issuers URL: " + urlString);
+ LOG.info("CA issuers URL: {}", urlString);
try (InputStream in = SigUtils.openURL(urlString))
{
CertificateFactory certFactory =
CertificateFactory.getInstance("X.509");
Collection<? extends Certificate> altCerts =
certFactory.generateCertificates(in);
altCerts.forEach(altCert -> resultSet.add((X509Certificate)
altCert));
- LOG.info("CA issuers URL: " + altCerts.size() + "
certificate(s) downloaded");
+ LOG.info("CA issuers URL: {} certificate(s) downloaded",
altCerts.size());
}
catch (IOException | URISyntaxException ex)
{
- LOG.warn(urlString + " failure: " + ex.getMessage(), ex);
+ LOG.warn("{} failure: {}", urlString, ex.getMessage(), ex);
}
catch (CertificateException ex)
{
LOG.warn(ex.getMessage(), ex);
}
}
- LOG.info("CA issuers: Downloaded " + resultSet.size() + "
certificate(s) total");
+ LOG.info("CA issuers: Downloaded {} certificate(s) total",
resultSet.size());
return resultSet;
}
@@ -436,7 +436,7 @@ public final class CertificateVerifier
{
ASN1OctetString url = (ASN1OctetString)
location.getBaseObject();
String ocspURL = new String(url.getOctets());
- LOG.info("OCSP URL: " + ocspURL);
+ LOG.info("OCSP URL: {}", ocspURL);
return ocspURL;
}
}
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/OcspHelper.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/OcspHelper.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/OcspHelper.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/cert/OcspHelper.java
Fri Oct 27 06:14:24 2023
@@ -38,8 +38,8 @@ import java.util.Date;
import java.util.Random;
import java.util.Set;
-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.examples.signature.SigUtils;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
import org.bouncycastle.asn1.DEROctetString;
@@ -77,7 +77,7 @@ import org.bouncycastle.operator.jcajce.
*/
public class OcspHelper
{
- private static final Log LOG = LogFactory.getLog(OcspHelper.class);
+ private static final Logger LOG = LogManager.getLogger(OcspHelper.class);
private final X509Certificate issuerCertificate;
private final Date signDate;
@@ -240,8 +240,8 @@ public class OcspHelper
revokedStatus.getRevocationTime(),
revokedStatus.getRevocationTime());
}
- LOG.info("The certificate was revoked after signing by OCSP "
+ ocspUrl +
- " on " + revokedStatus.getRevocationTime());
+ LOG.info("The certificate was revoked after signing by OCSP {}
on {}", ocspUrl,
+ revokedStatus.getRevocationTime());
}
else if (status != CertificateStatus.GOOD)
{
@@ -379,12 +379,12 @@ public class OcspHelper
}
if (curDate.compareTo(thisUpdate) < 0)
{
- LOG.error(curDate + " < " + thisUpdate);
+ LOG.error("{} < {}", curDate, thisUpdate);
throw new OCSPException("OCSP: current date < thisUpdate field
(RFC 5019 2.2.4.)");
}
if (curDate.compareTo(nextUpdate) > 0)
{
- LOG.error(curDate + " > " + nextUpdate);
+ LOG.error("{} > {}", curDate, nextUpdate);
throw new OCSPException("OCSP: current date > nextUpdate field
(RFC 5019 2.2.4.)");
}
LOG.info("OCSP response is fresh");
@@ -486,12 +486,12 @@ public class OcspHelper
{
// redirection from http:// to https://
// change this code if you want to be more flexible (but
think about security!)
- LOG.info("redirection to " + location + " followed");
+ LOG.info("redirection to {} followed", location);
return performRequest(location);
}
else
{
- LOG.info("redirection to " + location + " ignored");
+ LOG.info("redirection to {} ignored", location);
}
}
if (responseCode != HttpURLConnection.HTTP_OK)
@@ -552,7 +552,7 @@ public class OcspHelper
break;
default:
statusInfo = "UNKNOWN";
- LOG.error("Unknown OCSPResponse status code! " + status);
+ LOG.error("Unknown OCSPResponse status code! {}", status);
}
}
if (resp == null || resp.getStatus() != OCSPResponseStatus.SUCCESSFUL)
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
Fri Oct 27 06:14:24 2023
@@ -36,8 +36,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-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.COSBase;
@@ -79,7 +79,7 @@ import org.bouncycastle.tsp.TimeStampTok
*/
public class AddValidationInformation
{
- private static final Log LOG =
LogFactory.getLog(AddValidationInformation.class);
+ private static final Logger LOG =
LogManager.getLogger(AddValidationInformation.class);
private CertInformationCollector certInformationHelper;
private COSArray correspondingOCSPs;
@@ -291,7 +291,8 @@ public class AddValidationInformation
if (certInfo.getOcspUrl() == null && certInfo.getCrlUrl() == null)
{
- LOG.info("No revocation information for cert " +
certInfo.getCertificate().getSubjectX500Principal());
+ LOG.info("No revocation information for cert {}",
+ certInfo.getCertificate().getSubjectX500Principal());
}
else if (!isRevocationInfoFound)
{
@@ -327,7 +328,7 @@ public class AddValidationInformation
}
catch (OCSPException | CertificateProccessingException | IOException |
URISyntaxException e)
{
- LOG.error("Failed fetching OCSP at " + certInfo.getOcspUrl(), e);
+ LOG.error("Failed fetching OCSP at {}", certInfo.getOcspUrl(), e);
return false;
}
catch (RevokedCertificateException e)
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java
Fri Oct 27 06:14:24 2023
@@ -33,8 +33,8 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-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.examples.signature.SigUtils;
import org.apache.pdfbox.examples.signature.cert.CertificateVerifier;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
@@ -63,7 +63,7 @@ import org.bouncycastle.util.Store;
*/
public class CertInformationCollector
{
- private static final Log LOG =
LogFactory.getLog(CertInformationCollector.class);
+ private static final Logger LOG =
LogManager.getLogger(CertInformationCollector.class);
private static final int MAX_CERTIFICATE_CHAIN_DEPTH = 5;
@@ -248,8 +248,8 @@ public class CertInformationCollector
try
{
certificate.verify(issuer.getPublicKey(),
SecurityProvider.getProvider());
- LOG.info("Found the right Issuer Cert! for Cert: " +
certificate.getSubjectX500Principal()
- + "\n" + issuer.getSubjectX500Principal());
+ LOG.info("Found the right Issuer Cert! for Cert: {}\n{}",
+ certificate.getSubjectX500Principal(),
issuer.getSubjectX500Principal());
certInfo.issuerCertificate = issuer;
certInfo.certChain = new CertSignatureInformation();
traverseChain(issuer, certInfo.certChain, maxDepth - 1);
@@ -287,7 +287,7 @@ public class CertInformationCollector
return;
}
urlSet.add(certInfo.issuerUrl);
- LOG.info("Get alternative issuer certificate from: " +
certInfo.issuerUrl);
+ LOG.info("Get alternative issuer certificate from: {}",
certInfo.issuerUrl);
try
{
CertificateFactory certFactory =
CertificateFactory.getInstance("X.509");
@@ -303,7 +303,8 @@ public class CertInformationCollector
}
catch (IOException | URISyntaxException | CertificateException e)
{
- LOG.error("Error getting alternative issuer certificate from " +
certInfo.issuerUrl, e);
+ LOG.error("Error getting alternative issuer certificate from {}",
certInfo.issuerUrl,
+ e);
}
}
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationHelper.java
Fri Oct 27 06:14:24 2023
@@ -21,8 +21,8 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Enumeration;
-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.examples.signature.validation.CertInformationCollector.CertSignatureInformation;
import org.apache.pdfbox.util.Hex;
import org.bouncycastle.asn1.ASN1Encodable;
@@ -35,7 +35,7 @@ import org.bouncycastle.cert.jcajce.JcaX
public class CertInformationHelper
{
- private static final Log LOG =
LogFactory.getLog(CertInformationHelper.class);
+ private static final Logger LOG =
LogManager.getLogger(CertInformationHelper.class);
private CertInformationHelper()
{
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFMergerExample.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFMergerExample.java?rev=1913381&r1=1913380&r2=1913381&view=diff
==============================================================================
---
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFMergerExample.java
(original)
+++
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFMergerExample.java
Fri Oct 27 06:14:24 2023
@@ -35,8 +35,8 @@ import org.apache.xmpbox.xml.XmpSerializ
import java.util.Calendar;
import java.util.List;
import javax.xml.transform.TransformerException;
-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.io.IOUtils;
/**
@@ -50,7 +50,7 @@ import org.apache.pdfbox.io.IOUtils;
*/
public class PDFMergerExample
{
- private static final Log LOG = LogFactory.getLog(PDFMergerExample.class);
+ private static final Logger LOG =
LogManager.getLogger(PDFMergerExample.class);
/**
* Creates a compound PDF document from a list of input documents.
@@ -82,9 +82,9 @@ public class PDFMergerExample
pdfMerger.setDestinationDocumentInformation(pdfDocumentInfo);
pdfMerger.setDestinationMetadata(xmpMetadata);
- LOG.info("Merging " + sources.size() + " source documents into one
PDF");
+ LOG.info("Merging {} source documents into one PDF",
sources.size());
pdfMerger.mergeDocuments(IOUtils.createMemoryOnlyStreamCache());
- LOG.info("PDF merge successful, size = {" +
mergedPDFOutputStream.size() + "} bytes");
+ LOG.info("PDF merge successful, size = {{}} bytes",
mergedPDFOutputStream.size());
return new
ByteArrayInputStream(mergedPDFOutputStream.toByteArray());
}
