[19/19] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

2017-08-25 Thread ddekany 
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/b2578291
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b2578291
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b2578291

Branch: refs/heads/2.3
Commit: b2578291026b6347e891a6707caf90a956bf7dfd
Parents: a5fb351 a4a406a
Author: ddekany 
Authored: Sat Aug 26 01:38:49 2017 +0200
Committer: ddekany 
Committed: Sat Aug 26 01:38:49 2017 +0200

--
 README.md   |  2 +-
 .../core/BuiltInsForMultipleTypes.java  |  4 +-
 .../freemarker/core/BuiltInsForSequences.java   |  6 +-
 .../core/BuiltInsForStringsEncoding.java| 16 +++---
 .../core/BuiltInsForStringsRegexp.java  | 12 ++--
 .../core/InvalidReferenceException.java |  2 +-
 src/main/java/freemarker/core/Macro.java|  3 +-
 .../java/freemarker/core/StringLiteral.java | 12 ++--
 .../core/UnexpectedTypeException.java   |  2 +-
 .../java/freemarker/ext/beans/BeanModel.java| 18 --
 .../java/freemarker/ext/beans/BeansWrapper.java | 16 +-
 .../ext/beans/ClassBasedModelFactory.java   |  5 +-
 .../freemarker/ext/beans/SimpleMethodModel.java | 21 ---
 .../java/freemarker/template/Configuration.java | 12 
 .../template/GeneralPurposeNothing.java |  2 +-
 .../freemarker/template/SimpleCollection.java   | 23 +---
 .../template/TemplateCollectionModel.java   | 12 ++--
 .../template/TemplateCollectionModelEx.java |  4 +-
 .../template/TemplateModelException.java|  3 +-
 .../template/TemplateScalarModel.java   | 14 +++--
 .../java/freemarker/template/_TemplateAPI.java  |  1 +
 .../freemarker/template/utility/Constants.java  | 11 ++--
 src/main/javacc/FTL.jj  | 35 +++-
 src/manual/en_US/book.xml   | 47 ++--
 .../java/freemarker/core/ListErrorsTest.java|  5 ++
 .../ext/beans/BeansWrapperMiscTest.java | 58 +++-
 .../template/DefaultObjectWrapperTest.java  |  2 +-
 27 files changed, 252 insertions(+), 96 deletions(-)
--

[19/19] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae'

2016-01-01 Thread ddekany 
Merge remote-tracking branch 'origin/2.3-gae'


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c6209680
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c6209680
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c6209680

Branch: refs/heads/master
Commit: c62096801d5b02fc5e2404871e52aee0249b5f0d
Parents: e8fdf53 64f2cd1
Author: ddekany 
Authored: Sat Jan 2 01:44:27 2016 +0100
Committer: ddekany 
Committed: Sat Jan 2 01:46:42 2016 +0100

