Author: markt
Date: Sun Jan 6 14:14:28 2008
New Revision: 609438
URL: http://svn.apache.org/viewvc?rev=609438&view=rev
Log:
Fix bug 43594. Use setenv from CATALINA_BASE (if set) in preference to the one
in CATALINA_HOME. Patch provided by Shaddy Baddah.
Modified:
tomcat/build/tc5.5.x/RUNNING.txt
tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat
tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/RUNNING.txt?rev=609438&r1=609437&r2=609438&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/RUNNING.txt (original)
+++ tomcat/build/tc5.5.x/RUNNING.txt Sun Jan 6 14:14:28 2008
@@ -128,6 +128,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/container/tc5.5.x/catalina/src/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat?rev=609438&r1=609437&r2=609438&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.bat Sun Jan 6 14:14:28
2008
@@ -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
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=609438&r1=609437&r2=609438&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Sun Jan 6 14:14:28
2008
@@ -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
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609438&r1=609437&r2=609438&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 6 14:14:28 2008
@@ -37,6 +37,10 @@
<update>
Use Eclipse JDT 3.3.1. (pero)
</update>
+ <fix>
+ <bug>43594</bug>: Use setenv from CATALINA_BASE (if set) in preference
+ to the one in CATALINA_HOME. Patch provided by Shaddy Baddah. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Catalina">
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609438&r1=609437&r2=609438&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 6 14:14:28 2008
@@ -47,12 +47,6 @@
-1:
0: fhanik, this needs to be reworked completely, so I'm neutral
-* 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, pero, rjung
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
http://svn.apache.org/viewvc?rev=603340&view=rev
+1: markt, pero, rjung
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
