This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new a9359e0 Remove support for the deprecated LOGGING_CONFIG environment
variable
a9359e0 is described below
commit a9359e0f1f8455bf5932afa402c41c08813bbdd7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 1 17:48:32 2020 +0100
Remove support for the deprecated LOGGING_CONFIG environment variable
---
bin/catalina.bat | 12 ------------
bin/catalina.sh | 13 -------------
bin/daemon.sh | 8 --------
webapps/docs/changelog.xml | 2 +-
4 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index bf0f7e0..ada989b 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -98,11 +98,6 @@ rem CATALINA_LOGGING_CONFIG (Optional) Override Tomcat's
logging config file
rem Example (all one line)
rem set
CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
rem
-rem LOGGING_CONFIG Deprecated
-rem Use CATALINA_LOGGING_CONFIG
-rem This is only used if CATALINA_LOGGING_CONFIG is not set
-rem and LOGGING_CONFIG starts with "-D..."
-rem
rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
rem Example (all one line)
rem set
LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
@@ -219,13 +214,6 @@ rem Register custom URL handlers
rem Do this here so custom URL handles (specifically 'war:...') can be used in
the security policy
set "JAVA_OPTS=%JAVA_OPTS%
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
-rem Check for the deprecated LOGGING_CONFIG
-rem Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG
starts with "-D..."
-if not "%LOGGING_CONFIG:~0,2%"=="-D" goto noLoggingDeprecation
-if not "%CATALINA_LOGGING_CONFIG%" == "" goto noLoggingDeprecation
-set "CATALINA_LOGGING_CONFIG=%LOGGING_CONFIG%"
-:noLoggingDeprecation
-
if not "%CATALINA_LOGGING_CONFIG%" == "" goto noJuliConfig
set CATALINA_LOGGING_CONFIG=-Dnop
if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 4e0b8bf..0ee6595 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -98,11 +98,6 @@
# Example (all one line)
#
CATALINA_LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
#
-# LOGGING_CONFIG Deprecated
-# Use CATALINA_LOGGING_CONFIG
-# This is only used if CATALINA_LOGGING_CONFIG is not set
-# and LOGGING_CONFIG starts with "-D..."
-#
# LOGGING_MANAGER (Optional) Override Tomcat's logging manager
# Example (all one line)
#
LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
@@ -260,14 +255,6 @@ JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
# Do this here so custom URL handles (specifically 'war:...') can be used in
the security policy
JAVA_OPTS="$JAVA_OPTS
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
-# Check for the deprecated LOGGING_CONFIG
-# Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts
with "-D..."
-if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
- if [ "${LOGGING_CONFIG#*-D}" != "$LOGGING_CONFIG" ]; then
- CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG"
- fi
-fi
-
# Set juli LogManager config file if it is present and an override has not
been issued
if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
diff --git a/bin/daemon.sh b/bin/daemon.sh
index 6038e1d..946bbe7 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -149,14 +149,6 @@ else
CLASSPATH="$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar"
fi
-# Check for the deprecated LOGGING_CONFIG
-# Only use it if CATALINA_LOGGING_CONFIG is not set and LOGGING_CONFIG starts
with "-D..."
-if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
- if [ "${LOGGING_CONFIG#*-D}" != "$LOGGING_CONFIG" ]; then
- CATALINA_LOGGING_CONFIG="$LOGGING_CONFIG"
- fi
-fi
-
# Set juli LogManager config file if it is present and an override has not
been issued
if [ -z "$CATALINA_LOGGING_CONFIG" ]; then
if [ -r "$CATALINA_BASE/conf/logging.properties" ]; then
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0fb18cf..01ee242 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -223,7 +223,7 @@
Update the CXF module to Apache CXF 3.3.6. (remm)
</update>
<fix>
- Depreacted the <code>LOGGING_CONFIG</code> environment variable and
+ Remove the <code>LOGGING_CONFIG</code> environment variable and
replace it with the <code>CATALINA_LOGGING_CONFIG</code> environment
variable to avoid clashes with other components that use
<code>LOGGING_CONFIG</code>. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
