Author: yoavs
Date: Fri Nov 18 07:54:56 2005
New Revision: 345508
URL: http://svn.apache.org/viewcvs?rev=345508&view=rev
Log:
Bugzilla 37284: http://issues.apache.org/bugzilla/show_bug.cgi?id=37284
Modified:
tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.sh
tomcat/container/tc5.5.x/catalina/src/bin/startup.sh
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=345508&r1=345507&r2=345508&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Fri Nov 18 07:54:56
2005
@@ -45,9 +45,11 @@
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
os400=false
+darwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
OS400*) os400=true;;
+Darwin*) darwin=true;;
esac
# resolve links - $0 may be a softlink
Modified: tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.sh?rev=345508&r1=345507&r2=345508&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.sh Fri Nov 18
07:54:56 2005
@@ -10,9 +10,14 @@
# Make sure prerequisite environment variables are set
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
- echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
- echo "At least one of these environment variable is needed to run this
program"
- exit 1
+ # Bugzilla 37284
+ if $darwin && [ -d
"/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" ]; then
+ export
JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
+ else
+ echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is
defined"
+ echo "At least one of these environment variable is needed to run this
program"
+ exit 1
+ fi
fi
if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then
echo "JAVA_HOME should point to a JDK in order to run in debug mode."
Modified: tomcat/container/tc5.5.x/catalina/src/bin/startup.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/startup.sh?rev=345508&r1=345507&r2=345508&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/startup.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/startup.sh Fri Nov 18 07:54:56
2005
@@ -7,9 +7,11 @@
# Better OS/400 detection: see Bugzilla 31132
os400=false
+darwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
OS400*) os400=true;;
+Darwin*) darwin=true;;
esac
# resolve links - $0 may be a softlink
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=345508&r1=345507&r2=345508&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Nov 18 07:54:56 2005
@@ -43,6 +43,9 @@
Added Eclipse .project, .classpath, and associated files to make
building Tomcat from
Eclipse significantly easier. (markt)
</add>
+ <add>
+ <bug>37284</bug>: Guess JSE 5.0 location on Mac OS X, patch by Stepan
Koltsov. (yoavs)
+ </add>
</changelog>
</subsection>
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
