summaryrefslogtreecommitdiff
path: root/www/tomcat-devel/files/tomcat_devel.in
diff options
context:
space:
mode:
Diffstat (limited to 'www/tomcat-devel/files/tomcat_devel.in')
-rw-r--r--www/tomcat-devel/files/tomcat_devel.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/tomcat-devel/files/tomcat_devel.in b/www/tomcat-devel/files/tomcat_devel.in
index 89df00dd6075..c4de5de2f969 100644
--- a/www/tomcat-devel/files/tomcat_devel.in
+++ b/www/tomcat-devel/files/tomcat_devel.in
@@ -108,16 +108,16 @@ 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_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
+_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 \
- --enable-native-access=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} ${_tomcat_java17_opts}"
command="%%LOCALBASE%%/bin/jsvc"
command_args="-java-home '${_tomcat_java_home}' \