Author: rmannibucau
Date: Fri Jul 18 17:11:06 2014
New Revision: 1611720
URL: http://svn.apache.org/r1611720
Log:
TOMEE-1273 java 8 KeyTool
Modified:
tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java
Modified:
tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java?rev=1611720&r1=1611719&r2=1611720&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/SslTomEETest.java
Fri Jul 18 17:11:06 2014
@@ -40,7 +40,12 @@ public class SslTomEETest {
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 = {
