Repository: incubator-freemarker Updated Branches: refs/heads/3 a71567907 -> aaa100c0c
FREEMARKER-55: Add default tld sources (tld files in web-inf/lib/*.jar) like FreemarkerServlet does. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/576b0ff3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/576b0ff3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/576b0ff3 Branch: refs/heads/3 Commit: 576b0ff3b266da40b26e46a8d66efe6353884a36 Parents: 7991d3e Author: Woonsan Ko <[email protected]> Authored: Thu Jul 13 15:42:19 2017 -0400 Committer: Woonsan Ko <[email protected]> Committed: Thu Jul 13 15:42:19 2017 -0400 ---------------------------------------------------------------------- .../freemarker/spring/web/view/FreemarkerViewResolver.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/576b0ff3/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java index c58e7db..67b4643 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java @@ -127,8 +127,10 @@ public class FreemarkerViewResolver extends AbstractTemplateViewResolver impleme servletContextModel = new ServletContextHashModel(pageContextServlet, objectWrapper); - // TODO: additional meta-inf / classpath tld resources? - taglibFactory = new TaglibFactory.Builder(getServletContext(), objectWrapper).build(); + taglibFactory = new TaglibFactory.Builder(getServletContext(), objectWrapper) + .metaInfTldSources(TaglibFactory.DEFAULT_META_INF_TLD_SOURCES) + .classpathTlds(TaglibFactory.DEFAULT_CLASSPATH_TLDS) + .build(); } @Override
