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 8B913200C45 for ; Mon, 13 Mar 2017 11:43:23 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8A5C1160B8B; Mon, 13 Mar 2017 10:43:23 +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 3169D160B94 for ; Mon, 13 Mar 2017 11:43:22 +0100 (CET) Received: (qmail 3479 invoked by uid 500); 13 Mar 2017 10:43:21 -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 3470 invoked by uid 99); 13 Mar 2017 10:43:21 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Mar 2017 10:43:21 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id EF5A91AF8B5 for ; Mon, 13 Mar 2017 10:43:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.069 X-Spam-Level: X-Spam-Status: No, score=-3.069 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_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id W34mPWgKxd1t for ; Mon, 13 Mar 2017 10:43:19 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 72CAA618AC for ; Mon, 13 Mar 2017 10:43:18 +0000 (UTC) Received: (qmail 3073 invoked by uid 99); 13 Mar 2017 10:43:18 -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; Mon, 13 Mar 2017 10:43:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8B99DFE8F; Mon, 13 Mar 2017 10:43:17 +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: Mon, 13 Mar 2017 10:43:41 -0000 Message-Id: <80e9d1a5593943929d2eda71c60de085@git.apache.org> In-Reply-To: <64aed908ef5a4717b02391d4dc4723f5@git.apache.org> References: <64aed908ef5a4717b02391d4dc4723f5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/25] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3 archived-at: Mon, 13 Mar 2017 10:43:23 -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/0254eca3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0254eca3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0254eca3 Branch: refs/heads/2.3 Commit: 0254eca3f288149d32fb87672a1db4d359ab650a Parents: 617ad6f edc0e41 Author: ddekany Authored: Mon Mar 13 11:43:03 2017 +0100 Committer: ddekany Committed: Mon Mar 13 11:43:03 2017 +0100 ---------------------------------------------------------------------- .gitignore | 1 + README | 8 +- build.properties.sample | 1 + build.xml | 33 +- src/main/java/freemarker/core/Interpret.java | 4 +- .../freemarker/core/TemplateConfiguration.java | 4 +- src/main/java/freemarker/core/_Java6Impl.java | 2 + src/main/java/freemarker/core/_Java8.java | 34 ++ src/main/java/freemarker/core/_Java8Impl.java | 41 ++ .../java/freemarker/core/_JavaVersions.java | 45 +++ .../java/freemarker/ext/beans/BeansWrapper.java | 77 +++- .../ext/beans/BeansWrapperConfiguration.java | 37 +- .../freemarker/ext/beans/ClassIntrospector.java | 400 ++++++++++++++++--- .../ext/beans/ClassIntrospectorBuilder.java | 15 + .../java/freemarker/ext/beans/MethodSorter.java | 6 +- .../java/freemarker/ext/beans/_MethodUtil.java | 26 ++ .../java/freemarker/ext/dom/NodeListModel.java | 10 +- .../java/freemarker/template/Configuration.java | 8 + .../template/DefaultEnumerationAdapter.java | 119 ++++++ .../template/DefaultIteratorAdapter.java | 7 +- .../DefaultNonListCollectionAdapter.java | 2 +- .../template/DefaultObjectWrapper.java | 16 + .../freemarker/template/SimpleCollection.java | 10 +- .../template/TemplateCollectionModelEx.java | 8 - src/main/javacc/FTL.jj | 5 - src/manual/en_US/book.xml | 119 +++++- .../core/InterpretAndEvalTemplateNameTest.java | 17 +- .../ext/beans/AlphabeticalMethodSorter.java | 9 +- .../beans/BeansWrapperBridgeMethodsTest.java | 65 +++ .../ext/beans/BeansWrapperJava8Test.java | 239 +++++++++++ .../ext/beans/BeansWrapperSingletonsTest.java | 141 +++---- .../freemarker/ext/beans/BridgeMethodsBean.java | 30 ++ .../ext/beans/BridgeMethodsBeanBase.java | 29 ++ .../BridgeMethodsWithDefaultMethodBean.java | 29 ++ .../BridgeMethodsWithDefaultMethodBean2.java | 23 ++ .../BridgeMethodsWithDefaultMethodBeanBase.java | 31 ++ ...BridgeMethodsWithDefaultMethodBeanBase2.java | 28 ++ ...GetPropertyNameFromReaderMethodNameTest.java | 61 +++ .../ext/beans/Java8DefaultMethodsBean.java | 83 ++++ .../ext/beans/Java8DefaultMethodsBeanBase.java | 90 +++++ .../freemarker/template/ConfigurationTest.java | 5 + .../template/DefaultObjectWrapperTest.java | 76 +++- .../test/templatesuite/templates/exthash.ftl | 48 --- 43 files changed, 1766 insertions(+), 276 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0254eca3/build.xml ----------------------------------------------------------------------