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/44201a6d Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/44201a6d Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/44201a6d Branch: refs/heads/2.3 Commit: 44201a6d1701ac66c2dfec8eb98e3f374a47496f Parents: dd7a2aa 4b989f8 Author: ddekany <[email protected]> Authored: Tue Dec 6 23:27:36 2016 +0100 Committer: ddekany <[email protected]> Committed: Tue Dec 6 23:27:36 2016 +0100 ---------------------------------------------------------------------- .../freemarker/core/AddConcatExpression.java | 58 ++- .../freemarker/core/BuiltInsForSequences.java | 33 +- src/main/java/freemarker/core/EvalUtil.java | 26 +- src/main/java/freemarker/core/NewBI.java | 8 +- .../debug/impl/RmiDebuggedEnvironmentImpl.java | 2 +- .../freemarker/ext/beans/ArgumentTypes.java | 75 ++- .../java/freemarker/ext/beans/BeanModel.java | 94 ++-- .../java/freemarker/ext/beans/BeansWrapper.java | 89 ++-- .../ext/beans/BeansWrapperBuilder.java | 17 +- .../freemarker/ext/beans/ClassIntrospector.java | 157 ++++--- .../ext/beans/MethodAppearanceFineTuner.java | 3 +- .../java/freemarker/ext/beans/_BeansAPI.java | 70 +-- .../freemarker/ext/util/IdentityHashMap.java | 9 +- .../java/freemarker/ext/util/ModelCache.java | 19 +- .../template/AdapterTemplateModel.java | 2 +- .../java/freemarker/template/Configuration.java | 3 + .../template/DefaultObjectWrapper.java | 23 +- .../template/DefaultObjectWrapperBuilder.java | 18 +- .../template/ObjectWrapperAndUnwrapper.java | 2 +- .../freemarker/template/SimpleSequence.java | 2 +- .../template/TemplateCollectionModelEx.java | 2 +- .../java/freemarker/template/_TemplateAPI.java | 3 +- .../resources/freemarker/version.properties | 8 +- src/manual/en_US/book.xml | 459 +++++++++++-------- src/manual/en_US/docgen.cjson | 2 +- src/test/java/freemarker/core/ASTTest.java | 2 +- .../ext/beans/BeansAPINewInstanceTest.java | 6 +- .../ext/beans/BeansWrapperSingletonsTest.java | 3 +- .../template/DefaultObjectWrapperTest.java | 1 + .../template/TemplateLanguageVersionTest.java | 3 +- .../CopyrightCommentRemoverTemplateLoader.java | 1 + src/test/java/freemarker/test/TemplateTest.java | 1 + src/test/java/freemarker/test/TestUtil.java | 115 ----- .../freemarker/test/servlet/WebAppTestCase.java | 2 +- .../test/templatesuite/TemplateTestCase.java | 46 +- .../test/templatesuite/TemplateTestSuite.java | 2 +- .../models/OverloadedMethods2.java | 144 +++--- .../freemarker/test/utility/FileTestCase.java | 1 - .../java/freemarker/test/utility/Helpers.java | 164 ------- .../java/freemarker/test/utility/TestUtil.java | 266 +++++++++++ .../expected/sequence-builtins.txt | 7 + .../templates/sequence-builtins.ftl | 8 +- 42 files changed, 1078 insertions(+), 878 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/44201a6d/src/main/resources/freemarker/version.properties ----------------------------------------------------------------------
