svn commit: r916288 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/

[dkulp]

Author: dkulp
Date: Thu Feb 25 13:49:11 2010
New Revision: 916288

URL: http://svn.apache.org/viewvc?rev=916288&view=rev
Log:
Merged revisions 916077 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r916077 | dkulp | 2010-02-24 20:21:10 -0500 (Wed, 24 Feb 2010) | 1 line
  
  [CXF-2654] Add missing files and re-enable tests
........

Added:
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml
      - copied unchanged from r916077, 
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml
      - copied unchanged from r916077, 
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml
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/PolicyBasedWss4JInOutTest.java
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.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/PolicyBasedWss4JInOutTest.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/PolicyBasedWss4JInOutTest.java?rev=916288&r1=916287&r2=916288&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
 Thu Feb 25 13:49:11 2010
@@ -95,7 +95,6 @@
     }
     
     @Test
-    @org.junit.Ignore("missing file")
     public void testSignedElementsPolicyWithIncompleteCoverage() throws 
Exception {
         this.runInInterceptorAndValidate(
                 "signed_x509_issuer_serial_missing_signed_header.xml",
@@ -125,7 +124,6 @@
     }
 
     @Test
-    @org.junit.Ignore("missing file")
     public void testSignedPartsPolicyWithIncompleteCoverage() throws Exception 
{
         this.runInInterceptorAndValidate(
                 "signed_x509_issuer_serial_missing_signed_body.xml",

Modified: 
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.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/RoundTripTest.java?rev=916288&r1=916287&r2=916288&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
 Thu Feb 25 13:49:11 2010
@@ -30,7 +30,6 @@
 import org.apache.ws.security.handler.WSHandlerConstants;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class RoundTripTest extends AbstractSecurityTest {
@@ -90,7 +89,6 @@
     }
 
     @Test
-    @Ignore("Seems to randomly hang on Linux")
     public void testEncryptionPlusSig() throws Exception {
         wsIn.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT 
+ " "
                                                     + 
WSHandlerConstants.SIGNATURE);