diff options
Diffstat (limited to 'www/tomcat101/files/tomcat101.in')
| -rw-r--r-- | www/tomcat101/files/tomcat101.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in index ac405c2fc815..a60d0f5f3a18 100644 --- a/www/tomcat101/files/tomcat101.in +++ b/www/tomcat101/files/tomcat101.in @@ -109,14 +109,23 @@ required_dirs="${_tomcat_catalina_tmpdir}" extra_commands="reload" _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` - -export JAVA_TOOL_OPTIONS="\ +_tomcat_java9_opts="\ --add-opens=java.base/java.lang=ALL-UNNAMED \ --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ --add-opens=java.base/java.io=ALL-UNNAMED \ --add-opens=java.base/java.util=ALL-UNNAMED \ --add-opens=java.base/java.util.concurrent=ALL-UNNAMED \ --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED" +_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts}" + +case "${_tomcat_java_version}" in + 1[7-9]* | [2-9][0-9]* ) + _tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java17_opts}" + ;; + *) + ;; +esac command="%%LOCALBASE%%/bin/jsvc" command_args="-java-home '${_tomcat_java_home}' \ |