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 15027200D13 for ; Sat, 26 Aug 2017 01:44:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1398116D849; Fri, 25 Aug 2017 23:44:56 +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 81B1116D84A for ; Sat, 26 Aug 2017 01:44:54 +0200 (CEST) Received: (qmail 6565 invoked by uid 500); 25 Aug 2017 23:41:58 -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 6375 invoked by uid 99); 25 Aug 2017 23:41:53 -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; Fri, 25 Aug 2017 23:41:53 +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 227381813FB for ; Fri, 25 Aug 2017 23:41:53 +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 gTq6cIHlsOpA for ; Fri, 25 Aug 2017 23:41:52 +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 5802A61A17 for ; Fri, 25 Aug 2017 23:41:49 +0000 (UTC) Received: (qmail 1881 invoked by uid 99); 25 Aug 2017 23:39:28 -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; Fri, 25 Aug 2017 23:39:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E0300F5F34; Fri, 25 Aug 2017 23:39:27 +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: Fri, 25 Aug 2017 23:39:45 -0000 Message-Id: <04409fd443054bb6937fd7d955c41408@git.apache.org> In-Reply-To: <489687399233402fb88f231f8c0495ce@git.apache.org> References: <489687399233402fb88f231f8c0495ce@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/19] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3 archived-at: Fri, 25 Aug 2017 23:44:56 -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/b2578291 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b2578291 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b2578291 Branch: refs/heads/2.3 Commit: b2578291026b6347e891a6707caf90a956bf7dfd Parents: a5fb351 a4a406a Author: ddekany Authored: Sat Aug 26 01:38:49 2017 +0200 Committer: ddekany Committed: Sat Aug 26 01:38:49 2017 +0200 ---------------------------------------------------------------------- README.md | 2 +- .../core/BuiltInsForMultipleTypes.java | 4 +- .../freemarker/core/BuiltInsForSequences.java | 6 +- .../core/BuiltInsForStringsEncoding.java | 16 +++--- .../core/BuiltInsForStringsRegexp.java | 12 ++-- .../core/InvalidReferenceException.java | 2 +- src/main/java/freemarker/core/Macro.java | 3 +- .../java/freemarker/core/StringLiteral.java | 12 ++-- .../core/UnexpectedTypeException.java | 2 +- .../java/freemarker/ext/beans/BeanModel.java | 18 ++++-- .../java/freemarker/ext/beans/BeansWrapper.java | 16 +++++- .../ext/beans/ClassBasedModelFactory.java | 5 +- .../freemarker/ext/beans/SimpleMethodModel.java | 21 ++++--- .../java/freemarker/template/Configuration.java | 12 ++++ .../template/GeneralPurposeNothing.java | 2 +- .../freemarker/template/SimpleCollection.java | 23 +++++--- .../template/TemplateCollectionModel.java | 12 ++-- .../template/TemplateCollectionModelEx.java | 4 +- .../template/TemplateModelException.java | 3 +- .../template/TemplateScalarModel.java | 14 +++-- .../java/freemarker/template/_TemplateAPI.java | 1 + .../freemarker/template/utility/Constants.java | 11 ++-- src/main/javacc/FTL.jj | 35 +++++++----- src/manual/en_US/book.xml | 47 ++++++++++++++-- .../java/freemarker/core/ListErrorsTest.java | 5 ++ .../ext/beans/BeansWrapperMiscTest.java | 58 +++++++++++++++++++- .../template/DefaultObjectWrapperTest.java | 2 +- 27 files changed, 252 insertions(+), 96 deletions(-) ----------------------------------------------------------------------