You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2015/11/18 16:06:09 UTC
tomee git commit: TOMEE-1661: making it possible to build it on jdk_8
by using the new keytool class
Repository: tomee
Updated Branches:
refs/heads/master fee207c52 -> 912db4178
TOMEE-1661: making it possible to build it on jdk_8 by using the new keytool class
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/912db417
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/912db417
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/912db417
Branch: refs/heads/master
Commit: 912db4178af0058e040d33372a18c0acf4a413fd
Parents: fee207c
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Wed Nov 18 10:05:59 2015 -0500
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Wed Nov 18 10:05:59 2015 -0500
----------------------------------------------------------------------
.../webservice-ws-security/create-keystores.xml | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/912db417/examples/webservice-ws-security/create-keystores.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-ws-security/create-keystores.xml b/examples/webservice-ws-security/create-keystores.xml
index cfd0cbf..7a52ed6 100644
--- a/examples/webservice-ws-security/create-keystores.xml
+++ b/examples/webservice-ws-security/create-keystores.xml
@@ -24,9 +24,13 @@
<condition property="is.ibm.jdk">
<available classname="com.ibm.crypto.tools.KeyTool"/>
</condition>
- <condition property="is.sun.jdk">
+ <condition property="is.sun.jdk" value="sun.security.tools.KeyTool">
<available classname="sun.security.tools.KeyTool"/>
</condition>
+ <condition property="is.sun.jdk" value="sun.security.tools.keytool.Main">
+ <available classname="sun.security.tools.keytool.Main"/> <!-- java 8 -->
+ </condition>
+
<property name="server.alias" value="serveralias"/>
<property name="server.keypass" value="serverPassword"/>
<property name="server.keystore" value="${basedir}/target/classes/META-INF/serverStore.jks"/>
@@ -119,7 +123,7 @@
<target name="do.sun.jdk" if="is.sun.jdk">
<echo message="*** Running on a Sun JDK ***"/>
<echo message="generate server keys"/>
- <java classname="sun.security.tools.KeyTool" fork="true">
+ <java classname="${is.sun.jdk}" fork="true">
<arg line="-genkey"/>
<arg line="-alias ${server.alias}"/>
<arg line="-keypass ${server.keypass}"/>
@@ -128,14 +132,14 @@
<arg line="-dname ${server.dname}"/>
<arg line="-keyalg ${keyalg}"/>
</java>
- <java classname="sun.security.tools.KeyTool" fork="true">
+ <java classname="${is.sun.jdk}" fork="true">
<arg line="-selfcert"/>
<arg line="-alias ${server.alias}"/>
<arg line="-keystore ${server.keystore}"/>
<arg line="-storepass ${server.storepass}"/>
<arg line="-keypass ${server.keypass}"/>
</java>
- <java classname="sun.security.tools.KeyTool" fork="true">
+ <java classname="${is.sun.jdk}" fork="true">
<arg line="-export"/>
<arg line="-alias ${server.alias}"/>
<arg line="-file ${server.file}"/>
@@ -145,7 +149,7 @@
<echo message="generate client keys"/>
- <java classname="sun.security.tools.KeyTool" fork="true">
+ <java classname="${is.sun.jdk}" fork="true">
<arg line="-genkey"/>
<arg line="-alias ${client.alias}"/>
<arg line="-keypass ${client.keypass}"/>
@@ -154,14 +158,14 @@
<arg line="-dname ${client.dname}"/>
<arg line="-keyalg ${keyalg}"/>
</java>
- <java classname="sun.security.tools.KeyTool" fork="true">
+ <java classname="${is.sun.jdk}" fork="true">
<arg line="-selfcert"/>
<arg line="-alias ${client.alias}"/>
<arg line="-keystore ${client.keystore}"/>
<arg line="-storepass ${client.storepass}"/>
<arg line="-keypass ${client.keypass}"/>
</java>
- <java classname="sun.security.tools.KeyTool" fork="true">
+ <java classname="${is.sun.jdk}" fork="true">
<arg line="-export"/>
<arg line="-alias ${client.alias}"/>
<arg line="-file ${client.file}"/>
@@ -170,7 +174,7 @@
</java>
<echo message="import client/server public keys in client/server keystores"/>
- <java classname="sun.security.tools.KeyTool" fork="true">
+ <java classname="${is.sun.jdk}" fork="true">
<arg line="-import"/>
<arg line="-alias ${server.alias}"/>
<arg line="-file ${server.file}"/>
@@ -178,7 +182,7 @@
<arg line="-storepass ${client.storepass}"/>
<arg line="-noprompt"/>
</java>
- <java classname="sun.security.tools.KeyTool" fork="true">
+ <java classname="${is.sun.jdk}" fork="true">
<arg line="-import"/>
<arg line="-alias ${client.alias}"/>
<arg line="-file ${client.file}"/>