User: sylvain
Date: 00/07/05 16:20:43
Modified: src/bin run.bat run.sh
Log:
Removed automatic starting of Tomcat.
if a user wants to start Tomcat, he will have to add the MLET to jBoss.conf
Help will be available on www.jboss.org
Revision Changes Path
1.5 +0 -4 jboss/src/bin/run.bat
Index: run.bat
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/bin/run.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- run.bat 2000/06/20 03:30:30 1.4
+++ run.bat 2000/07/05 23:20:42 1.5
@@ -5,10 +5,6 @@
set CLASSPATH=%CLASSPATH%;run.jar
if not "%TOMCAT_HOME%" == "" if not "%SERVLETAPI_HOME%" == "" goto gotTomcatHome
-echo WARNING
-echo If you want to run jBoss with Tomcat integrated,
-echo set the TOMCAT_HOME environment variable to point to the root dir of Tomcat
-echo Set the env variable SERVLET_API to the directory 'jakarta-servletapi' (CVS
checkout of Tomcat's modules)
goto startJBoss
:gotTomcatHome
1.4 +1 -5 jboss/src/bin/run.sh
Index: run.sh
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/bin/run.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- run.sh 2000/06/23 17:17:55 1.3
+++ run.sh 2000/07/05 23:20:42 1.4
@@ -1,10 +1,6 @@
ps auxww | grep run.jar | grep -v grep | head -1 | awk " { split(\$0,bob,\" \*\");
print \"kill -9 \", bob[2] }" | sh
-if [ ! -d "$TOMCAT_HOME" -o ! -d "$SERVLETAPI_HOME" ] ; then
- echo In order to launch Tomcat with jBoss, you must set the
- echo environment variables TOMCAT_HOME and SERVLETAPI_HOME
-
-else
+if [ -d "$TOMCAT_HOME" -a -d "$SERVLETAPI_HOME" ] ; then
CLASSPATH=$CLASSPATH:$TOMCAT_HOME/classes
CLASSPATH=$CLASSPATH:$SERVLETAPI_HOME/lib/servlet.jar
fi