Attachment #23627 for bug #37922




if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
  . "$CATALINA_HOME"/bin/setenv.sh
fi
source /etc/conf.d/tomcat

# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin; then

elif [ "$1" = "start" ] ; then

  shift
  touch "$CATALINA_OUT"
  if [ "$1" = "-security" ] ; then
    echo "Using Security Manager"
    shift

      -Dcatalina.home="$CATALINA_HOME" \
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
      org.apache.catalina.startup.Bootstrap "$@" start \
      >> "$CATALINA_OUT" 2>&1 &

      if [ ! -z "$CATALINA_PID" ]; then
        echo $! > $CATALINA_PID

      -Dcatalina.home="$CATALINA_HOME" \
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
      org.apache.catalina.startup.Bootstrap "$@" start \
      >> "$CATALINA_OUT" 2>&1 &

      if [ ! -z "$CATALINA_PID" ]; then
        echo $! > $CATALINA_PID
        

Lines 29-35 Link Here

(-)./bin/setclasspath.sh (-1 / +1 lines)
29	fi	29	fi
30		30
31	# Set the default -Djava.endorsed.dirs argument	31	# Set the default -Djava.endorsed.dirs argument
32	JAVA_ENDORSED_DIRS="$BASEDIR"/common/endorsed	32	JAVA_ENDORSED_DIRS="$TOMCAT_LIBDIR"
33		33
34	# Set standard CLASSPATH	34	# Set standard CLASSPATH
35	CLASSPATH="$JAVA_HOME"/lib/tools.jar	35	CLASSPATH="$JAVA_HOME"/lib/tools.jar

Return to bug 37922

Lines 65-70 Link Here

(-)./bin/catalina.sh (-3 / +4 lines)
65	if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then	65	if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
66	. "$CATALINA_HOME"/bin/setenv.sh	66	. "$CATALINA_HOME"/bin/setenv.sh
67	fi	67	fi
		68	source /etc/conf.d/tomcat
68		69
69	# For Cygwin, ensure paths are in UNIX format before anything is touched	70	# For Cygwin, ensure paths are in UNIX format before anything is touched
70	if $cygwin; then	71	if $cygwin; then
Lines 199-205 Link Here
199	elif [ "$1" = "start" ] ; then	200	elif [ "$1" = "start" ] ; then
200		201
201	shift	202	shift
202	touch "$CATALINA_BASE"/logs/catalina.out	203	touch "$CATALINA_OUT"
203	if [ "$1" = "-security" ] ; then	204	if [ "$1" = "-security" ] ; then
204	echo "Using Security Manager"	205	echo "Using Security Manager"
205	shift	206	shift
Lines 211-217 Link Here
211	-Dcatalina.home="$CATALINA_HOME" \	212	-Dcatalina.home="$CATALINA_HOME" \
212	-Djava.io.tmpdir="$CATALINA_TMPDIR" \	213	-Djava.io.tmpdir="$CATALINA_TMPDIR" \
213	org.apache.catalina.startup.Bootstrap "$@" start \	214	org.apache.catalina.startup.Bootstrap "$@" start \
214	>> "$CATALINA_BASE"/logs/catalina.out 2>&1 &	215	>> "$CATALINA_OUT" 2>&1 &
215		216
216	if [ ! -z "$CATALINA_PID" ]; then	217	if [ ! -z "$CATALINA_PID" ]; then
217	echo $! > $CATALINA_PID	218	echo $! > $CATALINA_PID
Lines 223-229 Link Here
223	-Dcatalina.home="$CATALINA_HOME" \	224	-Dcatalina.home="$CATALINA_HOME" \
224	-Djava.io.tmpdir="$CATALINA_TMPDIR" \	225	-Djava.io.tmpdir="$CATALINA_TMPDIR" \
225	org.apache.catalina.startup.Bootstrap "$@" start \	226	org.apache.catalina.startup.Bootstrap "$@" start \
226	>> "$CATALINA_BASE"/logs/catalina.out 2>&1 &	227	>> "$CATALINA_OUT" 2>&1 &
227		228
228	if [ ! -z "$CATALINA_PID" ]; then	229	if [ ! -z "$CATALINA_PID" ]; then
229	echo $! > $CATALINA_PID	230	echo $! > $CATALINA_PID
230		231