Narrows class resolver
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/637ad1c3 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/637ad1c3 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/637ad1c3 Branch: refs/heads/master Commit: 637ad1c3707266c33daabb18d7754e795e6681f3 Parents: 1a8111e Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Feb 2 11:37:29 2017 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Feb 2 11:37:29 2017 +0100 ---------------------------------------------------------------------- .../apache/struts2/views/freemarker/FreemarkerManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/637ad1c3/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index 3323302..b1010c3 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -28,6 +28,7 @@ import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.util.ValueStack; import freemarker.cache.*; +import freemarker.core.TemplateClassResolver; import freemarker.ext.jsp.TaglibFactory; import freemarker.ext.servlet.HttpRequestHashModel; import freemarker.ext.servlet.HttpRequestParametersHashModel; @@ -318,16 +319,23 @@ public class FreemarkerManager { configuration.setTemplateExceptionHandler(TemplateExceptionHandler.HTML_DEBUG_HANDLER); if (mruMaxStrongSize > 0) { + LOG.debug("Sets Configuration.CACHE_STORAGE_KEY to strong:{}", mruMaxStrongSize); configuration.setSetting(Configuration.CACHE_STORAGE_KEY, "strong:" + mruMaxStrongSize); } if (templateUpdateDelay != null) { + LOG.debug("Sets Configuration.TEMPLATE_UPDATE_DELAY_KEY to {}", templateUpdateDelay); configuration.setSetting(Configuration.TEMPLATE_UPDATE_DELAY_KEY, templateUpdateDelay); } if (encoding != null) { + LOG.debug("Sets DefaultEncoding to {}", encoding); configuration.setDefaultEncoding(encoding); } + LOG.debug("Disabled localized lookups"); configuration.setLocalizedLookup(false); + LOG.debug("Enabled whitespace stripping"); configuration.setWhitespaceStripping(true); + LOG.debug("Sets NewBuiltinClassResolver to TemplateClassResolver.SAFER_RESOLVER"); + configuration.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER); return configuration; }
