[jetty9] 55/99: Removed trailing spaces in debian/jetty8.init
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Fri Oct 9 21:20:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository jetty9.
commit b45a4dc0f7278b836df74bfc9ee0a8203d3b1b24
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jul 29 18:00:57 2014 +0200
Removed trailing spaces in debian/jetty8.init
---
debian/jetty8.init | 62 +++++++++++++++++++++++++++---------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/debian/jetty8.init b/debian/jetty8.init
index b8483f5..0e45946 100644
--- a/debian/jetty8.init
+++ b/debian/jetty8.init
@@ -21,14 +21,14 @@
# Configuration files
#
# /etc/default/jetty8
-# If it exists, this is read at the start of script. It may perform any
+# If it exists, this is read at the start of script. It may perform any
# sequence of shell commands, like setting relevant environment variables.
#
# /etc/jetty8/jetty.conf
-# If found, the file will be used as this script's configuration.
+# If found, the file will be used as this script's configuration.
# Each line in the file may contain:
# - A comment denoted by the pound (#) sign as first non-blank character.
-# - The path to a regular file, which will be passed to jetty as a
+# - The path to a regular file, which will be passed to jetty as a
# config.xml file.
# - The path to a directory. Each *.xml file in the directory will be
# passed to jetty as a config.xml file.
@@ -38,20 +38,20 @@
# /etc/jetty8/jetty.xml
# If found, used as this script's configuration file, but only if
# /etc/jetty8/jetty.conf was not present. See above.
-#
+#
# Configuration variables (to define in /etc/default/jetty8)
#
-# JAVA_HOME
-# Home of Java installation.
+# JAVA_HOME
+# Home of Java installation.
#
# JAVA_OPTIONS
# Extra options to pass to the JVM
#
# JETTY_PORT
# Override the default port for Jetty servers. If not set then 8080
-# will be used. The java system property "jetty.port" will be set to
-# this value for use in configure.xml files. For example, the following
-# idiom is widely used in the demo config files to respect this property
+# will be used. The java system property "jetty.port" will be set to
+# this value for use in configure.xml files. For example, the following
+# idiom is widely used in the demo config files to respect this property
# in Listener configuration elements:
#
# <Set name="Port"><SystemProperty name="jetty.port" default="8080"/></Set>
@@ -97,7 +97,7 @@ NO_START=0
# Run Jetty as this user ID (default: jetty)
# Set this to an empty string to prevent Jetty from starting automatically
JETTY_USER=jetty
-
+
# Listen to connections from this network host (leave empty to accept all connections)
#JETTY_HOST=$(uname -n)
JETTY_HOST=
@@ -105,15 +105,15 @@ JETTY_HOST=
# The network port used by Jetty
JETTY_PORT=8080
-# Additional arguments to pass to Jetty
+# Additional arguments to pass to Jetty
JETTY_ARGS=
-# Extra options to pass to the JVM
+# Extra options to pass to the JVM
# Set java.awt.headless=true if JAVA_OPTIONS is not set so the
# Xalan XSL transformer can work without X11 display on JDK 1.4+
# It also sets the maximum heap size to 256M to deal with most cases.
JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true"
-
+
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in /etc/default/jetty). Should contain a list of space separated directories.
JDK_DIRS="
@@ -141,7 +141,7 @@ JETTY_TMP=/var/cache/jetty8/data
JETTY_START_CONFIG=/etc/jetty8/start.config
# End of variables that can be overwritten in /etc/default/jetty
-
+
# overwrite settings from default file
if [ -f "$DEFAULT" ]; then
. "$DEFAULT"
@@ -155,7 +155,7 @@ if [ ! -r "$START_JAR" ]; then
fi
# Check whether startup has been disabled
-if [ "$NO_START" != "0" -a "$1" != "stop" ]; then
+if [ "$NO_START" != "0" -a "$1" != "stop" ]; then
[ "$VERBOSE" != "no" ] && log_failure_msg "Not starting jetty - edit /etc/default/jetty8 and change NO_START to be 0 (or comment it out)."
exit 0
fi
@@ -187,7 +187,7 @@ if [ -n "$JSP_COMPILER" ]; then
fi
export JAVA_OPTIONS
-
+
# Define other required variables
PIDFILE="/var/run/$NAME.pid"
WEBAPPDIR="$JETTY_HOME/webapps"
@@ -213,34 +213,34 @@ CONFIG_LINES=$(cat /etc/jetty8/jetty.conf | grep -v "^[[:space:]]*#" | tr "\n" "
##################################################
# Get the list of config.xml files from jetty.conf
##################################################
-if [ ! -z "${CONFIG_LINES}" ]
+if [ ! -z "${CONFIG_LINES}" ]
then
- for CONF in ${CONFIG_LINES}
+ for CONF in ${CONFIG_LINES}
do
- if [ ! -r "$CONF" ]
+ if [ ! -r "$CONF" ]
then
- log_warning_msg "WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'"
- elif [ -f "$CONF" ]
+ log_warning_msg "WARNING: Cannot read '$CONF' specified in '$JETTY_CONF'"
+ elif [ -f "$CONF" ]
then
# assume it's a configure.xml file
- CONFIGS="$CONFIGS $CONF"
- elif [ -d "$CONF" ]
+ CONFIGS="$CONFIGS $CONF"
+ elif [ -d "$CONF" ]
then
# assume it's a directory with configure.xml files
# for example: /etc/jetty.d/
# sort the files before adding them to the list of CONFIGS
- XML_FILES=`ls ${CONF}/*.xml | sort | tr "\n" " "`
- for FILE in ${XML_FILES}
+ XML_FILES=`ls ${CONF}/*.xml | sort | tr "\n" " "`
+ for FILE in ${XML_FILES}
do
- if [ -r "$FILE" ] && [ -f "$FILE" ]
+ if [ -r "$FILE" ] && [ -f "$FILE" ]
then
- CONFIGS="$CONFIGS $FILE"
+ CONFIGS="$CONFIGS $FILE"
else
- log_warning_msg "WARNING: Cannot read '$FILE' specified in '$JETTY_CONF'"
+ log_warning_msg "WARNING: Cannot read '$FILE' specified in '$JETTY_CONF'"
fi
done
else
- log_warning_msg "WARNING: Don''t know what to do with '$CONF' specified in '$JETTY_CONF'"
+ log_warning_msg "WARNING: Don''t know what to do with '$CONF' specified in '$JETTY_CONF'"
fi
done
fi
@@ -260,7 +260,7 @@ case "$1" in
start)
log_daemon_msg "Starting $DESC." "$NAME"
if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
- --user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
+ --user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
if [ -f $PIDFILE ] ; then
log_warning_msg "$PIDFILE exists, but jetty was not running. Ignoring $PIDFILE"
@@ -328,7 +328,7 @@ case "$1" in
--startas "$JAVA" > /dev/null
while ! start-stop-daemon --quiet --test --start \
--pidfile "$PIDFILE" --user "$JETTY_USER" \
- --startas "$JAVA" > /dev/null; do
+ --startas "$JAVA" > /dev/null; do
sleep 1
log_progress_msg "."
JETTY_SHUTDOWN=`expr $JETTY_SHUTDOWN - 1` || true
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git
More information about the pkg-java-commits
mailing list