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 A94BA17953 for ; Fri, 17 Oct 2014 19:19:27 +0000 (UTC) Received: (qmail 42976 invoked by uid 500); 17 Oct 2014 19:19:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 42910 invoked by uid 500); 17 Oct 2014 19:19:27 -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 42901 invoked by uid 99); 17 Oct 2014 19:19:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Oct 2014 19:19:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2439399A8BE; Fri, 17 Oct 2014 19:19:27 +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: Fri, 17 Oct 2014 19:19:26 -0000 Message-Id: <8e07ae3eeded42189a65eaf4689bdb55@git.apache.org> In-Reply-To: <511426bbb851473b9e3e03d517d03954@git.apache.org> References: <511426bbb851473b9e3e03d517d03954@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d1e764dc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d1e764dc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d1e764dc Branch: refs/heads/master Commit: d1e764dcfaae7dc6f5deb48373acb7a6ad688762 Parents: 2efbac3 ea512e8 Author: Sergey Beryozkin Authored: Fri Oct 17 20:18:54 2014 +0100 Committer: Sergey Beryozkin Committed: Fri Oct 17 20:18:54 2014 +0100 ---------------------------------------------------------------------- .../wss4j/UsernameTokenInterceptor.java | 45 ++++++-- .../sts/deployment/CustomClaimsHandler.java | 76 +++++++++++++ .../systest/sts/jaas/ClaimsCallbackHandler.java | 68 ++++++++++++ .../apache/cxf/systest/sts/jaas/JAASTest.java | 106 +++++++++++++++++++ .../org/apache/cxf/systest/sts/jaas/Server.java | 46 ++++++++ .../systest/sts/deployment/cxf-transport.xml | 21 +++- .../apache/cxf/systest/sts/jaas/DoubleIt.wsdl | 53 ++++++++++ .../apache/cxf/systest/sts/jaas/cxf-client.xml | 37 +++++++ .../apache/cxf/systest/sts/jaas/cxf-service.xml | 100 +++++++++++++++++ 9 files changed, 545 insertions(+), 7 deletions(-) ----------------------------------------------------------------------