hgomez 2003/10/13 02:45:41
Modified: src/shell tomcat.sh tomcat.bat
Log:
Add use of endorsed lib in run scripts
Revision Changes Path
1.38 +14 -11 jakarta-tomcat/src/shell/tomcat.sh
Index: tomcat.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- tomcat.sh 6 Mar 2003 16:30:45 -0000 1.37
+++ tomcat.sh 13 Oct 2003 09:45:41 -0000 1.38
@@ -47,6 +47,9 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
+# Set the default -Djava.endorsed.dirs argument
+JAVA_ENDORSED_DIRS="$TOMCAT_HOME"/lib/endorsed
+
# Read local properties
if [ -f $HOME/.tomcatrc ] ; then
. $HOME/.tomcatrc
@@ -209,7 +212,7 @@
if [ "$1" = "-noout" ] ; then
shift
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@
>${TOMCAT_HOME}/logs/stdout.log 2>&1 &
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ >${TOMCAT_HOME}/logs/stdout.log 2>&1 &
if [ ! -z "$TOMCAT_PID" ]; then
echo $! > $TOMCAT_PID
@@ -219,7 +222,7 @@
echo Using classpath: ${CLASSPATH}
echo Using JAVA_HOME: ${JAVA_HOME}
echo Using TOMCAT_HOME: ${TOMCAT_HOME}
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ &
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ &
if [ ! -z "$TOMCAT_PID" ]; then
echo $! > $TOMCAT_PID
@@ -248,7 +251,7 @@
echo Using classpath: ${CLASSPATH}
echo Using JAVA_HOME: ${JAVA_HOME}
echo Using TOMCAT_HOME: ${TOMCAT_HOME}
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN stop $@
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN stop $@
if [ "$1" = "-force" ] ; then
shift
@@ -260,26 +263,26 @@
shift
# Backward compat
if [ "$1" = "enableAdmin" ] ; then
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin
$@
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin $@
elif [ "$1" = "-enableAdmin" ] ; then
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin
$@
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin $@
else
echo Using classpath: ${CLASSPATH}
echo Using JAVA_HOME: ${JAVA_HOME}
echo Using TOMCAT_HOME: ${TOMCAT_HOME}
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN start $@
fi
elif [ "$1" = "enableAdmin" ] ; then
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin $@
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin $@
elif [ "$1" = "estart" ] ; then
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN estart $@
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN estart $@
elif [ "$1" = "jspc" ] ; then
shift
- $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN jspc $@
+ $JAVACMD $JAVA_OPTS $TOMCAT_OPTS -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS"
-Dtomcat.home=${TOMCAT_HOME} $MAIN jspc $@
elif [ "$1" = "jspcOrig" ] ; then
shift
@@ -297,7 +300,7 @@
if [ "$oldCP" != "" ]; then
CLASSPATH=${CLASSPATH}:${oldCP}
fi
- (cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS -Dtomcat.home=${TOMCAT_HOME}
org.apache.jasper.JspC $@ )
+ (cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -Dtomcat.home=${TOMCAT_HOME}
org.apache.jasper.JspC $@ )
elif [ "$1" = "env" ] ; then
## Call it with source tomcat to set the env for tomcat
1.49 +12 -9 jakarta-tomcat/src/shell/tomcat.bat
Index: tomcat.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- tomcat.bat 27 Sep 2002 01:47:23 -0000 1.48
+++ tomcat.bat 13 Oct 2003 09:45:41 -0000 1.49
@@ -68,6 +68,9 @@
goto cleanup
:okTcHome
+rem Set the default -Djava.endorsed.dirs argument
+set JAVA_ENDORSED_DIRS=%TOMCAT_HOME%\lib\endorsed
+
if not "%TOMCAT_INSTALL%" == "" goto gotTcInstall
set TOMCAT_INSTALL=.
if exist "%TOMCAT_INSTALL%\lib\tomcat.jar" goto okTcInstall
@@ -134,12 +137,12 @@
if "%2" == "sandbox" goto startSecure
if "%2" == "-sandbox" goto startSecure
rem Note: Specify tomcat.policy in case -sandbox isn't the second argument
-%_STARTJAVA% %TOMCAT_OPTS%
-Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy"
-Dtomcat.home="%TOMCAT_HOME%" %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9
+%_STARTJAVA% %TOMCAT_OPTS%
-Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy"
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Dtomcat.home="%TOMCAT_HOME%" %_MAIN%
start %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:startSecure
echo Starting Tomcat with a SecurityManager
-%_SECSTARTJAVA% %TOMCAT_OPTS%
-Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy"
-Dtomcat.home="%TOMCAT_HOME%" %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9
+%_SECSTARTJAVA% %TOMCAT_OPTS%
-Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy"
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Dtomcat.home="%TOMCAT_HOME%" %_MAIN%
start %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:runServer
@@ -147,31 +150,31 @@
if "%2" == "enableAdmin" goto oldEnbAdmin
if "%2" == "-enableAdmin" goto oldEnbAdmin
rem Running Tomcat in this window
-%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy"
-Dtomcat.home="%TOMCAT_HOME%" %_MAIN% start %2 %3 %4 %5 %6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -Djava.security.policy=="%TOMCAT_HOME%/conf/tomcat.policy"
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Dtomcat.home="%TOMCAT_HOME%" %_MAIN%
start %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:enableAdmin
rem Run enableAdmin
-%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" %_MAIN% enableAdmin %2 %3 %4
%5 %6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%"
-Dtomcat.home="%TOMCAT_HOME%" %_MAIN% enableAdmin %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:oldEnbAdmin
rem Run enableAdmin
-%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" %_MAIN% enableAdmin %3 %4 %5
%6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%"
-Dtomcat.home="%TOMCAT_HOME%" %_MAIN% enableAdmin %3 %4 %5 %6 %7 %8 %9
goto cleanup
:estart
-%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" %_MAIN% estart %2 %3 %4 %5
%6 %7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%"
-Dtomcat.home="%TOMCAT_HOME%" %_MAIN% estart %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:stopServer
rem Stopping the Tomcat Server
-%_RUNJAVA% %TOMCAT_OPTS% -Dtomcat.home="%TOMCAT_HOME%" %_MAIN% stop %2 %3 %4 %5 %6
%7 %8 %9
+%_RUNJAVA% %TOMCAT_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%"
-Dtomcat.home="%TOMCAT_HOME%" %_MAIN% stop %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:runJspc
rem Run JSPC in Tomcat's Environment
-%_RUNJAVA% %JSPC_OPTS% -Dtomcat.home="%TOMCAT_HOME%" %_MAIN% jspc %2 %3 %4 %5 %6 %7
%8 %9
+%_RUNJAVA% %JSPC_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%"
-Dtomcat.home="%TOMCAT_HOME%" %_MAIN% jspc %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
rem ----- Set CLASSPATH to Tomcat's Runtime Environment -----------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
