Author: coheigea Date: Thu Mar 28 11:31:32 2013 New Revision: 1462051 URL: http://svn.apache.org/r1462051 Log: Merged revisions 1462037 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1462037 | coheigea | 2013-03-28 11:10:45 +0000 (Thu, 28 Mar 2013) | 10 lines Merged revisions 1462016 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1462016 | coheigea | 2013-03-28 10:14:59 +0000 (Thu, 28 Mar 2013) | 2 lines Adding some sanity tests for not sending any security header to a service with a UsernameToken requirement ........ ........ Conflicts: distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/server.xml systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/server.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/clean-policy.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/created-policy.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/hash-pass-policy.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/no-pass-policy.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/nonce-policy.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/plaintext-pass-policy.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/supp-token-policy.xml Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/server.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/server.xml?rev=1462051&r1=1462050&r2=1462051&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/server.xml (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/server.xml Thu Mar 28 11:31:32 2013 @@ -38,5 +38,51 @@ <cxf:logging/> </cxf:features> </cxf:bus> +<<<<<<< HEAD:distribution/src/main/release/samples/ws_security/interopfest/wssec11/src/main/resources/etc/server.xml +======= + + <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleIt3DESEncryptionPort"; + createdFromAPI="true"> + <jaxws:outInterceptors> + <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"> + <constructor-arg> + <map> + <entry key="action" value="Encrypt"/> + <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/> + <entry key="encryptSymmetricEncryptionKey" value="false"/> + <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> + </map> + </constructor-arg> + </bean> + </jaxws:outInterceptors> + <jaxws:inInterceptors> + <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"> + <constructor-arg> + <map> + <entry key="action" value="Encrypt"/> + <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.action.SecretKeyPasswordCallback"/> + <entry key="isBSPCompliant" value="false"/> + </map> + </constructor-arg> + </bean> + </jaxws:inInterceptors> + </jaxws:client> + + <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort"; + createdFromAPI="true"> + <jaxws:outInterceptors> + <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"> + <constructor-arg> + <map> + <entry key="action" value="UsernameToken"/> + <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/> + <entry key="user" value="Alice"/> + </map> + </constructor-arg> + </bean> + </jaxws:outInterceptors> + </jaxws:client> + +>>>>>>> bb22790... Merged revisions 1462037 via git cherry-pick from:systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client/client.xml </beans> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/clean-policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/clean-policy.xml?rev=1462051&r1=1462050&r2=1462051&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/clean-policy.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/clean-policy.xml Thu Mar 28 11:31:32 2013 @@ -18,7 +18,6 @@ <sp:Lax /> </wsp:Policy> </sp:Layout> - <sp:IncludeTimestamp /> <sp:AlgorithmSuite> <wsp:Policy> <sp:Basic128 /> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/created-policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/created-policy.xml?rev=1462051&r1=1462050&r2=1462051&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/created-policy.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/created-policy.xml Thu Mar 28 11:31:32 2013 @@ -18,7 +18,6 @@ <sp:Lax /> </wsp:Policy> </sp:Layout> - <sp:IncludeTimestamp /> <sp:AlgorithmSuite> <wsp:Policy> <sp:Basic128 /> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/hash-pass-policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/hash-pass-policy.xml?rev=1462051&r1=1462050&r2=1462051&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/hash-pass-policy.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/hash-pass-policy.xml Thu Mar 28 11:31:32 2013 @@ -18,7 +18,6 @@ <sp:Lax /> </wsp:Policy> </sp:Layout> - <sp:IncludeTimestamp /> <sp:AlgorithmSuite> <wsp:Policy> <sp:Basic128 /> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/no-pass-policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/no-pass-policy.xml?rev=1462051&r1=1462050&r2=1462051&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/no-pass-policy.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/no-pass-policy.xml Thu Mar 28 11:31:32 2013 @@ -18,7 +18,6 @@ <sp:Lax /> </wsp:Policy> </sp:Layout> - <sp:IncludeTimestamp /> <sp:AlgorithmSuite> <wsp:Policy> <sp:Basic128 /> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/nonce-policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/nonce-policy.xml?rev=1462051&r1=1462050&r2=1462051&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/nonce-policy.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/nonce-policy.xml Thu Mar 28 11:31:32 2013 @@ -18,7 +18,6 @@ <sp:Lax /> </wsp:Policy> </sp:Layout> - <sp:IncludeTimestamp /> <sp:AlgorithmSuite> <wsp:Policy> <sp:Basic128 /> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/plaintext-pass-policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/plaintext-pass-policy.xml?rev=1462051&r1=1462050&r2=1462051&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/plaintext-pass-policy.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/plaintext-pass-policy.xml Thu Mar 28 11:31:32 2013 @@ -18,7 +18,6 @@ <sp:Lax /> </wsp:Policy> </sp:Layout> - <sp:IncludeTimestamp /> <sp:AlgorithmSuite> <wsp:Policy> <sp:Basic128 /> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/supp-token-policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/supp-token-policy.xml?rev=1462051&r1=1462050&r2=1462051&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/supp-token-policy.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/supp-token-policy.xml Thu Mar 28 11:31:32 2013 @@ -18,7 +18,6 @@ <sp:Lax /> </wsp:Policy> </sp:Layout> - <sp:IncludeTimestamp /> <sp:AlgorithmSuite> <wsp:Policy> <sp:Basic128 />
