Author: coheigea Date: Fri May 31 14:51:13 2013 New Revision: 1488261 URL: http://svn.apache.org/r1488261 Log: Merged revisions 1488248 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1488248 | coheigea | 2013-05-31 15:26:39 +0100 (Fri, 31 May 2013) | 10 lines Merged revisions 1488142 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1488142 | coheigea | 2013-05-31 11:25:07 +0100 (Fri, 31 May 2013) | 2 lines Fixing incorrect policy name ........ ........ Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/wssec11/WsSecurity11_policy_restricted.wsdl Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/wssec11/WsSecurity11_policy_restricted.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/wssec11/WsSecurity11_policy_restricted.wsdl?rev=1488261&r1=1488260&r2=1488261&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/wssec11/WsSecurity11_policy_restricted.wsdl (original) +++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/wssec11/WsSecurity11_policy_restricted.wsdl Fri May 31 14:51:13 2013 @@ -1562,7 +1562,7 @@ </sp:ProtectionToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic /> + <sp:Basic128 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout>
