You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/09/13 09:49:17 UTC
[16/36] incubator-freemarker git commit: Merge branch '3' into
feature/FREEMARKER-55-2
Merge branch '3' into feature/FREEMARKER-55-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/9eedd86d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9eedd86d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/9eedd86d
Branch: refs/heads/3
Commit: 9eedd86da2dc6aeac011e0e1553871599b80ab18
Parents: 234f96e b63e448
Author: Woonsan Ko <wo...@apache.org>
Authored: Mon Sep 11 13:41:52 2017 -0400
Committer: Woonsan Ko <wo...@apache.org>
Committed: Mon Sep 11 13:41:52 2017 -0400
----------------------------------------------------------------------
.gitignore | 10 +-
README.md | 63 ++++----
build.gradle | 8 +-
.../org/apache/freemarker/core/ASTElement.java | 5 +-
.../freemarker/core/ParsingConfiguration.java | 1 +
.../freemarker/core/util/CallableUtils.java | 4 +-
freemarker-servlet/build.gradle | 18 +--
.../freemarker/servlet/FreemarkerServlet.java | 7 +-
.../servlet/DummyMockServletContext.java | 142 ++++++++++++++++++-
.../spring/SpringResourceTemplateLoader.java | 1 -
.../spring/web/view/FreeMarkerView.java | 2 +-
.../spring/web/view/FreeMarkerViewResolver.java | 2 +-
12 files changed, 207 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/9eedd86d/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreeMarkerView.java
----------------------------------------------------------------------