Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 159A1200D13 for ; Sat, 30 Sep 2017 11:35:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 140441609C8; Sat, 30 Sep 2017 09:35:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 61EA71609D5 for ; Sat, 30 Sep 2017 11:35:09 +0200 (CEST) Received: (qmail 89774 invoked by uid 500); 30 Sep 2017 09:35:08 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 89765 invoked by uid 99); 30 Sep 2017 09:35:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Sep 2017 09:35:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id DA744180902 for ; Sat, 30 Sep 2017 09:35:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.722 X-Spam-Level: X-Spam-Status: No, score=-3.722 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_NUMSUBJECT=0.5, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id VnGqxk_-5tPY for ; Sat, 30 Sep 2017 09:35:07 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 05D035FB2D for ; Sat, 30 Sep 2017 09:35:05 +0000 (UTC) Received: (qmail 89677 invoked by uid 99); 30 Sep 2017 09:35:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Sep 2017 09:35:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55D16F5C06; Sat, 30 Sep 2017 09:35:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Sat, 30 Sep 2017 09:35:10 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3 archived-at: Sat, 30 Sep 2017 09:35:10 -0000 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 Authored: Sat Sep 30 11:34:43 2017 +0200 Committer: ddekany 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(-) ----------------------------------------------------------------------