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 2016/06/12 16:54:29 UTC
[48/50] 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/d6eb0721
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d6eb0721
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d6eb0721
Branch: refs/heads/2.3
Commit: d6eb072153a0874ba2e5fdb8e2e21645e9749b8e
Parents: d809cae 08e4f1d
Author: ddekany <dd...@apache.org>
Authored: Sun Jun 12 18:23:07 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Jun 12 18:23:07 2016 +0200
----------------------------------------------------------------------
build.xml | 45 +-
ivy.xml | 3 +-
.../freemarker/core/BuiltInsForStringsMisc.java | 13 +-
src/main/java/freemarker/core/Configurable.java | 507 ++++++++-
src/main/java/freemarker/core/Environment.java | 14 +-
src/main/java/freemarker/core/HashLiteral.java | 33 +-
src/main/java/freemarker/core/Items.java | 43 +-
.../java/freemarker/core/IteratorBlock.java | 239 +++-
.../LegacyConstructorParserConfiguration.java | 19 +-
.../core/NonSequenceOrCollectionException.java | 36 +-
.../freemarker/core/ParserConfiguration.java | 7 +
.../java/freemarker/core/StringLiteral.java | 16 +-
.../freemarker/core/TemplateConfiguration.java | 114 +-
src/main/java/freemarker/core/_CoreAPI.java | 1 +
.../core/_ErrorDescriptionBuilder.java | 8 +
..._ParserConfigurationWithInheritedFormat.java | 5 +
.../freemarker/ext/beans/SimpleMapModel.java | 8 +-
.../java/freemarker/template/Configuration.java | 328 +++---
.../template/DefaultIterableAdapter.java | 89 ++
.../template/DefaultIteratorAdapter.java | 4 +-
.../freemarker/template/DefaultListAdapter.java | 28 +-
.../freemarker/template/DefaultMapAdapter.java | 6 +-
.../DefaultNonListCollectionAdapter.java | 24 +-
.../template/DefaultObjectWrapper.java | 40 +-
.../DefaultObjectWrapperConfiguration.java | 25 +-
.../DefaultUnassignableIteratorAdapter.java | 52 +
.../template/MapKeyValuePairIterator.java | 69 ++
.../java/freemarker/template/SimpleHash.java | 13 +-
src/main/java/freemarker/template/Template.java | 28 +-
.../template/TemplateHashModelEx2.java | 80 ++
.../java/freemarker/template/_TemplateAPI.java | 3 +
src/main/javacc/FTL.jj | 81 +-
.../resources/freemarker/version.properties | 10 +-
src/manual/en_US/book.xml | 1020 +++++++++++-------
src/manual/en_US/docgen.cjson | 2 +-
.../IncludeAndImportConfigurableLayersTest.java | 337 ++++++
.../java/freemarker/core/ListErrorsTest.java | 137 +++
.../freemarker/core/ListValidationsTest.java | 111 --
src/test/java/freemarker/core/TabSizeTest.java | 97 ++
.../core/TemplateConfigurationTest.java | 126 ++-
.../ext/beans/BeansWrapperSingletonsTest.java | 2 +-
.../ext/jsp/RealServletContainertTest.java | 2 +
.../freemarker/template/ConfigurationTest.java | 58 +
.../template/DefaultObjectWrapperTest.java | 141 ++-
.../java/freemarker/template/GetSourceTest.java | 53 +
.../template/TemplateLanguageVersionTest.java | 2 +-
src/test/java/freemarker/test/TemplateTest.java | 9 +
.../test/templatesuite/TemplateTestCase.java | 5 +-
.../test/templatesuite/models/Listables.java | 104 ++
.../test/templatesuite/expected/listhash.txt | 201 ++++
.../expected/listhashliteral-ici-2.3.20.txt | 39 +
.../expected/listhashliteral-ici-2.3.21.txt | 36 +
.../test/templatesuite/templates/listhash.ftl | 70 ++
.../templatesuite/templates/listhashliteral.ftl | 35 +
.../freemarker/test/templatesuite/testcases.xml | 7 +
55 files changed, 3624 insertions(+), 961 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d6eb0721/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d6eb0721/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d6eb0721/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------