Hi Remy,

I think the patch is incomplete

this line seem not correct:

+    else
+      JRE_HOME=/usr
+    fi

better
+    else
+      JRE_HOME=/usr/bin/java
+    fi

Peter


Am 17.10.2007 um 03:11 schrieb [EMAIL PROTECTED]:

Author: remm
Date: Tue Oct 16 18:11:39 2007
New Revision: 585313

URL: http://svn.apache.org/viewvc?rev=585313&view=rev
Log:
- Propose a shell script update.

Modified:
    tomcat/tc6.0.x/trunk/STATUS

Modified: tomcat/tc6.0.x/trunk/STATUS
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS? rev=585313&r1=585312&r2=585313&view=diff ====================================================================== ========
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Tue Oct 16 18:11:39 2007
@@ -54,5 +54,32 @@

 * 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:



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to