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 DB29A200C14 for ; Tue, 24 Jan 2017 06:20:07 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D9C2D160B58; Tue, 24 Jan 2017 05:20:07 +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 2EB87160B53 for ; Tue, 24 Jan 2017 06:20:07 +0100 (CET) Received: (qmail 27870 invoked by uid 500); 24 Jan 2017 05:20:06 -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 27853 invoked by uid 99); 24 Jan 2017 05:20:06 -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, 24 Jan 2017 05:20:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D100DFCC4; Tue, 24 Jan 2017 05:20:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ffang@apache.org To: commits@cxf.apache.org Date: Tue, 24 Jan 2017 05:20:07 -0000 Message-Id: In-Reply-To: <93dd7e5d84ee43c9ac56457774a5c9a6@git.apache.org> References: <93dd7e5d84ee43c9ac56457774a5c9a6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf archived-at: Tue, 24 Jan 2017 05:20:08 -0000 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/f8cec430 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f8cec430 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f8cec430 Branch: refs/heads/master Commit: f8cec430eadf4eebbde85622cfe0964310dd07a0 Parents: c87613b 57fcf8d Author: Freeman Fang Authored: Tue Jan 24 13:19:43 2017 +0800 Committer: Freeman Fang Committed: Tue Jan 24 13:19:43 2017 +0800 ---------------------------------------------------------------------- .../cxf/interceptor/LoggingInInterceptor.java | 2 +- .../cxf/interceptor/LoggingOutInterceptor.java | 2 +- .../tracing/brave/AbstractBraveProvider.java | 2 +- .../impl/WebApplicationExceptionMapper.java | 10 +- .../validation/ValidationExceptionMapper.java | 25 ++- .../wss4j/UsernameTokenInterceptor.java | 11 +- .../cxf/systest/sts/claims/ClaimsTest.java | 2 + .../systest/sts/custom/CustomParameterTest.java | 101 +++++++++ .../systest/sts/custom/CustomUTValidator.java | 216 +++++++++++++++++++ .../cxf/systest/sts/custom/STSServer.java | 50 +++++ .../apache/cxf/systest/sts/custom/Server.java | 46 ++++ .../apache/cxf/systest/sts/custom/DoubleIt.wsdl | 153 +++++++++++++ .../cxf/systest/sts/custom/cxf-client.xml | 57 +++++ .../cxf/systest/sts/custom/cxf-service.xml | 41 ++++ .../apache/cxf/systest/sts/custom/cxf-sts.xml | 43 ++++ .../sts/deployment/ws-trust-1.4-service.wsdl | 41 ++++ 16 files changed, 786 insertions(+), 16 deletions(-) ----------------------------------------------------------------------