WW-4507 - adjust Tomcat url decoding code to Log4j 2 logging used in Struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4720f46a Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4720f46a Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4720f46a Branch: refs/heads/master Commit: 4720f46a63caaf9db97ba27dc51ac5ad21e66bdc Parents: 76f1884 Author: Rene Gielen <rgie...@apache.org> Authored: Thu Jan 14 15:24:34 2016 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Tue Jan 19 16:19:19 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/struts2/util/tomcat/buf/StringCache.java | 6 +++--- .../main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/4720f46a/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java b/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java index 3a72d49..f982b7d 100644 --- a/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java +++ b/core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java @@ -16,8 +16,8 @@ */ package org.apache.struts2.util.tomcat.buf; -import com.opensymphony.xwork2.util.logging.Logger; -import com.opensymphony.xwork2.util.logging.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.nio.charset.Charset; import java.util.ArrayList; @@ -33,7 +33,7 @@ import java.util.TreeMap; public class StringCache { - private static final Logger log = LoggerFactory.getLogger(StringCache.class); + private static final Logger log = LogManager.getLogger(StringCache.class); // ------------------------------------------------------- Static Variables http://git-wip-us.apache.org/repos/asf/struts/blob/4720f46a/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java b/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java index b52cda7..7f9beec 100644 --- a/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java +++ b/core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java @@ -16,9 +16,9 @@ */ package org.apache.struts2.util.tomcat.buf; -import com.opensymphony.xwork2.util.logging.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; -import com.opensymphony.xwork2.util.logging.Logger; import java.io.CharConversionException; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -33,7 +33,7 @@ import java.io.UnsupportedEncodingException; */ public final class UDecoder { - private static final Logger log = LoggerFactory.getLogger(UDecoder.class); + private static final Logger log = LogManager.getLogger(UDecoder.class); public static final boolean ALLOW_ENCODED_SLASH = Boolean.parseBoolean(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "false"));
