Fix additional TCK SigTests

Signed-off-by: Brian Decker <bmdecker@us.ibm.com>
scottmarlow · Mar 3, 2021 · ac34bf6 · ac34bf6
1 parent 92d5ebd
commit ac34bf6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/install/jsp/bin/ts.jte b/install/jsp/bin/ts.jte
@@ -105,7 +105,7 @@ jstl.classes=${webServerHome}/modules/jakarta.servlet.jsp.jstl.jar
 #   sigTestClasspath=${jspservlet.classes}${pathsep}${JAVA_HOME}/lib/rt.jar
 #
 ########################################################################
-sigTestClasspath=${jspservlet.classes}${pathsep}/System/Library/Frameworks/JavaVM.framework/Versions/1.7.0/Classes/classes.jar
+sigTestClasspath=${jspservlet.classes}${pathsep}${el.classes}${pathsep}${JAVA_HOME}/lib/rt.jar${pathsep}/System/Library/Frameworks/JavaVM.framework/Versions/1.7.0/Classes/classes.jar
 
 
 ########################################################################

diff --git a/install/jsp/bin/ts.jte.jdk11 b/install/jsp/bin/ts.jte.jdk11
@@ -105,7 +105,7 @@ jstl.classes=${webServerHome}/modules/jakarta.servlet.jsp.jstl.jar
 ########################################################################
 jimage.dir=${ts.home}/tmp/jdk-bundles
 
-sigTestClasspath=${jspservlet.classes}${pathsep}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming
+sigTestClasspath=${jspservlet.classes}${pathsep}${el.classes}${pathsep}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming
 
 
 ########################################################################

diff --git a/install/jstl/bin/ts.jte b/install/jstl/bin/ts.jte
@@ -181,7 +181,7 @@ javatest.timeout.factor=1.0
 #   sigTestClasspath=${jstl.classes}${pathsep}${jspservlet.classes}${pathsep}${java.home}/lib/rt.jar
 #
 ########################################################
-sigTestClasspath=${ts.home}/classes${pathsep}${jstl.classes}${pathsep}${jspservlet.classes}${pathsep}/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar
+sigTestClasspath=${ts.home}/classes${pathsep}${jstl.classes}${pathsep}${jspservlet.classes}${pathsep}${JAVA_HOME}/lib/rt.jar${pathsep}/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar
 
 ########################################################
 #  Common environment for both ts_unix and ts_win32

diff --git a/install/saaj/bin/ts.jte.jdk11 b/install/saaj/bin/ts.jte.jdk11
@@ -274,7 +274,7 @@ env.ts_win32.menu=true
 #########################################################################
 jimage.dir=${ts.home}/tmp/jdk-bundles
 
-sigTestClasspath=${local.classes}${pathsep}${webcontainer.home}/modules/webservices-api-osgi.jar${pathsep}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming
+sigTestClasspath=${local.classes}${pathsep}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming${pathsep}${jimage.dir}/java.xml
 
 ###############################################################
 ## This command allows the test clients to be run in