--
 NOTICE  |   2 +-
 README  | 134 ++
 README.txt  | 113 
 RELEASE-NOTES   |   6 +
 build.xml   | 128 ++---
 codestyle.xml   |  18 ++
 src/dist/DISCLAIMER |   8 -
 src/dist/LICENSE| 257 ---
 src/dist/NOTICE |  30 ---
 src/dist/bin/LICENSE| 257 +++
 src/dist/bin/NOTICE |  30 +++
 src/dist/bin/documentation/index.html   |  65 +
 src/dist/documentation/index.html   |  98 ---
 src/examples/README.txt |  19 ++
 src/examples/ant/README.txt |  19 ++
 .../freemarker/ext/beans/UnsafeMethods.java |   2 +-
 .../freemarker/template/utility/StringUtil.java |   2 +-
 src/main/misc/overloadedNumberRules/README.txt  |  19 ++
 src/main/misc/overloadedNumberRules/prices.csv  |  48 
 .../ext/beans/unsafeMethods.properties  |  98 +++
 .../freemarker/ext/beans/unsafeMethods.txt  |  81 --
 src/manual/change-log-2.4.txt   |  19 ++
 src/manual/en_US/docgen-help/editors-readme.txt |  19 ++
 .../en_US/docgen-misc/copyrightComment.txt  |  16 ++
 .../figures/odg-convert-howto.txt   |  19 ++
 src/manual/en_US/docgen.cjson   |   5 +-
 src/manual/zh_CN/placeholder.txt|  19 ++
 src/test/java/freemarker/core/ASTTest.java  |   6 +-
 .../java/freemarker/core/CanonicalFormTest.java |  11 +-
 .../CopyrightCommentRemoverTemplateLoader.java  |   2 +-
 src/test/java/freemarker/test/TemplateTest.java |   2 +-
 src/test/java/freemarker/test/TestUtil.java |  36 ++-
 .../freemarker/test/servlet/WebAppTestCase.java |   3 +-
 .../freemarker/test/utility/FileTestCase.java   |   3 +-
 src/test/resources/freemarker/core/ast-1.ast|  18 ++
 .../freemarker/core/ast-assignments.ast |  18 ++
 .../resources/freemarker/core/ast-builtins.ast  |  18 ++
 .../resources/freemarker/core/ast-locations.ast |  18 ++
 .../core/ast-mixedcontentsimplifications.ast|  18 ++
 .../core/ast-multipleignoredchildren.ast|  18 ++
 .../core/ast-nestedignoredchildren.ast  |  18 ++
 .../resources/freemarker/core/ast-range.ast |  18 ++
 .../freemarker/core/ast-strlitinterpolation.ast |  18 ++
 .../freemarker/core/ast-whitespacestripping.ast |  18 ++
 .../core/cano-assignments-canonical.ftl |  34 ---
 .../freemarker/core/cano-assignments.ftl.out|  34 +++
 .../freemarker/core/cano-builtins-canonical.ftl |  22 --
 .../freemarker/core/cano-builtins.ftl.out   |  23 ++
 .../core/cano-identifier-escaping-canonical.ftl |  43 
 .../core/cano-identifier-escaping.ftl.out   |  44 
 .../freemarker/core/cano-macros-canonical.ftl   |  28 --
 .../freemarker/core/cano-macros.ftl.out |  28 ++
 .../core/cano-strlitinterpolation-canonical.ftl |  18 --
 .../core/cano-strlitinterpolation.ftl.out   |  19 ++
 .../basic/WEB-INF/expected/attributes-2.3.0.txt |  18 ++
 .../expected/attributes-2.3.22-future.txt   |  18 ++
 .../basic/WEB-INF/expected/attributes.txt   |  18 ++
 .../basic/WEB-INF/expected/customTags1.txt  |  18 ++
 .../webapps/config/WEB-INF/lib/templates.jar| Bin 579 -> 1018 bytes
 .../WEB-INF/expected/subdir/test-rel.txt|  18 ++
 .../WEB-INF/expected/test-noClasspath.txt   |  18 ++
 .../tldDiscovery/WEB-INF/expected/test1.txt |  18 ++
 .../tldDiscovery/WEB-INF/lib/taglib-foo.jar | Bin 791 -> 1221 bytes
 .../webapps/tldDiscovery/WEB-INF/taglib 2.jar   | Bin 752 -> 1179 bytes
 .../manual/AutoEscapingExample-capture.ftlh.out |  18 ++
 .../manual/AutoEscapingExample-convert.ftlh.out |  18 ++
 .../manual/AutoEscapingExample-convert2.ftl.out |  18 ++
 .../manual/AutoEscapingExample-infoBox.ftlh.out |  18 ++
 .../manual/AutoEscapingExample-markup.ftlh.out  |  18 ++
 .../AutoEscapingExample-stringConcat.ftlh.out   |  18 ++
 .../AutoEscapingExample-stringLiteral.ftlh.out  |  18 ++
 .../AutoEscapingExample-stringLiteral2.ftlh.out |  18