This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new eef88ff7aa Revert "Fix BZ 69584 - Include missing
"$CATALINA_LOGGING_CONFIG" in catalina.sh commands"
eef88ff7aa is described below
commit eef88ff7aa3dda754c1b5fd7d9fea76349d213e4
Author: Dimitris Soumis <[email protected]>
AuthorDate: Sun Feb 16 16:59:25 2025 +0200
Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in
catalina.sh commands"
This reverts commit a83979963ad2c0f2812323610a27883176352bba.
---
bin/catalina.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 3ae29bc8eb..959a637389 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -521,7 +521,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\"" \
@@ -607,7 +607,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]
