Author: coheigea
Date: Mon Jun 25 14:05:34 2012
New Revision: 1353560
URL: http://svn.apache.org/viewvc?rev=1353560&view=rev
Log:
Updating policy for one of the WS-Security samples
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/README.txt
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/README.txt
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/README.txt?rev=1353560&r1=1353559&r2=1353560&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/README.txt
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/README.txt
Mon Jun 25 14:05:34 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/trunk/distribution/src/main/release/samples/ws_security/ut_policy/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/README.txt?rev=1353560&r1=1353559&r2=1353560&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/README.txt
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/README.txt
Mon Jun 25 14:05:34 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/trunk/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl?rev=1353560&r1=1353559&r2=1353560&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl
Mon Jun 25 14:05:34 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>
