Split LOGGING_CONFIG into two options, LOGGING_CONFIG which points to the file, LOGGI...

This makes it much easier to handle directories with spaces

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@750291 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/bin/catalina.bat b/bin/catalina.bat
index b3536e5..827e56d 100755 (executable)
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -64,10 +64,13 @@ rem
 rem                   -agentlib:jdwp=transport=%JPDA_TRANSPORT%,
 rem                       address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
 rem
-rem   LOGGING_CONFIG  (Optional) Override Tomcat's logging manager and logging config file
+rem   LOGGING_CONFIG  (Optional) Override Tomcat's logging config file
 rem                   Example (all one line)
-rem                   set LOGGING_CONFIG=-Djava.util.logging.manager=com.foo.MyLogManager 
-rem                                   -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties
+rem                   set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
+rem
+rem   LOGGING_MANAGER (Optional) Override Tomcat's logging manager 
+rem                   Example (all one line)
+rem                   set LOGGING_CONFIG="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 rem
 rem
 rem
@@ -121,13 +124,18 @@ if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir
 set CATALINA_TMPDIR=%CATALINA_BASE%\temp
 :gotTmpdir
 
-if not "%LOGGING_CONFIG%" == "" goto noJuli
+if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
 set LOGGING_CONFIG=-Dnop
-if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuli
-set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
-:noJuli
+if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
+set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
+:noJuliConfig
 set JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%
 
+if not "%LOGGING_MANAGER%" == "" goto noJuliManager
+set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
+:noJuliManager
+set JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER%
+
 rem ----- Execute The Requested Command ---------------------------------------
 
 echo Using CATALINA_BASE:   %CATALINA_BASE%

diff --git a/bin/catalina.sh b/bin/catalina.sh
index 1a905e3..9c7c3e9 100755 (executable)
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -67,10 +67,13 @@
 #   CATALINA_PID    (Optional) Path of the file which should contains the pid
 #                   of catalina startup java process, when start (fork) is used
 #
-#   LOGGING_CONFIG  (Optional) Override Tomcat's logging manager and logging config file
+#   LOGGING_CONFIG  (Optional) Override Tomcat's logging config file
 #                   Example (all one line)
-#                   LOGGING_CONFIG="-Djava.util.logging.manager=com.foo.MyLogManager \
-#                                   -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+#                   LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+#
+#   LOGGING_MANAGER (Optional) Override Tomcat's logging manager 
+#                   Example (all one line)
+#                   LOGGING_CONFIG="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 #
 # $Id$
 # -----------------------------------------------------------------------------
@@ -184,16 +187,22 @@ if $cygwin; then
   JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
 fi
 
-# Set juli LogManager if it is present and an override has not been issued
+# Set juli LogManager config file if it is present and an override has not been issued
 if [ -z "$LOGGING_CONFIG" ]; then
   if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
-    JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
     LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
   else
     # Bugzilla 45585
     LOGGING_CONFIG="-Dnop"
   fi
 fi
+
+if [ -z "$LOGGING_MANAGER" ]; then
+  JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
+else 
+  JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER"
+fi
+
 # ----- Execute The Requested Command -----------------------------------------
 
 # Bugzilla 37848: only output this if we have a TTY