freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: Fixed wrong log category in freemarker-servlet.
Date Mon, 19 Jun 2017 08:59:43 GMT
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 <ddekany@apache.org>
Authored: Mon Jun 19 10:59:29 2017 +0200
Committer: ddekany <ddekany@apache.org>
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");
-    
+
 }


Mime
View raw message