Author: coheigea Date: Thu Mar 14 13:45:35 2013 New Revision: 1456431 URL: http://svn.apache.org/r1456431 Log: Merged revisions 1456428 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1456428 | coheigea | 2013-03-14 13:42:21 +0000 (Thu, 14 Mar 2013) | 10 lines Merged revisions 1456427 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1456427 | coheigea | 2013-03-14 13:40:09 +0000 (Thu, 14 Mar 2013) | 2 lines Fixing test on 2.7.x ........ ........ Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml?rev=1456431&r1=1456430&r2=1456431&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml (original) +++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server/server.xml Thu Mar 14 13:45:35 2013 @@ -46,7 +46,7 @@ </cxf:bus> <jaxws:endpoint - id="3DESEncryption" + id="TripleDESEncryption" address="http://localhost:${testutil.ports.Server}/DoubleIt3DESEncryption"; serviceName="s:DoubleItService" endpointName="s:DoubleIt3DESEncryptionPort"
