el tck fix for Provider com.sun.el.ExpressionFactoryImpl not found.

Signed-off-by: gurunrao <gurunandan.rao@oracle.com>
jakartaee · Mar 1, 2022 · e5b282c · e5b282c
1 parent 14fa541
commit e5b282c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/docker/eltck.sh b/docker/eltck.sh
@@ -67,7 +67,7 @@ export PATH=$JAVA_HOME/bin:$PATH
 which java
 java -version
 
-sed -i "s#^el\.classes=.*#el.classes=$TS_HOME/lib/javatest.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.el.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.el-api.jar#g" ts.jte
+sed -i "s#^el\.classes=.*#el.classes=$TS_HOME/lib/javatest.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.el.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.el-api.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/expressly.jar#g" ts.jte
 sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
 sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte
 

diff --git a/install/el/bin/ts.jte b/install/el/bin/ts.jte
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2021 Oracle and/or its affiliates and others.
+# Copyright (c) 2013, 2022 Oracle and/or its affiliates and others.
 # All rights reserved.
 #
 # This program and the accompanying materials are made available under the
@@ -49,7 +49,7 @@ el.classes=
 #     variable.mapper=com.sun.el.lang.VariableMapperImpl
 #
 ########################################################
-variable.mapper=com.sun.el.lang.VariableMapperImpl
+variable.mapper=org.glassfish.expressly.lang.VariableMapperImpl
 
 ########################################################
 #

diff --git a/install/jakartaee/bin/ts.jte b/install/jakartaee/bin/ts.jte
@@ -2127,10 +2127,10 @@ secured.ejb.vehicle.client=true
 #     This property is used to point to the location of the 
 #     implementation of VariableMapper. The value for sjsas 9.x is
 #
-#     variable.mapper=com.sun.el.lang.VariableMapperImpl
+#     variable.mapper=org.glassfish.expressly.lang.VariableMapperImpl
 #
 ####################################################################
-variable.mapper=com.sun.el.lang.VariableMapperImpl
+variable.mapper=org.glassfish.expressly.lang.VariableMapperImpl
 
 #######################################################################
 # Endpoint API test

diff --git a/install/jaspic/bin/ts.jte b/install/jaspic/bin/ts.jte
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2022 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -601,7 +601,7 @@ namingServiceHost1=${orb.host}
 namingServicePort1=${orb.port}
 namingServiceHost2=${orb.host}
 namingServicePort2=${orb.port}
-variable.mapper=com.sun.el.lang.VariableMapperImpl
+variable.mapper=org.glassfish.expressly.lang.VariableMapperImpl
 # The following Jakarta Deployment properties are not supported
 #deployManagerJarFile.2=${jaspic.home}/lib/deployment/sun-as-jsr88-dm.jar
 #deployManageruri.2=deployer:Sun:AppServer::${deployment_host.2}:${s1as.admin.port}