Attachment #20954 for bug #43594

View | Details | Raw Unified | Return to bug 43594
Collapse All | Expand All

Lines 68-74 Link Here

(-)tc5.5.x/container/catalina/src/bin/catalina.bat (+5 lines)
68	:okHome	68	:okHome
69		69
70	rem Get standard environment variables	70	rem Get standard environment variables
		71	if "%CATALINA_BASE%" == "" goto gotSetenvHome
		72	if exist "%CATALINA_BASE%\bin\setenv.bat" call "%CATALINA_BASE%\bin\setenv.bat"
		73	goto gotSetenvBase
		74	:gotSetenvHome
71	if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"	75	if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
		76	:gotSetenvBase
72		77
73	rem Get standard Java environment variables	78	rem Get standard Java environment variables
74	if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath	79	if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath

Lines 83-89 Link Here

(-)tc5.5.x/container/catalina/src/bin/catalina.sh (-1 / +3 lines)
83	# Only set CATALINA_HOME if not already set	83	# Only set CATALINA_HOME if not already set
84	[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`	84	[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
85		85
86	if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then	86	if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then
		87	. "$CATALINA_BASE"/bin/setenv.sh
		88	elif [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
87	. "$CATALINA_HOME"/bin/setenv.sh	89	. "$CATALINA_HOME"/bin/setenv.sh
88	fi	90	fi
89		91

Return to bug 43594