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/a8e3af6d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a8e3af6d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a8e3af6d Branch: refs/heads/master Commit: a8e3af6df6b2d286d0907ee379f4e13cb2fa5c4c Parents: 8f346e7 27b3b69 Author: Andrei Shakirin <[email protected]> Authored: Tue Jan 27 14:47:38 2015 +0100 Committer: Andrei Shakirin <[email protected]> Committed: Tue Jan 27 14:47:38 2015 +0100 ---------------------------------------------------------------------- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 2 +- .../security/wss4j/StaxActionInInterceptor.java | 38 ++------- .../security/wss4j/WSS4JStaxInInterceptor.java | 28 +------ .../security/wss4j/StaxRoundTripActionTest.java | 19 ++--- .../systest/ws/fault/ModifiedRequestTest.java | 81 ++++++++++++++++---- .../ws/security/WSSecurityClientTest.java | 2 - .../cxf/systest/ws/fault/modified-server.xml | 10 +++ 7 files changed, 93 insertions(+), 87 deletions(-) ----------------------------------------------------------------------
