Repository: cxf Updated Branches: refs/heads/2.7.x-fixes b29a4353f -> c1fb46ebd
Fixing WSDL Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c1fb46eb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c1fb46eb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c1fb46eb Branch: refs/heads/2.7.x-fixes Commit: c1fb46ebdb01552d8f090f98ba0406cb318588e9 Parents: b29a435 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Oct 14 15:47:55 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Oct 14 15:47:55 2014 +0100 ---------------------------------------------------------------------- .../apache/cxf/systest/ws/ut/DoubleItUt.wsdl | 20 -------------------- 1 file changed, 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c1fb46eb/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl index d07e72d..8300bf2 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl @@ -308,27 +308,7 @@ </wsp:All> </wsp:ExactlyOne> </wsp:Policy> -<<<<<<< HEAD -======= - <wsp:Policy wsu:Id="DoubleItPlaintextSupportingPolicy"> - <wsp:ExactlyOne> - <wsp:All> - <sp:SupportingTokens> - <wsp:Policy> - <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";> - <wsp:Policy> - <sp:WssUsernameToken10/> - <sp13:Created/> - <sp13:Nonce/> - </wsp:Policy> - </sp:UsernameToken> - </wsp:Policy> - </sp:SupportingTokens> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> ->>>>>>> df6ca4d... [CXF-6051] - "Support sp13:Nonce + sp13:Created in the UsernameTokenInterceptor" <wsp:Policy wsu:Id="DoubleItHashedPolicy"> <wsp:ExactlyOne> <wsp:All>
