Attachment 20954 Details for Bug 43594 – Correct patch to extend sourcing of setenv.sh/setenv.bat to CATALINA_BASE

[patch] Correct patch to extend sourcing of setenv.sh/setenv.bat to CATALINA_BASE

tc5.5.x-setenv-taketwo-patch.diff (text/plain), 1.29 KB, created by Shaddy Baddah on 2007-10-10 16:56:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shaddy Baddah

Created: 2007-10-10 16:56:35 UTC

Size: 1.29 KB

patch

obsolete

>Index: tc5.5.x/container/catalina/src/bin/catalina.bat
>===================================================================
>--- tc5.5.x/container/catalina/src/bin/catalina.bat	(revision 583638)
>+++ tc5.5.x/container/catalina/src/bin/catalina.bat	(working copy)
>@@ -68,7 +68,12 @@
> :okHome
> 
> rem Get standard environment variables
>+if "%CATALINA_BASE%" == "" goto gotSetenvHome
>+if exist "%CATALINA_BASE%\bin\setenv.bat" call "%CATALINA_BASE%\bin\setenv.bat"
>+goto gotSetenvBase
>+:gotSetenvHome
> if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
>+:gotSetenvBase
> 
> rem Get standard Java environment variables
> if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
>Index: tc5.5.x/container/catalina/src/bin/catalina.sh
>===================================================================
>--- tc5.5.x/container/catalina/src/bin/catalina.sh	(revision 583638)
>+++ tc5.5.x/container/catalina/src/bin/catalina.sh	(working copy)
>@@ -83,7 +83,9 @@
> # Only set CATALINA_HOME if not already set
> [ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
> 
>-if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
>+if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then
>+  . "$CATALINA_BASE"/bin/setenv.sh
>+elif [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
>   . "$CATALINA_HOME"/bin/setenv.sh
> fi
>

Actions: View | Diff

Attachments on bug 43594: 20953 | 20954