commit ee7f4009528c7fed7b1f9852260de7e8a6eead3e
author smillidge <steve.millidge@payara.fish> Fri Jul 17 20:44:15 2020 +0100
committer smillidge <steve.millidge@payara.fish> Fri Jul 17 20:44:15 2020 +0100
tree 9887f953547234bf4858f56197a68233420fd256
parent f80b28c5ff657113d16b37a9793a6d6e3cf31d09

Initial changes waiting for JSTL fixes

Signed-off-by: smillidge <steve.millidge@payara.fish>

nucleus/distributions/nucleus-common/src/main/resources/bin/jspc

diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
index 2960daa..4aeb0c0 100644
--- a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
+++ b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
@@ -18,7 +18,7 @@
 AS_INSTALL=`dirname $0`/..
 AS_INSTALL_LIB=$AS_INSTALL/modules
 JSP_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jar
-EL_IMPL=$AS_INSTALL_LIB/jakarta.el.jar
+EL_IMPL=$AS_INSTALL_LIB/jakarta.el.jar:$AS_INSTALL_LIB/jakarta.el-api.jar
 JSTL_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jstl.jar
 AS_LIB=$AS_INSTALL/lib
 JAVAEE_API=$AS_LIB/javaee.jar

nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat

diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat
index 00a7458..1722c9f 100644
--- a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat
+++ b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat
@@ -19,7 +19,7 @@
 
 set AS_INSTALL_LIB=%~dp0..\modules
 set JSP_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jar
-set EL_IMPL=%AS_INSTALL_LIB%\jakarta.el.jar
+set EL_IMPL=%AS_INSTALL_LIB%\jakarta.el.jar;%AS_INSTALL_LIB%\jakarta.el-api.jar
 set JSTL_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jstl.jar
 set AS_LIB=%~dp0..\lib
 set JAVAEE_API=%AS_LIB%\javaee.jar