FREEMARKER-55: Merged: Spring Directives/Functions to replace spring.tld tags (to be continued...)
Merge commit 'refs/pull/35/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/f6eebd85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f6eebd85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f6eebd85 Branch: refs/heads/3 Commit: f6eebd85657e86863bd6888f17a460e8be2635c8 Parents: 742ed4f 7c6f56c Author: ddekany <[email protected]> Authored: Thu Sep 14 11:12:36 2017 +0200 Committer: ddekany <[email protected]> Committed: Thu Sep 14 11:13:43 2017 +0200 ---------------------------------------------------------------------- .../freemarker/core/util/CallableUtils.java | 159 +++++++++++++++++++ .../spring/SpringResourceTemplateLoader.java | 19 +-- .../AbstractSpringTemplateCallableModel.java | 50 +++++- .../AbstractSpringTemplateDirectiveModel.java | 27 +--- .../AbstractSpringTemplateFunctionModel.java | 27 +--- .../freemarker/spring/model/BindDirective.java | 4 +- .../spring/model/BindErrorsDirective.java | 4 +- .../freemarker/spring/model/EvalFunction.java | 8 +- .../spring/model/MessageFunction.java | 17 +- .../spring/model/NestedPathDirective.java | 4 +- .../model/SpringTemplateCallableHashModel.java | 13 +- .../freemarker/spring/model/ThemeFunction.java | 5 +- .../spring/model/TransformFunction.java | 18 +-- .../freemarker/spring/model/UrlFunction.java | 18 ++- .../spring/web/view/PageContextServlet.java | 4 +- .../test/model/eval-function-basic-usages.ftl | 15 +- .../test/model/url-function-basic-usages.ftl | 21 +-- 17 files changed, 283 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
