Skip to content

Commit

Permalink
Fix #39. Ensure java.endorsed.dirs is correctly configured
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Thomas <markt@apache.org>
  • Loading branch information
markt-asf authored and alwin-joseph committed Apr 16, 2019
1 parent 675190a commit 465e984
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions install/servlet/bin/ts.jte
Expand Up @@ -143,6 +143,14 @@ ts.harness.classpath=${ts.home}/lib/jaxb-xjc.jar${pathsep}${ts.home}/lib/tsharne

servlet.classes=${web.home}/modules/jakarta.servlet-api.jar${pathsep}${web.home}/modules/endorsed/jakarta.annotation-api.jar

########################################################################
# @endorsedlib.dir - Location to be used for java.endorsed.dirs as some
# tests require some addition classes in the
# java.util.concurrent package that are not present
# in Java 8 as they were added in Java 9.
########################################################################
endorsedlib.dir=${ts.home}/endorsedlib

########################################################################
## Common environment for both ts_unix and ts_win32
#
Expand All @@ -161,6 +169,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
windir=${windir} \
SYSTEMROOT=${SYSTEMROOT} \
${JAVA_HOME}/bin/java \
-Djava.endorsed.dirs=${endorsedlib.dir} \
-Dbytecheck=true \
-Djava.protocol.handler.pkgs=javax.net.ssl \
-Djavax.net.ssl.keyStore=${ts.home}/bin/certificates/clientcert.jks \
Expand Down

0 comments on commit 465e984

Please sign in to comment.