Author: jim
Date: Mon Dec 3 12:24:19 2007
New Revision: 600664
URL: http://svn.apache.org/viewvc?rev=600664&view=rev
Log:
Merge r600185 from trunk:
Fix bug 43594. Use setenv from CATALINA_BASE (if set) in preference to the one
in CATALINA_HOME. Patch provided by Shaddy Baddah.
Submitted by: markt
Reviewed by: jim
Modified:
tomcat/tc6.0.x/trunk/RUNNING.txt
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/catalina.sh
Modified: tomcat/tc6.0.x/trunk/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RUNNING.txt?rev=600664&r1=600663&r2=600664&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/RUNNING.txt (original)
+++ tomcat/tc6.0.x/trunk/RUNNING.txt Mon Dec 3 12:24:19 2007
@@ -106,6 +106,8 @@
calculate all relative references for files in the following directories based
on the value of $CATALINA_BASE instead of $CATALINA_HOME:
+* bin - Only setenv.sh (*nix) and setenv.bat (windows)
+
* conf - Server configuration files (including server.xml)
* logs - Log and output files
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=600664&r1=600663&r2=600664&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 3 12:24:19 2007
@@ -31,12 +31,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match
the dir structure
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43594
- Use CATALINA_BASE (if set) for setenv
- http://svn.apache.org/viewvc?rev=600185&view=rev
- +1: markt, funkman, pero, remm
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43530
Fix bad links on docs home page
http://svn.apache.org/viewvc?view=rev&revision=600222
Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=600664&r1=600663&r2=600664&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Mon Dec 3 12:24:19 2007
@@ -83,7 +83,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
Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=600664&r1=600663&r2=600664&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Mon Dec 3 12:24:19 2007
@@ -99,7 +99,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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
