Attachment #33883 for bug #58626

View | Details | Raw Unified | Return to bug 58626
Collapse All | Expand All




#                   LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
#
#   UMASK           (Optional) Override Tomcat's default UMASK of 0027
#
#   USE_NOHUP       (Optional) If set to the string true the start command will
#                   use nohup so that the Tomcat process will ignore any hangup
#                   signals. Default is "false" unless running on HP-UX in which
#                   case the default is "true"
# -----------------------------------------------------------------------------

# OS specific support.  $var _must_ be set to either true or false.

cygwin=false
darwin=false
os400=false
hpux=false
case "`uname`" in
CYGWIN*) cygwin=true;;
Darwin*) darwin=true;;
OS400*) os400=true;;
HP-UX*) hpux=true;;
esac

# resolve links - $0 may be a softlink

# org.apache.catalina.security.SecurityListener
#JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`"

if [ -z "$USE_NOHUP" ]; then
    if $hpux; then
        USE_NOHUP="true"
    else
        USE_NOHUP="false"
    fi
fi
if [ "$USE_NOHUP" = "true"   ]; then
    _NOHUP=nohup
fi

# ----- Execute The Requested Command -----------------------------------------

# Bugzilla 37848: only output this if we have a TTY

      echo "Using Security Manager"
    fi
    shift
    eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
      -classpath "\"$CLASSPATH\"" \
      -Djava.security.manager \
      -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \

      >> "$CATALINA_OUT" 2>&1 "&"

  else
    eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
      -classpath "\"$CLASSPATH\"" \
      -Dcatalina.base="\"$CATALINA_BASE\"" \
      -Dcatalina.home="\"$CATALINA_HOME\"" \

Return to bug 58626

Lines 93-98 Link Here

(-)bin/catalina.sh (-2 / +20 lines)
93	# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"	93	# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
94	#	94	#
95	# UMASK (Optional) Override Tomcat's default UMASK of 0027	95	# UMASK (Optional) Override Tomcat's default UMASK of 0027
		96	#
		97	# USE_NOHUP (Optional) If set to the string true the start command will
		98	# use nohup so that the Tomcat process will ignore any hangup
		99	# signals. Default is "false" unless running on HP-UX in which
		100	# case the default is "true"
96	# -----------------------------------------------------------------------------	101	# -----------------------------------------------------------------------------
97		102
98	# OS specific support. $var _must_ be set to either true or false.	103	# OS specific support. $var _must_ be set to either true or false.
Lines 99-108 Link Here
99	cygwin=false	104	cygwin=false
100	darwin=false	105	darwin=false
101	os400=false	106	os400=false
		107	hpux=false
102	case "`uname`" in	108	case "`uname`" in
103	CYGWIN*) cygwin=true;;	109	CYGWIN*) cygwin=true;;
104	Darwin*) darwin=true;;	110	Darwin*) darwin=true;;
105	OS400*) os400=true;;	111	OS400*) os400=true;;
		112	HP-UX*) hpux=true;;
106	esac	113	esac
107		114
108	# resolve links - $0 may be a softlink	115	# resolve links - $0 may be a softlink
Lines 257-262 Link Here
257	# org.apache.catalina.security.SecurityListener	264	# org.apache.catalina.security.SecurityListener
258	#JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`"	265	#JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`"
259		266
		267	if [ -z "$USE_NOHUP" ]; then
		268	if $hpux; then
		269	USE_NOHUP="true"
		270	else
		271	USE_NOHUP="false"
		272	fi
		273	fi
		274	if [ "$USE_NOHUP" = "true" ]; then
		275	_NOHUP=nohup
		276	fi
		277
260	# ----- Execute The Requested Command -----------------------------------------	278	# ----- Execute The Requested Command -----------------------------------------
261		279
262	# Bugzilla 37848: only output this if we have a TTY	280	# Bugzilla 37848: only output this if we have a TTY
Lines 397-403 Link Here
397	echo "Using Security Manager"	415	echo "Using Security Manager"
398	fi	416	fi
399	shift	417	shift
400	eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \	418	eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
401	-classpath "\"$CLASSPATH\"" \	419	-classpath "\"$CLASSPATH\"" \
402	-Djava.security.manager \	420	-Djava.security.manager \
403	-Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \	421	-Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \
Lines 408-414 Link Here
408	>> "$CATALINA_OUT" 2>&1 "&"	426	>> "$CATALINA_OUT" 2>&1 "&"
409		427
410	else	428	else
411	eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \	429	eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
412	-classpath "\"$CLASSPATH\"" \	430	-classpath "\"$CLASSPATH\"" \
413	-Dcatalina.base="\"$CATALINA_BASE\"" \	431	-Dcatalina.base="\"$CATALINA_BASE\"" \
414	-Dcatalina.home="\"$CATALINA_HOME\"" \	432	-Dcatalina.home="\"$CATALINA_HOME\"" \