freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [35/35] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Wed, 30 Dec 2015 18:11:55 GMT
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/f0695c39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f0695c39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f0695c39

Branch: refs/heads/2.3
Commit: f0695c39a6044653f115ebbbada44873d216dfe7
Parents: ad73f5f be2d799
Author: ddekany <ddekany@apache.org>
Authored: Wed Dec 30 19:09:37 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Wed Dec 30 19:09:37 2015 +0100

----------------------------------------------------------------------
 .gitignore                                      |    23 +-
 build.xml                                       |    22 +-
 src/main/java/freemarker/core/BuiltIn.java      |    31 +-
 .../core/BuiltInsForMultipleTypes.java          |     7 +-
 .../freemarker/core/BuiltInsForStringsMisc.java |     3 +-
 .../java/freemarker/core/CSSOutputFormat.java   |    52 +
 src/main/java/freemarker/core/Configurable.java |    19 +-
 src/main/java/freemarker/core/Environment.java  |    15 +-
 .../java/freemarker/core/HTMLOutputFormat.java  |     4 +-
 src/main/java/freemarker/core/Interpret.java    |     3 +-
 .../java/freemarker/core/JSONOutputFormat.java  |    52 +
 .../freemarker/core/JavaScriptOutputFormat.java |    53 +
 .../java/freemarker/core/LocalContextStack.java |    18 +
 .../freemarker/core/MarkupOutputFormat.java     |    26 +-
 src/main/java/freemarker/core/OutputFormat.java |    35 +-
 .../core/OutputFormatBoundBuiltIn.java          |     4 +-
 .../freemarker/core/PlainTextOutputFormat.java  |     8 +-
 .../java/freemarker/core/RTFOutputFormat.java   |     6 +-
 .../freemarker/core/StackTraceVisibility.java   |     8 -
 .../freemarker/core/TemplateConfiguration.java  |     4 +-
 .../core/TemplateDateFormatFactory.java         |     2 +-
 .../core/TemplateElementArrayBuilder.java       |    18 +
 .../core/TemplateElementsToVisit.java           |    18 +
 .../core/TemplateMarkupOutputModel.java         |    15 +-
 .../core/TemplateNumberFormatFactory.java       |     2 +-
 .../java/freemarker/core/XHTMLOutputFormat.java |     4 +-
 .../java/freemarker/core/XMLOutputFormat.java   |    10 +-
 src/main/java/freemarker/core/_CoreAPI.java     |   145 +-
 .../core/_ObjectBuilderSettingEvaluator.java    |   123 +-
 ..._ParserConfigurationWithInheritedFormat.java |    10 +-
 .../java/freemarker/ext/dom/ElementModel.java   |     2 +-
 .../java/freemarker/ext/dom/NodeListModel.java  |     5 +
 src/main/java/freemarker/ext/dom/NodeModel.java |     6 +-
 .../java/freemarker/ext/dom/NodeOutputter.java  |    39 +-
 .../java/freemarker/template/Configuration.java |   136 +-
 .../freemarker/template/utility/StringUtil.java |    27 +-
 src/main/javacc/FTL.jj                          |     8 +-
 src/manual/book.xml                             | 37479 ----------------
 src/manual/docgen-help/editors-readme.txt       |   105 -
 src/manual/docgen-misc/googleAnalytics.html     |     9 -
 .../figures/model2sketch_with_alpha.png         |   Bin 61463 -> 0 bytes
 .../figures/odg-convert-howto.txt               |    24 -
 .../docgen-originals/figures/overview.odg       |   Bin 11939 -> 0 bytes
 .../figures/tree_with_alpha.png                 |   Bin 10304 -> 0 bytes
 src/manual/docgen.cjson                         |   112 -
 src/manual/en_US/book.xml                       | 38413 +++++++++++++++++
 src/manual/en_US/docgen-help/editors-readme.txt |   105 +
 .../en_US/docgen-misc/googleAnalytics.html      |     9 +
 .../figures/model2sketch_with_alpha.png         |   Bin 0 -> 61463 bytes
 .../figures/odg-convert-howto.txt               |    24 +
 .../en_US/docgen-originals/figures/overview.odg |   Bin 0 -> 11939 bytes
 .../figures/tree_with_alpha.png                 |   Bin 0 -> 10304 bytes
 src/manual/en_US/docgen.cjson                   |   112 +
 src/manual/en_US/favicon.png                    |   Bin 0 -> 1291 bytes
 src/manual/en_US/figures/model2sketch.png       |   Bin 0 -> 21425 bytes
 src/manual/en_US/figures/overview.png           |   Bin 0 -> 11837 bytes
 src/manual/en_US/figures/tree.png               |   Bin 0 -> 4699 bytes
 src/manual/en_US/logo.png                       |   Bin 0 -> 10134 bytes
 src/manual/favicon.png                          |   Bin 1291 -> 0 bytes
 src/manual/figures/model2sketch.png             |   Bin 21425 -> 0 bytes
 src/manual/figures/overview.png                 |   Bin 11837 -> 0 bytes
 src/manual/figures/tree.png                     |   Bin 4699 -> 0 bytes
 src/manual/logo.png                             |   Bin 10134 -> 0 bytes
 src/manual/zh_CN/placeholder.txt                |     5 +
 .../core/BaseNTemplateNumberFormatFactory.java  |    21 +-
 .../java/freemarker/core/CamelCaseTest.java     |     4 +-
 .../freemarker/core/CoercionToTextualTest.java  |    18 +
 .../core/CombinedMarkupOutputFormatTest.java    |     2 +-
 .../EpochMillisTemplateDateFormatFactory.java   |    12 +-
 .../freemarker/core/IncludeAndImportTest.java   |    99 +
 .../freemarker/core/IteratorIssuesTest.java     |    18 +
 .../core/ObjectBuilderSettingsTest.java         |    50 +
 .../java/freemarker/core/OutputFormatTest.java  |    22 +
 .../freemarker/core/RTFOutputFormatTest.java    |     2 +-
 .../freemarker/core/XMLOutputFormatTest.java    |     2 +-
 src/test/java/freemarker/ext/dom/DOMTest.java   |   110 +
 .../ext/servlet/FreemarkerServletTest.java      |    55 +
 .../freemarker/manual/CustomFormatsExample.java |    91 +
 .../manual/GettingStartedExample.java           |    67 +
 src/test/java/freemarker/manual/Product.java    |    49 +
 .../UnitAwareTemplateNumberFormatFactory.java   |    80 +
 .../manual/UnitAwareTemplateNumberModel.java    |    43 +
 .../freemarker/template/ConfigurationTest.java  |    41 +
 src/test/java/freemarker/test/TemplateTest.java |    21 +-
 .../manual/CustomFormatsExample-alias1.ftlh     |     4 +
 .../manual/CustomFormatsExample-alias1.ftlh.out |     4 +
 .../manual/CustomFormatsExample-alias2.ftlh     |     1 +
 .../manual/CustomFormatsExample-alias2.ftlh.out |     1 +
 .../manual/CustomFormatsExample-modelAware.ftlh |     2 +
 .../CustomFormatsExample-modelAware.ftlh.out    |     2 +
 src/test/resources/freemarker/manual/test.ftlh  |    10 +
 .../test/templatesuite/expected/interpret.txt   |     2 +
 .../expected/type-builtins-ici-2.3.24.txt       |    15 +
 .../test/templatesuite/templates/interpret.ftl  |     2 +
 .../freemarker/test/templatesuite/testcases.xml |     5 +-
 95 files changed, 40234 insertions(+), 37981 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0695c39/build.xml
----------------------------------------------------------------------


Mime
View raw message