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 80AF4200CAC for ; Mon, 19 Jun 2017 10:59:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7FA93160BE4; Mon, 19 Jun 2017 08:59:49 +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 A0114160BE1 for ; Mon, 19 Jun 2017 10:59:48 +0200 (CEST) Received: (qmail 96861 invoked by uid 500); 19 Jun 2017 08:59:47 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 96852 invoked by uid 99); 19 Jun 2017 08:59:47 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2017 08:59:47 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id BC3FFCA821 for ; Mon, 19 Jun 2017 08:59:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.231 X-Spam-Level: X-Spam-Status: No, score=-4.231 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id AC9EsEOBESJp for ; Mon, 19 Jun 2017 08:59:45 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 858455FB43 for ; Mon, 19 Jun 2017 08:59:44 +0000 (UTC) Received: (qmail 96849 invoked by uid 99); 19 Jun 2017 08:59:43 -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; Mon, 19 Jun 2017 08:59:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97251DFBDA; Mon, 19 Jun 2017 08:59:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Message-Id: <37229894b8764414b98dba71019fb519@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-freemarker git commit: Fixed wrong log category in freemarker-servlet. Date: Mon, 19 Jun 2017 08:59:43 +0000 (UTC) archived-at: Mon, 19 Jun 2017 08:59:49 -0000 Repository: incubator-freemarker Updated Branches: refs/heads/3 1988dc0c8 -> 33320725f Fixed wrong log category in freemarker-servlet. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/33320725 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/33320725 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/33320725 Branch: refs/heads/3 Commit: 33320725ffadc77268883d8681d8dd08fb6c4ff2 Parents: 1988dc0 Author: ddekany Authored: Mon Jun 19 10:59:29 2017 +0200 Committer: ddekany Committed: Mon Jun 19 10:59:29 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/freemarker/servlet/FreemarkerServlet.java | 2 +- .../main/java/org/apache/freemarker/servlet/InitParamParser.java | 2 +- .../java/org/apache/freemarker/servlet/WebAppTemplateLoader.java | 3 +-- .../main/java/org/apache/freemarker/servlet/_ServletLogs.java | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/33320725/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java index 3212fb4..cbd2fd7 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java @@ -327,7 +327,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // [FM3] Lot of things are marked here with "BC" and deprecated public class FreemarkerServlet extends HttpServlet { - private static final Logger LOG = _ServletLogs.SERVLET; + private static final Logger LOG = _ServletLogs.ROOT; @Deprecated private static final Logger LOG_RT = _CoreLogs.RUNTIME; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/33320725/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/InitParamParser.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/InitParamParser.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/InitParamParser.java index de8e780..e6bdd0a 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/InitParamParser.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/InitParamParser.java @@ -46,7 +46,7 @@ final class InitParamParser { static final String TEMPLATE_PATH_PREFIX_FILE = "file://"; static final String TEMPLATE_PATH_SETTINGS_BI_NAME = "settings"; - private static final Logger LOG = _ServletLogs.SERVLET; + private static final Logger LOG = _ServletLogs.ROOT; private InitParamParser() { // Not to be instantiated http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/33320725/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java index 3051be3..8213d3d 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/WebAppTemplateLoader.java @@ -32,7 +32,6 @@ import java.util.Objects; import javax.servlet.ServletContext; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core._CoreLogs; import org.apache.freemarker.core.templateresolver.TemplateLoader; import org.apache.freemarker.core.templateresolver.TemplateLoaderSession; import org.apache.freemarker.core.templateresolver.TemplateLoadingResult; @@ -50,7 +49,7 @@ import org.slf4j.Logger; */ public class WebAppTemplateLoader implements TemplateLoader { - private static final Logger LOG = _CoreLogs.TEMPLATE_RESOLVER; + private static final Logger LOG = _ServletLogs.ROOT; private final ServletContext servletContext; private final String subdirPath; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/33320725/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/_ServletLogs.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/_ServletLogs.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/_ServletLogs.java index 501ce62..786a78e 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/_ServletLogs.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/_ServletLogs.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; */ public final class _ServletLogs { - public static final Logger SERVLET = LoggerFactory.getLogger("org.apache.freemarker.servlet"); + public static final Logger ROOT = LoggerFactory.getLogger("org.apache.freemarker.servlet"); public static final Logger JSP = LoggerFactory.getLogger("org.apache.freemarker.servlet.jsp"); - + }