Author: dkulp Date: Tue Nov 30 21:29:12 2010 New Revision: 1040781 URL: http://svn.apache.org/viewvc?rev=1040781&view=rev Log: Merged revisions 1040780 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1040780 | dkulp | 2010-11-30 16:27:35 -0500 (Tue, 30 Nov 2010) | 9 lines Merged revisions 1040779 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1040779 | dkulp | 2010-11-30 16:26:33 -0500 (Tue, 30 Nov 2010) | 1 line [CXF-3152] Add the missing certs and re-enable tests ........ ................ Added: cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/alice.jks - copied unchanged from r1040780, cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/alice.jks cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/cxfca.jks - copied unchanged from r1040780, cxf/branches/2.3.x-fixes/rt/ws/security/src/test/java/META-INF/cxf/cxfca.jks Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java?rev=1040781&r1=1040780&r2=1040781&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java (original) +++ cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java Tue Nov 30 21:29:12 2010 @@ -541,7 +541,6 @@ public class WSS4JInOutTest extends Abst } @Test - @org.junit.Ignore public void testPKIPath() throws Exception { Document doc = readDocument("wsse-request-clean.xml");
