[jboss-cvs] JBossAS SVN: r60997 - trunk/system/src/bin.

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

Author: dimitris at jboss.org
Date: 2007-02-28 08:44:36 -0500 (Wed, 28 Feb 2007)
New Revision: 60997

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

Modified: trunk/system/src/bin/run.bat
===================================================================
--- trunk/system/src/bin/run.bat	2007-02-28 13:44:01 UTC (rev 60996)
+++ trunk/system/src/bin/run.bat	2007-02-28 13:44:36 UTC (rev 60997)
@@ -57,22 +57,23 @@
 
 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 A full JDK with toos.jar is not required anymore since jboss web packages
+rem the eclipse jdt compiler and javassist has its own internal compiler.
+if not exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS
 
+rem If exists, point to the JDK javac compiler in case the user wants to
+rem later override the eclipse jdt compiler for compiling JSP pages.
+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
+rem If JBOSS_CLASSPATH or JAVAC_JAR is empty, don't include it, as this will 
+rem result in including the local directory in the classpath, which makes
+rem error tracking harder.
+if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
+if "%JBOSS_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
+if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%
 
-set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
-
-rem If JBOSS_CLASSPATH is empty, don't include it, as this will 
-rem result in including the local directory, which makes error tracking
-rem harder.
-if "%JBOSS_CLASSPATH%" == "" set RUN_CLASSPATH=%JAVAC_JAR%;%RUNJAR%
-if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%JBOSS_CLASSPATH%;%JAVAC_JAR%;%RUNJAR%
 set JBOSS_CLASSPATH=%RUN_CLASSPATH%
 
 rem Setup JBoss specific properties