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 2015/11/29 12:59:29 UTC
[25/25] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Merge remote-tracking branch 'origin/2.3-gae' into 2.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/5758b0a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/5758b0a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/5758b0a5
Branch: refs/heads/2.3
Commit: 5758b0a5148e4c99879d2e6f4b6fcb6f59db6e5d
Parents: 0286f23 116b817
Author: ddekany <dd...@apache.org>
Authored: Sun Nov 29 12:56:53 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Nov 29 12:56:53 2015 +0100
----------------------------------------------------------------------
.classpath | 2 +
ivy.xml | 10 +-
src/main/java/freemarker/core/Configurable.java | 9 +-
src/main/java/freemarker/core/Environment.java | 2 +-
.../core/_ObjectBuilderSettingEvaluator.java | 96 +++-
.../java/freemarker/ext/beans/BeanModel.java | 4 +
.../java/freemarker/ext/beans/BeansWrapper.java | 19 +-
.../java/freemarker/ext/jsp/TaglibFactory.java | 3 +-
.../ext/servlet/FreemarkerServlet.java | 498 ++++++++++++++---
.../java/freemarker/template/Configuration.java | 11 +
.../template/DefaultIteratorAdapter.java | 15 +-
.../template/DefaultObjectWrapper.java | 5 +
.../freemarker/template/SimpleCollection.java | 24 +-
src/manual/book.xml | 240 +++++++-
.../freemarker/core/IteratorIssuesTest.java | 130 +++++
.../core/ObjectBuilderSettingsTest.java | 66 ++-
.../ext/servlet/FreemarkerServletTest.java | 550 +++++++++++++++++++
.../template/DefaultObjectWrapperTest.java | 2 +-
18 files changed, 1534 insertions(+), 152 deletions(-)
----------------------------------------------------------------------