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