This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 1c80fce73f Revert "Fix BZ 69584 - Include missing
"$CATALINA_LOGGING_CONFIG" in catalina.sh commands"
1c80fce73f is described below
commit 1c80fce73f0765bd73f503677c43c2333ca5c1f2
Author: Dimitris Soumis <jimsou...@gmail.com>
AuthorDate: Sun Feb 16 16:59:44 2025 +0200
Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in
catalina.sh commands"
This reverts commit e9384a81edec9aa5ce1d7a6a2d16198ad1b83736.
---
bin/catalina.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 90bd5b74d6..8d07001214 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -561,7 +561,7 @@ elif [ "$1" = "stop" ] ; then
fi
fi
- eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER
"$JAVA_OPTS" \
+ eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
-D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
-classpath "\"$CLASSPATH\"" \
-Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -648,7 +648,7 @@ elif [ "$1" = "stop" ] ; then
elif [ "$1" = "configtest" ] ; then
- eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER
"$JAVA_OPTS" \
+ eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
-D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
-classpath "\"$CLASSPATH\"" \
-Dcatalina.base="\"$CATALINA_BASE\"" \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
