You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2014/06/03 10:55:42 UTC
svn commit: r1599451 -
/tomee/tomee/trunk/server/openejb-client/src/test/java/org/apache/openejb/client/HttpsConnectionTest.java
Author: jlmonteiro
Date: Tue Jun 3 08:55:41 2014
New Revision: 1599451
URL: http://svn.apache.org/r1599451
Log:
TOMEE-1239 Update HttpsConnectionTest to support jdk8 - KeyTool changes. Thanks Hanasaki.
Modified:
tomee/tomee/trunk/server/openejb-client/src/test/java/org/apache/openejb/client/HttpsConnectionTest.java
Modified: tomee/tomee/trunk/server/openejb-client/src/test/java/org/apache/openejb/client/HttpsConnectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/test/java/org/apache/openejb/client/HttpsConnectionTest.java?rev=1599451&r1=1599450&r2=1599451&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/test/java/org/apache/openejb/client/HttpsConnectionTest.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/test/java/org/apache/openejb/client/HttpsConnectionTest.java Tue Jun 3 08:55:41 2014
@@ -93,7 +93,12 @@ public class HttpsConnectionTest {
try {
keyToolClass = Class.forName("sun.security.tools.KeyTool");
} catch (final ClassNotFoundException e) {
- keyToolClass = Class.forName("com.ibm.crypto.tools.KeyTool");
+ try {
+ // in jdk8, the tool changed ...
+ keyToolClass = Class.forName("sun.security.tools.keytool.Main");
+ } catch (final ClassNotFoundException cnfe) {
+ keyToolClass = Class.forName("com.ibm.crypto.tools.KeyTool");
+ }
}
final String[] args = {