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 7CD91200BD3 for ; Tue, 6 Dec 2016 23:30:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7B932160B17; Tue, 6 Dec 2016 22:30:03 +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 CE57C160B29 for ; Tue, 6 Dec 2016 23:30:02 +0100 (CET) Received: (qmail 30284 invoked by uid 500); 6 Dec 2016 22:30:02 -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 30275 invoked by uid 99); 6 Dec 2016 22:30:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Dec 2016 22:30:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 98087C896F for ; Tue, 6 Dec 2016 22:30:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id y-beXWNzUzqE for ; Tue, 6 Dec 2016 22:30:00 +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 5802B5F1F4 for ; Tue, 6 Dec 2016 22:29:58 +0000 (UTC) Received: (qmail 29284 invoked by uid 99); 6 Dec 2016 22:29:57 -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; Tue, 06 Dec 2016 22:29:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1205AF2159; Tue, 6 Dec 2016 22:29:57 +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: Tue, 06 Dec 2016 22:30:19 -0000 Message-Id: In-Reply-To: <05bcaa7349b249bca60d129188d4364f@git.apache.org> References: <05bcaa7349b249bca60d129188d4364f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/24] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3 archived-at: Tue, 06 Dec 2016 22:30:03 -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/44201a6d Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/44201a6d Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/44201a6d Branch: refs/heads/2.3 Commit: 44201a6d1701ac66c2dfec8eb98e3f374a47496f Parents: dd7a2aa 4b989f8 Author: ddekany Authored: Tue Dec 6 23:27:36 2016 +0100 Committer: ddekany Committed: Tue Dec 6 23:27:36 2016 +0100 ---------------------------------------------------------------------- .../freemarker/core/AddConcatExpression.java | 58 ++- .../freemarker/core/BuiltInsForSequences.java | 33 +- src/main/java/freemarker/core/EvalUtil.java | 26 +- src/main/java/freemarker/core/NewBI.java | 8 +- .../debug/impl/RmiDebuggedEnvironmentImpl.java | 2 +- .../freemarker/ext/beans/ArgumentTypes.java | 75 ++- .../java/freemarker/ext/beans/BeanModel.java | 94 ++-- .../java/freemarker/ext/beans/BeansWrapper.java | 89 ++-- .../ext/beans/BeansWrapperBuilder.java | 17 +- .../freemarker/ext/beans/ClassIntrospector.java | 157 ++++--- .../ext/beans/MethodAppearanceFineTuner.java | 3 +- .../java/freemarker/ext/beans/_BeansAPI.java | 70 +-- .../freemarker/ext/util/IdentityHashMap.java | 9 +- .../java/freemarker/ext/util/ModelCache.java | 19 +- .../template/AdapterTemplateModel.java | 2 +- .../java/freemarker/template/Configuration.java | 3 + .../template/DefaultObjectWrapper.java | 23 +- .../template/DefaultObjectWrapperBuilder.java | 18 +- .../template/ObjectWrapperAndUnwrapper.java | 2 +- .../freemarker/template/SimpleSequence.java | 2 +- .../template/TemplateCollectionModelEx.java | 2 +- .../java/freemarker/template/_TemplateAPI.java | 3 +- .../resources/freemarker/version.properties | 8 +- src/manual/en_US/book.xml | 459 +++++++++++-------- src/manual/en_US/docgen.cjson | 2 +- src/test/java/freemarker/core/ASTTest.java | 2 +- .../ext/beans/BeansAPINewInstanceTest.java | 6 +- .../ext/beans/BeansWrapperSingletonsTest.java | 3 +- .../template/DefaultObjectWrapperTest.java | 1 + .../template/TemplateLanguageVersionTest.java | 3 +- .../CopyrightCommentRemoverTemplateLoader.java | 1 + src/test/java/freemarker/test/TemplateTest.java | 1 + src/test/java/freemarker/test/TestUtil.java | 115 ----- .../freemarker/test/servlet/WebAppTestCase.java | 2 +- .../test/templatesuite/TemplateTestCase.java | 46 +- .../test/templatesuite/TemplateTestSuite.java | 2 +- .../models/OverloadedMethods2.java | 144 +++--- .../freemarker/test/utility/FileTestCase.java | 1 - .../java/freemarker/test/utility/Helpers.java | 164 ------- .../java/freemarker/test/utility/TestUtil.java | 266 +++++++++++ .../expected/sequence-builtins.txt | 7 + .../templates/sequence-builtins.ftl | 8 +- 42 files changed, 1078 insertions(+), 878 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/44201a6d/src/main/resources/freemarker/version.properties ----------------------------------------------------------------------