Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2EBC817539 for ; Wed, 9 Sep 2015 23:05:00 +0000 (UTC) Received: (qmail 86400 invoked by uid 500); 9 Sep 2015 23:05:00 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 86386 invoked by uid 500); 9 Sep 2015 23:05:00 -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 86377 invoked by uid 99); 9 Sep 2015 23:05:00 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2015 23:04:59 +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 95E371A0A58 for ; Wed, 9 Sep 2015 23:04:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.774 X-Spam-Level: * X-Spam-Status: No, score=1.774 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 6IaiPkmaKCE2 for ; Wed, 9 Sep 2015 23:04:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id BAFAF20BFB for ; Wed, 9 Sep 2015 23:04:57 +0000 (UTC) Received: (qmail 86347 invoked by uid 99); 9 Sep 2015 23:04: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; Wed, 09 Sep 2015 23:04:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5683E0991; Wed, 9 Sep 2015 23:04:56 +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: Wed, 09 Sep 2015 23:04:57 -0000 Message-Id: <135f4fba4d6046d9a1ed7b5bbc0cceaa@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3 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/b6d84a08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b6d84a08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b6d84a08 Branch: refs/heads/2.3 Commit: b6d84a0828ac752402323c5edc02fb5fb1e83401 Parents: dfe0c09 3fab33d Author: ddekany Authored: Thu Sep 10 01:03:51 2015 +0200 Committer: ddekany Committed: Thu Sep 10 01:03:51 2015 +0200 ---------------------------------------------------------------------- ...AliasTargetTemplateValueFormatException.java | 36 ++++++++ .../core/AliasTemplateDateFormatFactory.java | 91 ++++++++++++++++++++ .../core/AliasTemplateNumberFormatFactory.java | 90 +++++++++++++++++++ .../core/TemplateDateFormatFactory.java | 2 + .../core/TemplateNumberFormatFactory.java | 2 + .../java/freemarker/core/_CoreLocaleUtils.java | 45 ++++++++++ src/manual/book.xml | 35 ++++++++ .../freemarker/core/CoreLocaleUtilsTest.java | 72 ++++++++++++++++ .../java/freemarker/core/DateFormatTest.java | 49 ++++++++++- .../java/freemarker/core/NumberFormatTest.java | 45 ++++++++++ 10 files changed, 466 insertions(+), 1 deletion(-) ----------------------------------------------------------------------