www/tomee: Add Java 9+ specific start-up parameters, improve port

Fix typo in rc script.
Fix DOS line endings in configs.
Add Java 9+ specific start-up parameters.

PR:	286475
MFH:	2025Q2
This commit is contained in:
Lars Herschke 2025-05-06 16:19:16 +03:00 committed by Vladimir Druzenko
parent 11327766cf
commit 67049167cf
2 changed files with 22 additions and 3 deletions

View File

@ -1,5 +1,6 @@
PORTNAME= tomee
DISTVERSION= 8.0.16
PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${PORTNAME}-${DISTVERSION}/
DISTNAME= apache-${PORTNAME}-${DISTVERSION}-webprofile
@ -12,8 +13,12 @@ LICENSE= APACHE20
RUN_DEPENDS= jsvc:devel/apache-commons-daemon
USES= cpe java
USES= cpe dos2unix java
CPE_VENDOR= apache
DOS2UNIX_FILES= ${TOMEE_CONF_FILES} catalina.policy.original \
server.xml.original tomcat-users.xml.original \
tomcat-users.xsd
DOS2UNIX_WRKSRC= ${WRKSRC}/conf
USE_RC_SUBR= ${PKGBASE}
EXTRACT_AFTER_ARGS= --exclude *.bat \

View File

@ -85,7 +85,7 @@ eval "${rcvar}=\${${rcvar}:-'NO'}"
eval "_tomee_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}"
eval "_tomee_catalina_user=\${${name}_catalina_user:-'%%TOMEE_USER%%'}"
eval "_tomee_catalina_home=\${${name}_catalina_home:-'%%TOMEE_HOME%%'}"
eval "_tomee_catalina_base=\${${name}_catalina_base:-'${_tomcat_catalina_home}'}"
eval "_tomee_catalina_base=\${${name}_catalina_base:-'${_tomee_catalina_home}'}"
eval "_tomee_catalina_tmpdir=\${${name}_catalina_tmpdir:-'${_tomee_catalina_base}/temp'}"
eval "_tomee_stdout=\${${name}_stdout:-'${_tomee_catalina_base}/logs/catalina.out'}"
eval "_tomee_stderr=\${${name}_stderr:-'&1'}"
@ -104,10 +104,24 @@ required_dirs="${_tomee_catalina_tmpdir}"
extra_commands="reload"
_tomee_java_version=`${_tomee_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
_tomee_java9_opts="\
--add-opens=java.base/java.io=ALL-UNNAMED \
--add-opens=java.base/java.lang=ALL-UNNAMED \
--add-opens=java.base/java.net=ALL-UNNAMED \
--add-opens=java.base/java.util=ALL-UNNAMED \
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
--add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED \
--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
_tomee_java17_opts="--enable-native-access=ALL-UNNAMED"
case "${_tomee_java_version}" in
9* | [1-2][0-9]* )
1[7-9]* | [2-9][0-9]* )
_tomee_endorsed_dirs_option=
_tomee_java_opts="${_tomee_java_opts} ${_tomee_java9_opts} ${_tomee_java17_opts}"
;;
9* | 1[0-6]* )
_tomee_endorsed_dirs_option=
_tomee_java_opts="${_tomee_java_opts} ${_tomee_java9_opts}"
;;
*)
_tomee_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomee_catalina_home}/endorsed'"