Fix assorted TCK sigTestClasspaths

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

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/docker/jsptck.sh b/docker/jsptck.sh
@@ -70,7 +70,6 @@ sed -i "s#^webServerPort=.*#webServerPort=8080#g" ts.jte
 sed -i "s#^impl\.vi=.*#impl.vi=glassfish#g" ts.jte
 sed -i 's#^impl\.vi\.deploy\.dir=.*#impl.vi.deploy.dir=${webServerHome}/domains/domain1/autodeploy#' ts.jte
 sed -i "s#^impl\.deploy\.timeout\.multiplier=.*#impl.deploy.timeout.multiplier=30#g" ts.jte
-sed -i 's#sigTestClasspath=.*#sigTestClasspath=\$\{ts.home\}/classes\$\{pathsep\}\$\{jstl.classes\}\$\{pathsep\}\$\{jspservlet.classes\}\$\{pathsep\}\$\{el.classes\}\$\{pathsep\}\$\{JAVA_HOME\}/lib/rt.jar#g' ts.jte
 sed -i 's#^jspservlet\.classes=.*#jspservlet.classes=${webServerHome}/modules/jakarta.servlet-api.jar${pathsep}${webServerHome}/modules/jakarta.servlet.jsp.jar${pathsep}${webServerHome}/modules/jakarta.servlet.jsp-api.jar#g' ts.jte
 sed -i 's#^jstl\.classes=.*#jstl.classes=${webServerHome}/modules/jakarta.servlet.jsp.jstl.jar#g' ts.jte
 sed -i 's#^el\.classes=.*#el.classes=${webServerHome}/modules/jakarta.el.jar${pathsep}${webServerHome}/modules/jakarta.el-api.jar#g' ts.jte

diff --git a/docker/jstltck.sh b/docker/jstltck.sh
@@ -77,7 +77,6 @@ sed -i 's#jstl\.db\.url=.*#jstl.db.url=jdbc:derby://\$\{jstl.db.server\}:\$\{jst
 sed -i 's#jstl\.db\.driver=.*#jstl.db.driver=org.apache.derby.jdbc.ClientDriver#g' ts.jte
 sed -i 's#jstl\.db\.user=.*#jstl.db.user=cts1#g' ts.jte
 sed -i 's#jstl\.db\.password=.*#jstl.db.password=cts1#g' ts.jte
-sed -i 's#sigTestClasspath=.*#sigTestClasspath=\$\{ts.home\}/classes:\$\{jstl.classes\}:\$\{jspservlet.classes\}:\$\{JAVA_HOME\}/lib/rt.jar#g' ts.jte
 sed -i 's#jspservlet.classes=.*#jspservlet.classes=\$\{webServerHome\}/modules/jakarta.servlet-api.jar:\$\{webServerHome\}/modules/jakarta.servlet.jsp.jar:\$\{webServerHome\}/modules/jakarta.servlet.jsp-api.jar:\$\{webServerHome\}/modules/jakarta.el.jar:\$\{webServerHome\}/modules/jakarta.el-api.jar#g' ts.jte
 sed -i 's#jstl.classes=.*#jstl.classes=\$\{webServerHome\}/modules/jakarta.servlet.jsp.jstl.jar\$\{pathsep\}\$\{webServerHome\}/modules/jakarta.servlet.jsp.jstl-api.jar#g' ts.jte
 

diff --git a/install/jaspic/bin/ts.jte.jdk11 b/install/jaspic/bin/ts.jte.jdk11
@@ -471,7 +471,7 @@ env.ts_win32.menu=true
 #########################################################################
 jimage.dir=${ts.home}/tmp/jdk-bundles
 
-sigTestClasspath=${jaspic.home}/modules/jakarta.security.auth.message-api.jar:${jaspic.home}/modules/security.jar:${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming
+sigTestClasspath=${jaspic.home}/modules/jakarta.authentication-api.jar:${jaspic.home}/modules/security.jar:${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming
 
 ########################################################################
 ## These properties are used by the harness.  "harness.log.port"

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}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming
+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
 
 ###############################################################
 ## This command allows the test clients to be run in