Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6D1FD1879F for ; Tue, 17 Nov 2015 16:41:04 +0000 (UTC) Received: (qmail 1993 invoked by uid 500); 17 Nov 2015 16:41:04 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 1930 invoked by uid 500); 17 Nov 2015 16:41:04 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 1921 invoked by uid 99); 17 Nov 2015 16:41:04 -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, 17 Nov 2015 16:41:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 213AAE03E4; Tue, 17 Nov 2015 16:41:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Date: Tue, 17 Nov 2015 16:41:05 -0000 Message-Id: <02c175d0452247c3a9a5f02048b80761@git.apache.org> In-Reply-To: <928667fb65254e6b8639dd3db8e25749@git.apache.org> References: <928667fb65254e6b8639dd3db8e25749@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/13184062 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13184062 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13184062 Branch: refs/heads/3.1.x-fixes Commit: 13184062c28d451f10e63aaa3fe9a7cea3c3cd0e Parents: 753368b cec8828 Author: Sergey Beryozkin Authored: Tue Nov 17 16:12:26 2015 +0000 Committer: Sergey Beryozkin Committed: Tue Nov 17 16:12:26 2015 +0000 ---------------------------------------------------------------------- .../ws/security/trust/AbstractSTSClient.java | 4 +- .../cxf/sts/operation/TokenIssueOperation.java | 10 +- .../apache/cxf/sts/request/ReceivedToken.java | 5 - .../cxf/sts/token/realm/JWTRealmCodec.java | 36 +++ .../token/validator/jwt/JWTTokenValidator.java | 56 ++-- .../sts/operation/IssueJWTClaimsUnitTest.java | 61 ++-- .../operation/IssueJWTOnbehalfofUnitTest.java | 46 +-- .../sts/operation/IssueJWTRealmUnitTest.java | 63 +++-- .../cxf/sts/operation/IssueJWTUnitTest.java | 16 +- .../validator/JWTTokenValidatorRealmTest.java | 280 +++++++++++++++++++ .../token/validator/JWTTokenValidatorTest.java | 23 +- .../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 41 ++- .../cxf/systest/sts/deployment/cxf-sts.xml | 3 + 13 files changed, 514 insertions(+), 130 deletions(-) ----------------------------------------------------------------------