FREEMARKER-55: Merged: polishing and cleanups in TaglibFactory builder Merge commit 'refs/pull/26/head' of https://github.com/apache/incubator-freemarker into 3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bd09327f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bd09327f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bd09327f Branch: refs/heads/3 Commit: bd09327f9bf1dc326a723553872724048a194d63 Parents: 9b31510 42cfb32 Author: ddekany <ddek...@apache.org> Authored: Thu Jul 6 09:27:03 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Thu Jul 6 09:42:51 2017 +0200 ---------------------------------------------------------------------- .../apache/freemarker/core/Configuration.java | 2 +- .../freemarker/core/TemplateConfiguration.java | 2 +- .../freemarker/core/util/_CollectionUtil.java | 30 +- freemarker-servlet/build.gradle | 9 +- .../freemarker/servlet/FreemarkerServlet.java | 158 +++-- .../freemarker/servlet/InitParamParser.java | 4 +- .../freemarker/servlet/jsp/TaglibFactory.java | 683 ++++++++++++------- .../servlet/jsp/TaglibFactoryBuilder.java | 167 ----- freemarker-spring/build.gradle | 9 +- .../spring/SpringResourceTemplateLoader.java | 168 +++++ .../SpringResourceTemplateLoader.java | 168 ----- .../spring/web/view/FreemarkerViewResolver.java | 36 +- .../SpringResourceTemplateLoaderTest.java | 1 + .../spring/web/view/FreemarkerViewTest.java | 23 +- 14 files changed, 756 insertions(+), 704 deletions(-) ----------------------------------------------------------------------
