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 62C9E200CA6 for ; Tue, 13 Jun 2017 12:13:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 615A3160BDC; Tue, 13 Jun 2017 10:13:31 +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 CE4F8160BC9 for ; Tue, 13 Jun 2017 12:13:30 +0200 (CEST) Received: (qmail 16086 invoked by uid 500); 13 Jun 2017 10:13:30 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 16077 invoked by uid 99); 13 Jun 2017 10:13:30 -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, 13 Jun 2017 10:13:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9965FDF9FD; Tue, 13 Jun 2017 10:13:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kinow@apache.org To: commits@jena.apache.org Date: Tue, 13 Jun 2017 10:13:33 -0000 Message-Id: <6bef61fed446488a98708eb138872d4b@git.apache.org> In-Reply-To: <8b61d74e9dfb4f13a3db10d16820c0d0@git.apache.org> References: <8b61d74e9dfb4f13a3db10d16820c0d0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] jena git commit: JENA-1313 Merge remote-tracking branch 'upstream/pr/237' archived-at: Tue, 13 Jun 2017 10:13:31 -0000 JENA-1313 Merge remote-tracking branch 'upstream/pr/237' This closes #237 Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/739a7187 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/739a7187 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/739a7187 Branch: refs/heads/master Commit: 739a7187ab6b14b312e069221efb8824b9f85067 Parents: 6975646 3b12f83 Author: Bruno P. Kinoshita Authored: Tue Jun 13 22:12:15 2017 +1200 Committer: Bruno P. Kinoshita Committed: Tue Jun 13 22:12:15 2017 +1200 ---------------------------------------------------------------------- .../org/apache/jena/sparql/expr/NodeValue.java | 17 ++- .../sparql/expr/ValueSpaceClassification.java | 2 +- .../sparql/expr/nodevalue/NodeFunctions.java | 6 + .../sparql/expr/nodevalue/NodeValueSortKey.java | 118 ++++++++++++++++++ .../sparql/expr/nodevalue/NodeValueVisitor.java | 1 + .../jena/sparql/function/StandardFunctions.java | 3 + .../sparql/function/library/FN_Collation.java | 64 ++++++++++ .../apache/jena/sparql/expr/TestNodeValue.java | 124 +++++++++++++++++++ .../expr/nodevalue/TestNodeFunctions.java | 40 ++++++ .../expr/nodevalue/TestNodeValueSortKey.java | 86 +++++++++++++ .../function/library/TestFunctionCollation.java | 70 +++++++++++ .../rewriters/NodeValueRewriter.java | 5 + 12 files changed, 533 insertions(+), 3 deletions(-) ----------------------------------------------------------------------