cvs commit: jakarta-tomcat-catalina/catalina/src/bin setclasspath.bat setclasspath.sh
markt 2004/02/12 13:38:56 Modified:catalina/src/bin setclasspath.bat setclasspath.sh Log: Fix bug 14246. Make clear in error message that JDK is required. Reported by Eric Bloch. Ported from TC4. Revision ChangesPath 1.6 +2 -1 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat Index: setclasspath.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- setclasspath.bat 24 Oct 2003 07:55:41 - 1.5 +++ setclasspath.bat 12 Feb 2004 21:38:56 - 1.6 @@ -18,6 +18,7 @@ :noJavaHome echo The JAVA_HOME environment variable is not defined correctly echo This environment variable is needed to run this program +echo NB: JAVA_HOME should point to a JDK not a JRE goto exit :okJavaHome 1.7 +2 -1 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh Index: setclasspath.sh === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- setclasspath.sh 18 Sep 2003 21:04:51 - 1.6 +++ setclasspath.sh 12 Feb 2004 21:38:56 - 1.7 @@ -20,6 +20,7 @@ if [ ! -r $JAVA_HOME/bin/java -o ! -r $JAVA_HOME/bin/jdb -o ! -r $JAVA_HOME/bin/javac ]; then echo The JAVA_HOME environment variable is not defined correctly echo This environment variable is needed to run this program +echo NB: JAVA_HOME should point to a JDK not a JRE exit 1 fi fi - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/bin setclasspath.bat
remm2003/10/24 00:55:41 Modified:catalina/src/bin setclasspath.bat Log: - Improve setclasspath according to bug 23608. - Submitted by Adam Hardy. Revision ChangesPath 1.5 +10 -5 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat Index: setclasspath.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- setclasspath.bat 17 Jan 2003 10:05:40 - 1.4 +++ setclasspath.bat 24 Oct 2003 07:55:41 - 1.5 @@ -8,7 +8,7 @@ if not %JAVA_HOME% == goto gotJavaHome echo The JAVA_HOME environment variable is not defined echo This environment variable is needed to run this program -goto end +goto exit :gotJavaHome if not exist %JAVA_HOME%\bin\java.exe goto noJavaHome if not exist %JAVA_HOME%\bin\javaw.exe goto noJavaHome @@ -18,18 +18,18 @@ :noJavaHome echo The JAVA_HOME environment variable is not defined correctly echo This environment variable is needed to run this program -goto end +goto exit :okJavaHome if not %BASEDIR% == goto gotBasedir echo The BASEDIR environment variable is not defined echo This environment variable is needed to run this program -goto end +goto exit :gotBasedir if exist %BASEDIR%\bin\setclasspath.bat goto okBasedir echo The BASEDIR environment variable is not defined correctly echo This environment variable is needed to run this program -goto end +goto exit :okBasedir rem Set the default -Djava.endorsed.dirs argument @@ -47,5 +47,10 @@ set _RUNJAVAW=%JAVA_HOME%\bin\javaw set _RUNJDB=%JAVA_HOME%\bin\jdb set _RUNJAVAC=%JAVA_HOME%\bin\javac + +goto end + +:exit +exit :end - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/bin setclasspath.bat
[EMAIL PROTECTED] wrote: remm2003/10/24 00:55:41 Modified:catalina/src/bin setclasspath.bat Log: - Improve setclasspath according to bug 23608. - Submitted by Adam Hardy. Actually, this is bug 23953, submitted by Jacek Laskowski. Sorry for the trouble. Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/bin setclasspath.bat setclasspath.sh
remm2003/01/17 02:05:40 Modified:catalina/src/bin setclasspath.bat setclasspath.sh Log: - The main problem with all the CL failures (including the one I reported a couple of hours ago), was that bin was added as endorsed. While it is ok to do so with bootstrap and the laucher, tomcat-jni.jar was the one causing the problems, as its manifest include a lot of other JARs, which will end up in the system CL (which is wrong). - Instead, bootstrap will be added to the system CL by the startup script, and its manifest will add the laucher. - This should also fix all the CL problems which were reported with commons-logging. - If there was a reason why bin was endorsed, this could be reverted but tomcat-jni.jar has to be moved somewhere else. Revision ChangesPath 1.4 +2 -2 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat Index: setclasspath.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- setclasspath.bat 4 Aug 2002 18:19:43 - 1.3 +++ setclasspath.bat 17 Jan 2003 10:05:40 - 1.4 @@ -33,7 +33,7 @@ :okBasedir rem Set the default -Djava.endorsed.dirs argument -set JAVA_ENDORSED_DIRS=%BASEDIR%\bin;%BASEDIR%\common\endorsed +set JAVA_ENDORSED_DIRS=%BASEDIR%\common\endorsed rem Set standard CLASSPATH rem Note that there are no quotes as we do not want to introduce random 1.4 +2 -2 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh Index: setclasspath.sh === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- setclasspath.sh 4 Aug 2002 18:19:43 - 1.3 +++ setclasspath.sh 17 Jan 2003 10:05:40 - 1.4 @@ -27,7 +27,7 @@ fi # Set the default -Djava.endorsed.dirs argument -JAVA_ENDORSED_DIRS=$BASEDIR/bin:$BASEDIR/common/endorsed +JAVA_ENDORSED_DIRS=$BASEDIR/common/endorsed # Set standard CLASSPATH CLASSPATH=$JAVA_HOME/lib/tools.jar -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
