Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 432F7200B45 for ; Fri, 15 Jul 2016 15:18:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 41B2F160A89; Fri, 15 Jul 2016 13:18:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 90433160A87 for ; Fri, 15 Jul 2016 15:18:40 +0200 (CEST) Received: (qmail 33530 invoked by uid 500); 15 Jul 2016 13:18:30 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 32290 invoked by uid 99); 15 Jul 2016 13:18:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 13:18:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C7FBEE692; Fri, 15 Jul 2016 13:18:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Fri, 15 Jul 2016 13:18:55 -0000 Message-Id: <1084a62c2cb74461b452e56de10011b2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/50] [abbrv] struts git commit: WW-4507 - adjust Tomcat url decoding code to Log4j 2 logging used in Struts archived-at: Fri, 15 Jul 2016 13:18:41 -0000 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 Authored: Thu Jan 14 15:24:34 2016 +0100 Committer: Lukasz Lenart 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"));