- Propose a shell script update.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@585313 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index d960128..f799607 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -54,5 +54,32 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix property setter for keystore type
   http://issues.apache.org/bugzilla/show_bug.cgi?id=43634
-  +1: fhanik,funkman
+  +1: fhanik,funkman,remm
+  -1: 
+
+* IcedTea support. Upcoming Linux distributions will package a (working) open source JRE,
+  available in /usr. As a result, it could now be possible to use a "/usr/bin/java" binary
+  if one is present and expect results. [tested on Fedora 8 test 3]
+
+--- bin/setclasspath.sh        (revision 585189)
++++ bin/setclasspath.sh        (working copy)
+@@ -30,9 +30,13 @@
+   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
++    if [ ! -x /usr/bin/java ]; 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
++    else
++      JRE_HOME=/usr
++    fi
+   fi
+ fi
+ if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then
+
+  +1: 
   -1: