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

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

Author: jfrederic.clere at jboss.com
Date: 2007-02-13 08:09:09 -0500 (Tue, 13 Feb 2007)
New Revision: 60503

Modified:
   branches/Branch_4_2/system/src/bin/run.bat
   branches/Branch_4_2/system/src/bin/run.sh
Log:
Avoid using tools.jar because it is not needed by TC nor javassist.


Modified: branches/Branch_4_2/system/src/bin/run.bat
===================================================================
--- branches/Branch_4_2/system/src/bin/run.bat	2007-02-13 12:32:03 UTC (rev 60502)
+++ branches/Branch_4_2/system/src/bin/run.bat	2007-02-13 13:09:09 UTC (rev 60503)
@@ -50,23 +50,20 @@
 set JAVA=%JAVA_HOME%\bin\java
 
 if exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS
-echo Could not locate %JAVA_HOME%\lib\tools.jar. Unexpected results may occur.
-echo Make sure that JAVA_HOME points to a JDK and not a JRE.
+rem tools coud be used to replace the JDT Compiler for Jasper.
+rem javassist has its own internal compiler.
+set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
 
 :SKIP_TOOLS
 
-rem Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
-rem compatible distribution to which JAVA_HOME points
-
-set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
-
-rem If JBOSS_CLASSPATH is empty, don't include it, as this will 
+rem If JBOSS_CLASSPATH/JAVAC_JAR is empty, don't include it, as this will 
 rem result in including the local directory, which makes error tracking
 rem harder.
+if "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
 if "%JBOSS_CLASSPATH%" == "" (
-	set JBOSS_CLASSPATH=%JAVAC_JAR%;%RUNJAR%
+	set JBOSS_CLASSPATH=%RUNJAR%
 ) else (
-	set JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%JAVAC_JAR%;%RUNJAR%
+	set JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%
 )
 
 rem Setup JBoss specific properties

Modified: branches/Branch_4_2/system/src/bin/run.sh
===================================================================
--- branches/Branch_4_2/system/src/bin/run.sh	2007-02-13 12:32:03 UTC (rev 60502)
+++ branches/Branch_4_2/system/src/bin/run.sh	2007-02-13 13:09:09 UTC (rev 60503)
@@ -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"`