Ate Douma pushed to branch release/4.0 at cms-community / hippo-site-toolkit
Commits: 5504ec1d by Ate Douma at 2016-08-12T13:56:20+02:00 HSTTWO-3760: [backport v11.0] drop no longer functional nor needed setup of freemarker LoggerLibrary (cherry picked from commit 8498cf456e9ccd8b5ccc0f9caa0cbd6a570ee597) - - - - - 1 changed file: - client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java Changes: ===================================== client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java ===================================== --- a/client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java +++ b/client/src/main/java/org/hippoecm/hst/servlet/HstFreemarkerServlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com) +q * Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,6 +59,10 @@ import static org.hippoecm.hst.core.container.ContainerConstants.FREEMARKER_WEB_ public class HstFreemarkerServlet extends FreemarkerServlet { + /** + * @deprecated HSTTWO-3723: no longer functional and ignored servlet/context init parameter + */ + @Deprecated public static final String INIT_PARAM_LOGGER_LIBRARY = "loggerLibrary"; private static final Logger log = LoggerFactory.getLogger(HstFreemarkerServlet.class); @@ -82,8 +86,6 @@ public class HstFreemarkerServlet extends FreemarkerServlet { public void init(final ServletConfig config) throws ServletException { super.init(config); - configureLoggerLibrary(); - Configuration conf = super.getConfiguration(); if (!hasInitParameter(Configurable.TEMPLATE_EXCEPTION_HANDLER_KEY)) { @@ -140,44 +142,11 @@ public class HstFreemarkerServlet extends FreemarkerServlet { final String projectBaseDir = System.getProperty(PROJECT_BASEDIR_PROPERTY); if (projectBaseDir != null) { log.info("Setting freemarker template update delay to '0ms' since running locally"); - conf.setTemplateUpdateDelay(0); + conf.setTemplateUpdateDelayMilliseconds(0); } conf.setLocalizedLookup(false); } - private void configureLoggerLibrary() { - final int loggerLibrary = getLoggerLibrary(); - try { - log.info("Using freemarker.log.Logger library '{}'", loggerLibrary); - freemarker.log.Logger.selectLoggerLibrary(loggerLibrary); - } catch (ClassNotFoundException e) { - log.warn("Failed to enable logging with freemarker.log.Logger library '{}'", loggerLibrary, e); - } - } - - private int getLoggerLibrary() { - if (!hasInitParameter(INIT_PARAM_LOGGER_LIBRARY)) { - return freemarker.log.Logger.LIBRARY_NONE; - } - - final String initParamValue = getInitParameter(INIT_PARAM_LOGGER_LIBRARY); - switch (initParamValue) { - case "auto": return freemarker.log.Logger.LIBRARY_AUTO; - case "none": return freemarker.log.Logger.LIBRARY_NONE; - case "java": return freemarker.log.Logger.LIBRARY_JAVA; - case "avalon": return freemarker.log.Logger.LIBRARY_AVALON; - case "log4j": return freemarker.log.Logger.LIBRARY_LOG4J; - case "commons": return freemarker.log.Logger.LIBRARY_COMMONS; - case "slf4j": return freemarker.log.Logger.LIBRARY_SLF4J; - default: - log.warn("HstFreemarkerServlet has invalid value for init param '{}': '{}'." + - " Valid values are 'auto', 'none' (the default), 'java', 'avalon', 'log4j', 'commons', and 'slf4j'. " + - " Using 'none' instead'.", - INIT_PARAM_LOGGER_LIBRARY, initParamValue); - return freemarker.log.Logger.LIBRARY_NONE; - } - } - @Override public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { try { View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/5504ec1da979aa3a0f325def57965c00fa453a34
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
