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/a86146b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a86146b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a86146b1 Branch: refs/heads/2.3 Commit: a86146b19551b619a428e5ddda6e41a34c734050 Parents: bdc9025 2c12980 Author: ddekany <ddek...@apache.org> Authored: Sat Sep 30 11:34:43 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Sat Sep 30 11:34:43 2017 +0200 ---------------------------------------------------------------------- .../core/BreakOrContinueException.java | 20 ++- src/main/java/freemarker/core/Configurable.java | 58 ++++++- src/main/java/freemarker/core/Environment.java | 36 +++- src/main/java/freemarker/core/EvalUtil.java | 23 +++ src/main/java/freemarker/core/Expression.java | 18 +- .../freemarker/core/FlowControlException.java | 35 ++++ .../java/freemarker/core/ReturnInstruction.java | 2 +- .../freemarker/core/TemplateConfiguration.java | 7 + ...nterruptionSupportTemplatePostProcessor.java | 2 +- .../java/freemarker/template/Configuration.java | 74 ++++++++- .../LoggingAttemptExceptionReporter.java | 18 ++ .../template/TemplateDirectiveModel.java | 8 +- .../template/TemplateTransformModel.java | 56 ++++--- .../java/freemarker/template/_TemplateAPI.java | 6 +- src/manual/en_US/book.xml | 109 ++++++++++-- .../freemarker/core/AttemptLoggingTest.java | 18 ++ .../core/CapturingAssignmentTest.java | 18 ++ .../freemarker/core/ListBreakContinueTest.java | 18 ++ .../freemarker/core/SequenceBuiltInTest.java | 18 ++ .../core/TemplateConfigurationTest.java | 1 + .../core/TemplateTransformModelTest.java | 166 +++++++++++++++++++ .../core/UncheckedExceptionHandlingTest.java | 157 ++++++++++++++++++ .../freemarker/template/ConfigurationTest.java | 9 + .../template/utility/ConstantsTest.java | 18 ++ src/test/java/freemarker/test/TemplateTest.java | 38 ++++- 25 files changed, 880 insertions(+), 53 deletions(-) ----------------------------------------------------------------------
