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

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

Author: dimitris at jboss.org
Date: 2007-02-28 11:56:30 -0500 (Wed, 28 Feb 2007)
New Revision: 61005

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 16:34:27 UTC (rev 61004)
+++ branches/Branch_4_2/system/src/bin/run.sh	2007-02-28 16:56:30 UTC (rev 61005)
@@ -115,9 +115,7 @@
       warn "Missing file: $JAVAC_JAR"
       warn "Unexpected results may occur.  Make sure JAVA_HOME points to a JDK and not a JRE."
    fi
-   JAVAC_JAR=
-else
-   JAVAC_JAR="$JAVAC_JAR_FILE"
+   JAVAC_JAR_FILE=
 fi
 
 if [ "x$JBOSS_CLASSPATH" = "x" ]; then
@@ -125,8 +123,8 @@
 else
     JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH"
 fi
-if [ "x$JAVAC_JAR" != "x" ]; then
-    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JAVAC_JAR"
+if [ "x$JAVAC_JAR_FILE" != "x" ]; then
+    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JAVAC_JAR_FILE"
 fi
 
 # If -server not set in JAVA_OPTS, set it, if supported