Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1412116 -
 /cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
Date: Wed, 21 Nov 2012 14:10:15 -0000
To: commits@cxf.apache.org
From: coheigea@apache.org
Message-Id: <20121121141015.D12542388A3F@eris.apache.org>

Author: coheigea
Date: Wed Nov 21 14:10:15 2012
New Revision: 1412116

URL: http://svn.apache.org/viewvc?rev=1412116&view=rev
Log:
Merged revisions 1412113 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1412113 | coheigea | 2012-11-21 14:09:02 +0000 (Wed, 21 Nov 2012) | 10 lines

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

  ........
    r1412109 | coheigea | 2012-11-21 14:04:20 +0000 (Wed, 21 Nov 2012) | 2 lines

    Updated disabled tests with a bit more info on the cause

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java?rev=1412116&r1=1412115&r2=1412116&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java Wed Nov 21 14:10:15 2012
@@ -64,6 +64,9 @@ public class GCMTest extends AbstractBus
     public void testAESGCM128() 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
@@ -98,6 +101,9 @@ public class GCMTest extends AbstractBus
         
         //
         // 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
@@ -132,6 +138,9 @@ public class GCMTest extends AbstractBus
         
         //
         // 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