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 13:13:31 UTC
[25/25] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae'
Merge remote-tracking branch 'origin/2.3-gae'
Conflicts:
src/test/java/freemarker/template/DefaultObjectWrapperTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/407b6b8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/407b6b8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/407b6b8b
Branch: refs/heads/master
Commit: 407b6b8b16eda2fa6c68b886a9aa8996b55949f6
Parents: eed6d94 116b817
Author: ddekany <dd...@apache.org>
Authored: Sun Nov 29 13:12:49 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Nov 29 13:12:49 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 | 4 +-
18 files changed, 1536 insertions(+), 152 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/407b6b8b/src/main/java/freemarker/core/Configurable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/407b6b8b/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/407b6b8b/src/main/java/freemarker/template/Configuration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/407b6b8b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
----------------------------------------------------------------------
diff --cc src/test/java/freemarker/template/DefaultObjectWrapperTest.java
index d5237c4,f94f2d9..863a9c5
--- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
+++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
@@@ -81,14 -81,11 +81,16 @@@ public class DefaultObjectWrapperTest
}
expected.add(Configuration.VERSION_2_3_21);
expected.add(Configuration.VERSION_2_3_22);
- expected.add(Configuration.VERSION_2_3_22); // no non-BC change in 2.3.23
+ expected.add(Configuration.VERSION_2_3_22);
++ expected.add(Configuration.VERSION_2_3_24);
+ expected.add(Configuration.VERSION_2_3_24);
List<Version> actual = new ArrayList<Version>();
for (int i = _TemplateAPI.VERSION_INT_2_3_0; i <= Configuration.getVersion().intValue(); i++) {
- if (i > _TemplateAPI.VERSION_INT_2_3_22 && i < _TemplateAPI.VERSION_INT_2_4_0) {
++ if (i > _TemplateAPI.VERSION_INT_2_3_24 && i < _TemplateAPI.VERSION_INT_2_4_0) {
+ continue;
+ }
+
int major = i / 1000000;
int minor = i % 1000000 / 1000;
int micro = i % 1000;