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/12/31 01:14:51 UTC
[7/7] 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/71117cc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/71117cc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/71117cc2
Branch: refs/heads/2.3
Commit: 71117cc292b108ab1e6f33095c98c1e12ea303dd
Parents: f0695c3 559381f
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 01:13:34 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 01:13:34 2015 +0100
----------------------------------------------------------------------
src/examples/ant/src/template/faq2html.ftl | 18 +++++
src/examples/struts-webapp/add.ftl | 18 +++++
src/examples/struts-webapp/form.ftl | 18 +++++
src/examples/struts-webapp/index.ftl | 18 +++++
src/examples/struts-webapp/lib/common.ftl | 18 +++++
src/examples/webapp1/WEB-INF/templates/test.ftl | 18 +++++
src/examples/webapp2/WEB-INF/templates/add.ftl | 18 +++++
src/examples/webapp2/WEB-INF/templates/form.ftl | 18 +++++
.../webapp2/WEB-INF/templates/index.ftl | 18 +++++
.../webapp2/WEB-INF/templates/lib/common.ftl | 18 +++++
.../misc/overloadedNumberRules/generator.ftl | 18 +++++
src/test/java/freemarker/core/ASTTest.java | 4 +-
.../CopyrightCommentRemoverTemplateLoader.java | 63 +++++++++++++++
src/test/java/freemarker/test/TestUtil.java | 81 ++++++++++++++++++++
.../test/templatesuite/TemplateTestCase.java | 8 +-
src/test/resources/freemarker/cache/test.ftl | 18 +++++
src/test/resources/freemarker/core/ast-1.ftl | 18 +++++
.../freemarker/core/ast-assignments.ftl | 18 +++++
.../resources/freemarker/core/ast-builtins.ftl | 18 +++++
.../resources/freemarker/core/ast-locations.ftl | 18 +++++
.../core/ast-mixedcontentsimplifications.ftl | 18 +++++
.../core/ast-multipleignoredchildren.ftl | 18 +++++
.../core/ast-nestedignoredchildren.ftl | 18 +++++
.../resources/freemarker/core/ast-range.ftl | 18 +++++
.../freemarker/core/ast-strlitinterpolation.ftl | 18 +++++
.../freemarker/core/ast-whitesoacestripping.ftl | 18 +++++
.../core/cano-assignments-canonical.ftl | 18 +++++
.../freemarker/core/cano-assignments.ftl | 18 +++++
.../freemarker/core/cano-builtins-canonical.ftl | 19 ++++-
.../resources/freemarker/core/cano-builtins.ftl | 18 +++++
.../core/cano-identifier-escaping-canonical.ftl | 19 ++++-
.../core/cano-identifier-escaping.ftl | 18 +++++
.../freemarker/core/cano-macros-canonical.ftl | 18 +++++
.../resources/freemarker/core/cano-macros.ftl | 18 +++++
.../core/cano-strlitinterpolation-canonical.ftl | 19 ++++-
.../core/cano-strlitinterpolation.ftl | 18 +++++
.../core/encodingOverride-ISO-8859-1.ftl | 18 +++++
.../freemarker/core/encodingOverride-UTF-8.ftl | 18 +++++
.../ext/jsp/templates/classpath-test.ftl | 18 +++++
.../ext/jsp/webapps/basic/attributes.ftl | 18 +++++
.../jsp/webapps/basic/customELFunctions1.ftl | 18 +++++
.../ext/jsp/webapps/basic/customTags1.ftl | 18 +++++
.../jsp/webapps/basic/trivial-jstl-@Ignore.ftl | 18 +++++
.../ext/jsp/webapps/basic/trivial.ftl | 18 +++++
.../webapps/config/WEB-INF/classes/sub/test.ftl | 18 +++++
.../jsp/webapps/config/WEB-INF/classes/test.ftl | 18 +++++
.../webapps/config/WEB-INF/templates/test.ftl | 18 +++++
.../freemarker/ext/jsp/webapps/config/test.ftl | 18 +++++
.../ext/jsp/webapps/errors/failing-runtime.ftl | 18 +++++
.../ext/jsp/webapps/errors/not-failing.ftl | 18 +++++
.../multipleLoaders/WEB-INF/templates/test.ftl | 18 +++++
.../webapps/tldDiscovery/subdir/test-rel.ftl | 18 +++++
.../webapps/tldDiscovery/test-noClasspath.ftl | 18 +++++
.../ext/jsp/webapps/tldDiscovery/test1.ftl | 18 +++++
.../manual/AutoEscapingExample-capture.ftlh | 19 ++++-
.../manual/AutoEscapingExample-convert.ftlh | 20 ++++-
.../manual/AutoEscapingExample-convert2.ftl | 18 +++++
.../manual/AutoEscapingExample-infoBox.ftlh | 20 ++++-
.../manual/AutoEscapingExample-infoBox.ftlh.out | 1 -
.../manual/AutoEscapingExample-markup.ftlh | 19 ++++-
.../AutoEscapingExample-stringConcat.ftlh | 19 ++++-
.../AutoEscapingExample-stringLiteral.ftlh | 19 ++++-
.../AutoEscapingExample-stringLiteral2.ftlh | 20 ++++-
.../manual/CustomFormatsExample-alias1.ftlh | 18 +++++
.../manual/CustomFormatsExample-alias2.ftlh | 18 +++++
.../manual/CustomFormatsExample-modelAware.ftlh | 18 +++++
src/test/resources/freemarker/manual/test.ftlh | 18 +++++
.../resources/freemarker/template/toCache1.ftl | 18 +++++
.../resources/freemarker/template/toCache2.ftl | 18 +++++
.../templatesuite/templates/api-builtins.ftl | 18 +++++
.../test/templatesuite/templates/arithmetic.ftl | 18 +++++
.../templatesuite/templates/assignments.ftl | 18 +++++
.../test/templatesuite/templates/bean-maps.ftl | 18 +++++
.../test/templatesuite/templates/beans.ftl | 18 +++++
.../templates/boolean-formatting.ftl | 18 +++++
.../test/templatesuite/templates/boolean.ftl | 18 +++++
.../templates/charset-in-header.ftl | 18 +++++
.../templates/charset-in-header_inc1.ftl | 18 +++++
.../templates/charset-in-header_inc2.ftl | 18 +++++
.../templates/classic-compatible-mode2.ftl | 18 +++++
.../templates/classic-compatible.ftl | 18 +++++
.../test/templatesuite/templates/comment.ftl | 18 +++++
.../templatesuite/templates/comparisons.ftl | 18 +++++
.../test/templatesuite/templates/compress.ftl | 18 +++++
.../templates/date-type-builtins.ftl | 18 +++++
.../templates/dateformat-iso-bi-common.ftl | 18 +++++
.../templates/dateformat-iso-bi-ici-2.3.21.ftl | 18 +++++
.../templates/dateformat-iso-bi.ftl | 18 +++++
.../templates/dateformat-iso-like.ftl | 18 +++++
.../templatesuite/templates/dateformat-java.ftl | 18 +++++
.../templatesuite/templates/dateparsing.ftl | 18 +++++
.../templatesuite/templates/default-xmlns.ftl | 18 +++++
.../test/templatesuite/templates/default.ftl | 18 +++++
.../templates/encoding-builtins.ftl | 18 +++++
.../test/templatesuite/templates/escapes.ftl | 18 +++++
.../test/templatesuite/templates/exception.ftl | 18 +++++
.../test/templatesuite/templates/exception2.ftl | 18 +++++
.../test/templatesuite/templates/exception3.ftl | 18 +++++
.../templates/existence-operators.ftl | 18 +++++
.../test/templatesuite/templates/exthash.ftl | 18 +++++
.../test/templatesuite/templates/hashconcat.ftl | 18 +++++
.../templatesuite/templates/hashliteral.ftl | 18 +++++
.../test/templatesuite/templates/helloworld.ftl | 18 +++++
.../templates/identifier-escaping.ftl | 18 +++++
.../templates/identifier-non-ascii.ftl | 18 +++++
.../test/templatesuite/templates/if.ftl | 18 +++++
.../test/templatesuite/templates/import.ftl | 18 +++++
.../test/templatesuite/templates/import_lib.ftl | 18 +++++
.../test/templatesuite/templates/include.ftl | 18 +++++
.../templates/include2-included-encoding.ftl | 18 +++++
.../templates/include2-included.ftl | 18 +++++
.../test/templatesuite/templates/include2.ftl | 18 +++++
.../test/templatesuite/templates/included.ftl | 18 +++++
.../test/templatesuite/templates/interpret.ftl | 18 +++++
.../test/templatesuite/templates/iterators.ftl | 18 +++++
.../templatesuite/templates/lastcharacter.ftl | 18 +++++
.../test/templatesuite/templates/list-bis.ftl | 18 +++++
.../test/templatesuite/templates/list.ftl | 18 +++++
.../test/templatesuite/templates/list2.ftl | 18 +++++
.../test/templatesuite/templates/list3.ftl | 18 +++++
.../templatesuite/templates/listliteral.ftl | 18 +++++
.../templatesuite/templates/localization.ftl | 18 +++++
.../templatesuite/templates/localization_en.ftl | 18 +++++
.../templates/localization_en_AU.ftl | 18 +++++
.../test/templatesuite/templates/logging.ftl | 18 +++++
.../templatesuite/templates/loopvariable.ftl | 18 +++++
.../templatesuite/templates/macros-return.ftl | 18 +++++
.../test/templatesuite/templates/macros.ftl | 18 +++++
.../test/templatesuite/templates/macros2.ftl | 18 +++++
.../templatesuite/templates/multimodels.ftl | 18 +++++
.../test/templatesuite/templates/nested.ftl | 18 +++++
.../templatesuite/templates/nestedinclude.ftl | 18 +++++
.../templates/new-allowsnothing.ftl | 18 +++++
.../templates/new-defaultresolver.ftl | 18 +++++
.../test/templatesuite/templates/new-optin.ftl | 18 +++++
.../test/templatesuite/templates/new-safer.ftl | 18 +++++
.../templates/new-unrestricted.ftl | 18 +++++
.../test/templatesuite/templates/newlines1.ftl | 18 +++++
.../test/templatesuite/templates/newlines2.ftl | 18 +++++
.../templates/non-strict-syntax.ftl | 18 +++++
.../test/templatesuite/templates/noparse.ftl | 18 +++++
.../templatesuite/templates/number-format.ftl | 18 +++++
.../templatesuite/templates/number-literal.ftl | 18 +++++
.../templates/number-math-builtins.ftl | 18 +++++
.../templatesuite/templates/number-to-date.ftl | 18 +++++
.../templatesuite/templates/numerical-cast.ftl | 18 +++++
.../templates/output-encoding1.ftl | 18 +++++
.../templates/output-encoding2.ftl | 18 +++++
.../templates/output-encoding3.ftl | 18 +++++
.../overloaded-methods-2-bwici-2.3.20.ftl | 18 +++++
.../overloaded-methods-2-bwici-2.3.21.ftl | 18 +++++
.../templates/overloaded-methods-2-common.ftl | 18 +++++
.../overloaded-methods-2-desc-bwici-2.3.20.ftl | 18 +++++
.../overloaded-methods-2-inc-bwici-2.3.20.ftl | 18 +++++
.../templates/overloaded-methods-23bc.ftl | 18 +++++
.../test/templatesuite/templates/precedence.ftl | 18 +++++
.../templatesuite/templates/range-common.ftl | 18 +++++
.../templates/range-ici-2.3.20.ftl | 18 +++++
.../templates/range-ici-2.3.21.ftl | 18 +++++
.../test/templatesuite/templates/recover.ftl | 18 +++++
.../test/templatesuite/templates/root.ftl | 18 +++++
.../templates/sequence-builtins.ftl | 18 +++++
.../test/templatesuite/templates/setting.ftl | 18 +++++
.../templates/simplehash-char-key.ftl | 18 +++++
.../templatesuite/templates/specialvars.ftl | 18 +++++
.../templatesuite/templates/strictinheader.ftl | 18 +++++
.../templates/strictinheader_inc1.ftl | 18 +++++
.../templates/strictinheader_inc2.ftl | 18 +++++
.../templates/string-builtin-coercion.ftl | 18 +++++
.../templates/string-builtins-ici-2.3.19.ftl | 18 +++++
.../templates/string-builtins-ici-2.3.20.ftl | 18 +++++
.../string-builtins-regexps-matches.ftl | 18 +++++
.../templates/string-builtins-regexps.ftl | 18 +++++
.../templates/string-builtins1.ftl | 18 +++++
.../templates/string-builtins2.ftl | 18 +++++
.../templates/string-builtins3.ftl | 18 +++++
.../templatesuite/templates/stringbimethods.ftl | 18 +++++
.../templatesuite/templates/stringliteral.ftl | 18 +++++
.../templates/subdir/include-subdir.ftl | 18 +++++
.../templates/subdir/include-subdir2.ftl | 18 +++++
.../templates/subdir/new-optin-2.ftl | 18 +++++
.../templates/subdir/new-optin.ftl | 18 +++++
.../templates/subdir/subsub/new-optin.ftl | 18 +++++
.../templatesuite/templates/switch-builtin.ftl | 18 +++++
.../test/templatesuite/templates/switch.ftl | 18 +++++
.../templatesuite/templates/then-builtin.ftl | 18 +++++
.../test/templatesuite/templates/transforms.ftl | 18 +++++
.../templatesuite/templates/type-builtins.ftl | 18 +++++
.../test/templatesuite/templates/undefined.ftl | 18 +++++
.../test/templatesuite/templates/url.ftl | 18 +++++
.../test/templatesuite/templates/var-layers.ftl | 18 +++++
.../test/templatesuite/templates/varargs.ftl | 18 +++++
.../test/templatesuite/templates/variables.ftl | 18 +++++
.../templatesuite/templates/varlayers_lib.ftl | 18 +++++
.../templatesuite/templates/whitespace-trim.ftl | 18 +++++
.../templates/wsstripinheader_inc.ftl | 18 +++++
.../templates/wstrip-in-header.ftl | 18 +++++
.../templatesuite/templates/xml-fragment.ftl | 18 +++++
.../templates/xml-ns_prefix-scope-lib.ftl | 18 +++++
.../templates/xml-ns_prefix-scope-main.ftl | 18 +++++
.../test/templatesuite/templates/xml.ftl | 18 +++++
.../test/templatesuite/templates/xmlns1.ftl | 18 +++++
.../test/templatesuite/templates/xmlns3.ftl | 18 +++++
.../test/templatesuite/templates/xmlns4.ftl | 18 +++++
.../test/templatesuite/templates/xmlns5.ftl | 18 +++++
205 files changed, 3752 insertions(+), 18 deletions(-)
----------------------------------------------------------------------