Skip to content

Commit

Permalink
fix jakartaee.jar path in jspc.bat/sh
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
lukasj committed Apr 20, 2022
1 parent c3d2f90 commit 757ea75
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ JSP_IMPL=$AS_INSTALL_LIB/wasp.jar
EL_IMPL=$AS_INSTALL_LIB/expressly:$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/jakartaee.jar
JAKARTAEE_API=$AS_lib/jakartaee.jar

java -cp "$JSP_IMPL:$JAVAEE_API:$AS_LIB" org.apache.jasper.JspC -sysClasspath "$JSP_IMPL:$EL_IMPL:$JSTL_IMPL:$JAVAEE_API:$AS_LIB" -schemas "/schemas/" -dtds "/dtds/" "$@"
java -cp "$JSP_IMPL:$JAKARTAEE_API:$AS_LIB" org.apache.jasper.JspC -sysClasspath "$JSP_IMPL:$EL_IMPL:$JSTL_IMPL:$JAKARTAEE_API:$AS_LIB" -schemas "/schemas/" -dtds "/dtds/" "$@"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo off
REM
REM Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
REM Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
REM
REM This program and the accompanying materials are made available under the
REM terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -22,6 +22,6 @@ set JSP_IMPL=%AS_INSTALL_LIB%\wasp.jar
set EL_IMPL=%AS_INSTALL_LIB%\expressly;%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
set JAKARTAEE_API=%AS_LIB%\jakartaee.jar

java -cp "%JSP_IMPL%;%JAVAEE_API%;%AS_LIB%" org.apache.jasper.JspC -sysClasspath "%JSP_IMPL%;%EL_IMPL%;%JSTL_IMPL%;%JAVAEE_API%;%AS_LIB%" -schemas "/schemas/" -dtds "/dtds/" %*
java -cp "%JSP_IMPL%;%JAKARTAEE_API%;%AS_LIB%" org.apache.jasper.JspC -sysClasspath "%JSP_IMPL%;%EL_IMPL%;%JSTL_IMPL%;%JAKARTAEE_API%;%AS_LIB%" -schemas "/schemas/" -dtds "/dtds/" %*

0 comments on commit 757ea75

Please sign in to comment.