[jboss-cvs] JBossAS SVN: r60999 - branches/Branch_4_2/system/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: jfrederic.clere at jboss.com
Date: 2007-02-28 10:53:35 -0500 (Wed, 28 Feb 2007)
New Revision: 60999

Modified:
   branches/Branch_4_2/system/src/bin/run.sh
Log:
JBAS-4161, run.sh/.bat should not complaint when running with a JRE


Modified: branches/Branch_4_2/system/src/bin/run.sh
===================================================================
--- branches/Branch_4_2/system/src/bin/run.sh	2007-02-28 13:57:33 UTC (rev 60998)
+++ branches/Branch_4_2/system/src/bin/run.sh	2007-02-28 15:53:35 UTC (rev 60999)
@@ -101,24 +101,32 @@
 fi
 JBOSS_BOOT_CLASSPATH="$runjar"
 
-# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
+# Tomcat uses the JDT Compiler
+# Only include tools.jar if someone wants to use the JDK instead.
 # compatible distribution which JAVA_HOME points to
 if [ "x$JAVAC_JAR" = "x" ]; then
-    JAVAC_JAR="$JAVA_HOME/lib/tools.jar"
+    JAVAC_JAR_FILE="$JAVA_HOME/lib/tools.jar"
+else
+    JAVAC_JAR_FILE="$JAVAC_JAR"
 fi
-if [ ! -f "$JAVAC_JAR" ]; then
+if [ ! -f "$JAVAC_JAR_FILE" ]; then
    # MacOSX does not have a seperate tools.jar
-   if [ "$darwin" != "true" ]; then
+   if [ "$darwin" != "true" -a "x$JAVAC_JAR" != "x" ]; then
       warn "Missing file: $JAVAC_JAR"
       warn "Unexpected results may occur.  Make sure JAVA_HOME points to a JDK and not a JRE."
    fi
+else
+   JAVAC_JAR="$JAVAC_JAR_FILE"
 fi
 
 if [ "x$JBOSS_CLASSPATH" = "x" ]; then
-    JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
+    JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH"
 else
-    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
+    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH"
 fi
+if [ "x$JAVAC_JAR" != "x" ]; then
+    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JAVAC_JAR"
+fi
 
 # If -server not set in JAVA_OPTS, set it, if supported
 SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`