cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1460596 - /cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
Date Mon, 25 Mar 2013 10:30:55 GMT
Author: coheigea
Date: Mon Mar 25 10:30:55 2013
New Revision: 1460596

URL: http://svn.apache.org/r1460596
Log:
Merged revisions 1460593 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1460593 | coheigea | 2013-03-25 10:27:34 +0000 (Mon, 25 Mar 2013) | 18 lines

  Merged revisions 1460588 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1460588 | coheigea | 2013-03-25 10:21:02 +0000 (Mon, 25 Mar 2013) | 10 lines

    Merged revisions 1460582 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1460582 | coheigea | 2013-03-25 10:08:25 +0000 (Mon, 25 Mar 2013) | 2 lines

      Fixed a failing test with IBM JDK 7

    ........

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java

Modified: cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java?rev=1460596&r1=1460595&r2=1460596&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
Mon Mar 25 10:30:55 2013
@@ -159,6 +159,18 @@ public class JAXRSXmlSecTest extends Abs
     
     @Test
     public void testPostEncryptedBookGCM() throws Exception {
+        //
+        // This test fails with the IBM JDK 7
+        // IBM JDK 7 appears to require a GCMParameter class to be used, which
+        // only exists in JDK 7. The Sun JDK appears to be more lenient and 
+        // allows us to use the existing IVParameterSpec class.
+        //
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))
+            && System.getProperty("java.version") != null
+            &&  System.getProperty("java.version").startsWith("1.7")) {
+            return;
+        }
+        
         String address = "https://localhost:" + PORT + "/xmlenc/bookstore/books";
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 



Mime
View raw message