Author: coheigea Date: Mon Jun 25 14:15:12 2012 New Revision: 1353566 URL: http://svn.apache.org/viewvc?rev=1353566&view=rev Log: Merged revisions 1353563 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1353563 | coheigea | 2012-06-25 15:11:31 +0100 (Mon, 25 Jun 2012) | 10 lines Merged revisions 1353560 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1353560 | coheigea | 2012-06-25 15:05:34 +0100 (Mon, 25 Jun 2012) | 2 lines Updating policy for one of the WS-Security samples ........ ........ Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt?rev=1353566&r1=1353565&r2=1353566&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/README.txt Mon Jun 25 14:15:12 2012 @@ -49,7 +49,7 @@ Using either UNIX or Windows: mvn install (builds the demo) mvn -Pserver (from one command line window) - Mvn -Pclient (from a second command line window) + mvn -Pclient (from a second command line window) On startup, the client makes a sequence of 4 two-way invocations. Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt?rev=1353566&r1=1353565&r2=1353566&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/README.txt Mon Jun 25 14:15:12 2012 @@ -47,7 +47,7 @@ Using either UNIX or Windows: mvn install (builds the demo) mvn -Pserver (from one command line window) - Mvn -Pclient (from a second command line window) + mvn -Pclient (from a second command line window) On startup, the client makes one invocation. Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl?rev=1353566&r1=1353565&r2=1353566&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl Mon Jun 25 14:15:12 2012 @@ -88,19 +88,45 @@ <soap:address location="https://localhost:9001/SoapContext/SoapPort"/> </wsdl:port> </wsdl:service> - - <wsp:Policy wsu:Id="UP_policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";> - <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> - <wsp:Policy><sp:TransportToken><wsp:Policy><sp:HttpsToken/></wsp:Policy></sp:TransportToken><sp:Layout><wsp:Policy><sp:Strict/></wsp:Policy></sp:Layout><sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite></wsp:Policy> - </sp:TransportBinding> - <sp:SupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> - <wsp:Policy> - <sp:UsernameToken xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"; sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always";> - <wsp:Policy> - <sp:WssUsernameToken11/> + + <wsp:Policy wsu:Id="UP_policy" xmlns:wsp="http://www.w3.org/ns/ws-policy"; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";> + <wsp:ExactlyOne> + <wsp:All> + <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";> + <wsp:Policy> + <sp:TransportToken> + <wsp:Policy> + <sp:HttpsToken> + <wsp:Policy/> + </sp:HttpsToken> + </wsp:Policy> + </sp:TransportToken> + <sp:Layout> + <wsp:Policy> + <sp:Strict /> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp /> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128 /> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:TransportBinding> + <sp:SupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";> + <wsp:Policy> + <sp:UsernameToken + sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";> + <wsp:Policy> + <sp:WssUsernameToken11/> + </wsp:Policy> + </sp:UsernameToken> + </wsp:Policy> + </sp:SupportingTokens> + </wsp:All> + </wsp:ExactlyOne> </wsp:Policy> - </sp:UsernameToken> - </wsp:Policy></sp:SupportingTokens></wsp:Policy> </wsdl:definitions>
