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 <sberyoz...@talend.com> Authored: Tue Aug 12 21:10:47 2014 +0100 Committer: Sergey Beryozkin <sberyoz...@talend.com> 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(-) ----------------------------------------------------------------------
