This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b239295ea756f669da44280cfdff1f4230520eeb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 24 17:59:33 2019 +0100
Align with 8.5.x. Variable names and comments
---
bin/catalina-tasks.xml | 2 +-
bin/catalina.bat | 2 +-
bin/catalina.sh | 2 +-
bin/daemon.sh | 18 ++++++++++--------
bin/tool-wrapper.bat | 2 +-
bin/tool-wrapper.sh | 2 +-
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/bin/catalina-tasks.xml b/bin/catalina-tasks.xml
index 4e6a8ae..c7c9c28 100644
--- a/bin/catalina-tasks.xml
+++ b/bin/catalina-tasks.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/bin/catalina.bat b/bin/catalina.bat
index f3c20e7..a47def9 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -67,7 +67,7 @@ rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon
separated directories
rem containing some jars in order to allow replacement of
APIs
rem created outside of the JCP (i.e. DOM and SAX from W3C).
rem It can also be used to update the XML parser
implementation.
-rem Note that Java 9 no longer supports this feature.
+rem This is only supported for Java <= 8.
rem Defaults to $CATALINA_HOME/endorsed.
rem
rem JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start"
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 2ff3f28..0d01c6c 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -62,7 +62,7 @@
# containing some jars in order to allow replacement of APIs
# created outside of the JCP (i.e. DOM and SAX from W3C).
# It can also be used to update the XML parser
implementation.
-# Note that Java 9 no longer supports this feature.
+# This is only supported for Java <= 8.
# Defaults to $CATALINA_HOME/endorsed.
#
# JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start"
diff --git a/bin/daemon.sh b/bin/daemon.sh
index 920ade1..9b85343 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -18,20 +18,22 @@
# -----------------------------------------------------------------------------
# Commons Daemon wrapper script.
# -----------------------------------------------------------------------------
-#
+
# resolve links - $0 may be a softlink
-ARG0="$0"
-while [ -h "$ARG0" ]; do
- ls=`ls -ld "$ARG0"`
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+ ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
- ARG0="$link"
+ PRG="$link"
else
- ARG0="`dirname $ARG0`/$link"
+ PRG="`dirname $PRG`/$link"
fi
done
-DIRNAME="`dirname $ARG0`"
-PROGRAM="`basename $ARG0`"
+
+DIRNAME="`dirname $PRG`"
+PROGRAM="`basename $PRG`"
while [ ".$1" != . ]
do
case "$1" in
diff --git a/bin/tool-wrapper.bat b/bin/tool-wrapper.bat
index 4e3a135..5e1899c 100755
--- a/bin/tool-wrapper.bat
+++ b/bin/tool-wrapper.bat
@@ -36,7 +36,7 @@ rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon
separated directories
rem containing some jars in order to allow replacement of
APIs
rem created outside of the JCP (i.e. DOM and SAX from W3C).
rem It can also be used to update the XML parser
implementation.
-rem Note that Java 9 no longer supports this feature.
+rem This is only supported for Java <= 8.
rem Defaults to $CATALINA_HOME/endorsed.
rem ---------------------------------------------------------------------------
diff --git a/bin/tool-wrapper.sh b/bin/tool-wrapper.sh
index d51cb98..91ed73f 100755
--- a/bin/tool-wrapper.sh
+++ b/bin/tool-wrapper.sh
@@ -37,7 +37,7 @@
# containing some jars in order to allow replacement of APIs
# created outside of the JCP (i.e. DOM and SAX from W3C).
# It can also be used to update the XML parser
implementation.
-# Note that Java 9 no longer supports this feature.
+# This is only supported for Java <= 8.
# Defaults to $CATALINA_HOME/endorsed.
# -----------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
