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/a5fb3511
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a5fb3511
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a5fb3511

Branch: refs/heads/2.3
Commit: a5fb3511f13dbf6fb20ea85de120a2e8bb6175fe
Parents: bfb836b 67691b4
Author: ddekany <ddek...@apache.org>
Authored: Sat Aug 5 16:23:16 2017 +0200
Committer: ddekany <ddek...@apache.org>
Committed: Sat Aug 5 16:23:16 2017 +0200

----------------------------------------------------------------------
 .travis.yml                                     |   9 +
 README                                          | 234 --------------
 README.md                                       | 223 +++++++++++++
 build.xml                                       |  74 ++---
 .../freemarker/cache/TemplateNameFormat.java    |   4 +-
 .../java/freemarker/core/ArithmeticEngine.java  |   8 +-
 .../java/freemarker/core/BlockAssignment.java   |  84 ++---
 .../core/BuiltInsForMultipleTypes.java          |   2 +-
 src/main/java/freemarker/core/Case.java         |   4 +-
 src/main/java/freemarker/core/Configurable.java | 174 +++++++---
 src/main/java/freemarker/core/Environment.java  |  45 ++-
 src/main/java/freemarker/core/IfBlock.java      |   2 +-
 .../java/freemarker/core/NumericalOutput.java   |   4 +-
 src/main/java/freemarker/core/SwitchBlock.java  |  31 +-
 .../freemarker/core/TemplateConfiguration.java  |  15 +-
 .../java/freemarker/core/TemplateElement.java   |  11 +-
 .../java/freemarker/core/TemplateObject.java    |   3 -
 src/main/java/freemarker/core/TextBlock.java    |   4 +-
 .../java/freemarker/core/TrimInstruction.java   |   8 +-
 src/main/java/freemarker/core/_CoreAPI.java     |   4 +
 src/main/java/freemarker/core/_Java8Impl.java   |   2 +-
 .../core/_ObjectBuilderSettingEvaluator.java    |   3 +-
 .../java/freemarker/ext/beans/BeansWrapper.java |   2 +-
 .../template/AttemptExceptionReporter.java      |  48 +++
 .../java/freemarker/template/Configuration.java |  91 +++++-
 .../template/GeneralPurposeNothing.java         |  15 +-
 .../LoggingAttemptExceptionReporter.java        |  29 ++
 src/main/java/freemarker/template/Template.java |  14 +-
 .../template/TemplateExceptionHandler.java      |   8 +-
 .../template/TemplateNodeModelEx.java           |   4 +-
 .../java/freemarker/template/_TemplateAPI.java  |   9 +
 .../freemarker/template/utility/Constants.java  |  36 ++-
 src/main/javacc/FTL.jj                          | 136 ++++++--
 .../resources/freemarker/version.properties     |  11 +-
 src/manual/en_US/book.xml                       | 324 +++++++++++++++----
 .../freemarker/core/AttemptLoggingTest.java     |  77 +++++
 .../core/CapturingAssignmentTest.java           |  55 ++++
 .../core/ParsingErrorMessagesTest.java          |   2 +
 .../core/TemplateConfigurationTest.java         |   2 +
 .../freemarker/template/ConfigurationTest.java  |  12 +
 .../template/DefaultObjectWrapperTest.java      |   1 +
 .../template/utility/ConstantsTest.java         |  21 ++
 .../freemarker/core/ast-strlitinterpolation.ast |   4 +-
 .../test/templatesuite/expected/switch.txt      |   2 +
 .../test/templatesuite/templates/boolean.ftl    |   4 +
 .../test/templatesuite/templates/switch.ftl     |   3 +
 46 files changed, 1296 insertions(+), 562 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5fb3511/src/main/java/freemarker/core/TemplateElement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5fb3511/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5fb3511/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------

Reply via email to