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 9AC9E11234 for ; Tue, 12 Aug 2014 20:11:00 +0000 (UTC) Received: (qmail 52234 invoked by uid 500); 12 Aug 2014 20:11:00 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 52117 invoked by uid 500); 12 Aug 2014 20:11:00 -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 52086 invoked by uid 99); 12 Aug 2014 20:11:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Aug 2014 20:11:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 31FF6921DE0; Tue, 12 Aug 2014 20:11:00 +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, 12 Aug 2014 20:11:01 -0000 Message-Id: <6a6bedc5354c430b99e49d074121cc2b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cc5903ca Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cc5903ca Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cc5903ca Branch: refs/heads/3.0.x-fixes Commit: cc5903ca8fc4f0d16e22a89232f72b9c1efb400a Parents: 4485575 d6c1de4 Author: Sergey Beryozkin Authored: Tue Aug 12 21:10:47 2014 +0100 Committer: Sergey Beryozkin Committed: Tue Aug 12 21:10:47 2014 +0100 ---------------------------------------------------------------------- .../SecureConversationInInterceptor.java | 216 +++++++++++-------- .../ws/security/wss4j/WSS4JInInterceptor.java | 3 + .../apache/cxf/systest/ws/wssc/WSSCTest.java | 46 +++- 3 files changed, 171 insertions(+), 94 deletions(-) ----------------------------------------------------------------------