This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 68504f2a94 Revert "Fix BZ 69584 - Include missing
"$CATALINA_LOGGING_CONFIG" in catalina.sh commands"
68504f2a94 is described below
commit 68504f2a94c1e2a72ea62d8b8584c665affe49bb
Author: Dimitris Soumis <[email protected]>
AuthorDate: Sun Feb 16 16:57:49 2025 +0200
Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in
catalina.sh commands"
This reverts commit 2d50aa64eaf0fe84272fc8556abdfa82b36dfad8.
---
bin/catalina.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 4755c1576f..c5a996cb65 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -470,7 +470,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\"" \
@@ -556,7 +556,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: [email protected]
For additional commands, e-mail: [email protected]
