Author: fhanik
Date: Tue Mar 27 00:10:29 2007
New Revision: 522797
URL: http://svn.apache.org/viewvc?view=rev&rev=522797
Log:
fix 41786
Modified:
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/catalina.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?view=diff&rev=522797&r1=522796&r2=522797
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Tue Mar 27 00:10:29 2007
@@ -94,7 +94,7 @@
set CATALINA_TMPDIR=%CATALINA_BASE%\temp
:gotTmpdir
-if not exist "%CATALINA_HOME%\conf\logging.properties" goto noJuli
+if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuli
set JAVA_OPTS=%JAVA_OPTS%
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
:noJuli
Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?view=diff&rev=522797&r1=522796&r2=522797
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Tue Mar 27 00:10:29 2007
@@ -162,7 +162,7 @@
fi
# Set juli LogManager if it is present
-if [ -r "$CATALINA_HOME"/conf/logging.properties ]; then
+if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
JAVA_OPTS="$JAVA_OPTS
"-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
"-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
fi
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=522797&r1=522796&r2=522797
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Mar 27 00:10:29 2007
@@ -18,6 +18,9 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>41786 </bug> Incorrect reference to catalina_home in
catalina.sh/bat Patch provided by Mike Hanafey (fhanik)
+ </fix>
+ <fix>
<bug>41703</bug> SingleSignOnMessage invalid setter, patch provided by
Nils Hammar (fhanik)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
