You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/05/23 10:32:23 UTC
svn commit: r1341784 - in /cxf/branches/2.4.x-fixes: ./
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml
Author: ffang
Date: Wed May 23 08:32:23 2012
New Revision: 1341784
URL: http://svn.apache.org/viewvc?rev=1341784&view=rev
Log:
Merged revisions 1341781 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1341781 | ffang | 2012-05-23 16:23:37 +0800 (三, 23 5 2012) | 9 lines
Merged revisions 1341775 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1341775 | ffang | 2012-05-23 16:11:49 +0800 (三, 23 5 2012) | 1 line
[CXF-4335]WSSecTest use some unecessary properties for WSS4JInterceptor configuration
........
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml?rev=1341784&r1=1341783&r2=1341784&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml Wed May 23 08:32:23 2012
@@ -56,10 +56,8 @@
<map>
<entry key="action" value="UsernameToken Timestamp Signature"/>
<entry key="passwordType" value="PasswordText"/>
- <entry key="user" value="serverx509v1"/>
<entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback"/>
<entry key="signaturePropFile" value="org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties"/>
- <entry key="signatureKeyIdentifier" value="DirectReference"/>
</map>
</constructor-arg>
</bean>
Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml?rev=1341784&r1=1341783&r2=1341784&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml Wed May 23 08:32:23 2012
@@ -34,12 +34,10 @@
<map>
<entry key="action" value="UsernameToken Timestamp Signature" />
<entry key="passwordType" value="PasswordDigest" />
- <entry key="user" value="serverx509v1" />
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback" />
<entry key="signaturePropFile"
value="org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties" />
- <entry key="signatureKeyIdentifier" value="DirectReference" />
</map>
</constructor-arg>
</bean>