[75202] trunk/dports/java/tomcat6/files
blair at macports.org
blair at macports.org
Mon Jan 17 18:45:56 PST 2011
Revision: 75202
http://trac.macports.org/changeset/75202
Author: blair at macports.org
Date: 2011-01-17 18:45:49 -0800 (Mon, 17 Jan 2011)
Log Message:
-----------
Whitespace only cleanup: replace tabs with spaces, trim trailing eol
characters.
Modified Paths:
--------------
trunk/dports/java/tomcat6/files/setenv.local
trunk/dports/java/tomcat6/files/setenv.sh
trunk/dports/java/tomcat6/files/tomcat6.sh
trunk/dports/java/tomcat6/files/tomcatctl
Modified: trunk/dports/java/tomcat6/files/setenv.local
===================================================================
--- trunk/dports/java/tomcat6/files/setenv.local 2011-01-18 02:37:22 UTC (rev 75201)
+++ trunk/dports/java/tomcat6/files/setenv.local 2011-01-18 02:45:49 UTC (rev 75202)
@@ -9,4 +9,3 @@
# For Apple Java, JAVA_JVM_VERSION may be used to specify a particular
# java version to run. It should be something like 1.4, 1.5, or CurrentJDK.
#export JAVA_JVM_VERSION=1.5
-
Modified: trunk/dports/java/tomcat6/files/setenv.sh
===================================================================
--- trunk/dports/java/tomcat6/files/setenv.sh 2011-01-18 02:37:22 UTC (rev 75201)
+++ trunk/dports/java/tomcat6/files/setenv.sh 2011-01-18 02:45:49 UTC (rev 75202)
@@ -18,27 +18,27 @@
# Attempt to set JAVA_HOME if it's not already set
if [ -z "$JAVA_HOME" ]; then
-
- # Set JAVA_JVM_VERSION and JAVA_HOME for Darwin
- if [ `uname -s` = "Darwin" ]; then
-
- # Look for a java version specified by JAVA_JVM_VERSION, falling back to current version
- # Set JAVA_HOME to reflect the version
- for jversion in $JAVA_JVM_VERSION CurrentJDK ; do
- jhome="/System/Library/Frameworks/JavaVM.framework/Versions/${jversion}/Home"
- if [ -z "$JAVA_HOME" -a -d "${jhome}" ]; then
- # Get the actual version that any symlink points to, since
- # jni doesn't like JAVA_JVM_VERSION set to CurrentJDK
- saved=`pwd`
- cd "/System/Library/Frameworks/JavaVM.framework/Versions/${jversion}"
- actualvers=$(basename $(pwd -P))
- cd $saved
-
- export JAVA_JVM_VERSION=${actualvers}
- export JAVA_HOME=${jhome}
- fi
- done
-
- fi
-
+
+ # Set JAVA_JVM_VERSION and JAVA_HOME for Darwin
+ if [ `uname -s` = "Darwin" ]; then
+
+ # Look for a java version specified by JAVA_JVM_VERSION, falling back to current version
+ # Set JAVA_HOME to reflect the version
+ for jversion in $JAVA_JVM_VERSION CurrentJDK ; do
+ jhome="/System/Library/Frameworks/JavaVM.framework/Versions/${jversion}/Home"
+ if [ -z "$JAVA_HOME" -a -d "${jhome}" ]; then
+ # Get the actual version that any symlink points to, since
+ # jni doesn't like JAVA_JVM_VERSION set to CurrentJDK
+ saved=`pwd`
+ cd "/System/Library/Frameworks/JavaVM.framework/Versions/${jversion}"
+ actualvers=$(basename $(pwd -P))
+ cd $saved
+
+ export JAVA_JVM_VERSION=${actualvers}
+ export JAVA_HOME=${jhome}
+ fi
+ done
+
+ fi
+
fi
Modified: trunk/dports/java/tomcat6/files/tomcat6.sh
===================================================================
--- trunk/dports/java/tomcat6/files/tomcat6.sh 2011-01-18 02:37:22 UTC (rev 75201)
+++ trunk/dports/java/tomcat6/files/tomcat6.sh 2011-01-18 02:45:49 UTC (rev 75202)
@@ -4,14 +4,14 @@
case "$1" in
start)
- [ -x ${TOMCATCTL} ] && ${TOMCATCTL} start > /dev/null && echo -n ' tomcat6'
- ;;
+ [ -x ${TOMCATCTL} ] && ${TOMCATCTL} start >/dev/null && echo -n ' tomcat6'
+ ;;
stop)
- [ -x ${TOMCATCTL} ] && ${TOMCATCTL} stop > /dev/null && echo -n ' tomcat6'
- ;;
+ [ -x ${TOMCATCTL} ] && ${TOMCATCTL} stop >/dev/null && echo -n ' tomcat6'
+ ;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
+ echo "Usage: `basename $0` {start|stop}" >&2
+ ;;
esac
exit 0
Modified: trunk/dports/java/tomcat6/files/tomcatctl
===================================================================
--- trunk/dports/java/tomcat6/files/tomcatctl 2011-01-18 02:37:22 UTC (rev 75201)
+++ trunk/dports/java/tomcat6/files/tomcatctl 2011-01-18 02:45:49 UTC (rev 75202)
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# tomcatctl
+# tomcatctl
#
-# Tomcat control script to control tomcat running under jsvc.
+# Tomcat control script to control tomcat running under jsvc.
#
-# USAGE: tomcatctl [--jdpa] start|stop|restart|status|info
+# USAGE: tomcatctl [--jdpa] start|stop|restart|status|info
#
# To be customized by installer...
@@ -20,7 +20,7 @@
# Calculate CATALINA_HOME based on our location
if [ -z "$CATALINA_HOME" ]; then
# Handle symlinks
- PRG="$0"
+ PRG="$0"
while [ -L "$PRG" ]; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
@@ -30,7 +30,7 @@
PRG="`dirname $PRG`/$link"
fi
done
-
+
pushd "`dirname \"$PRG\"`/.." > /dev/null
CATALINA_HOME="`pwd -P`"
popd > /dev/null
@@ -47,17 +47,17 @@
. "$CATALINA_HOME/bin/setclasspath.sh"
# Set variable default values
-[ -z "$CATALINA_BASE" ] && CATALINA_BASE="${CATALINA_HOME}"
-[ -z "$CATALINA_TMPDIR" ] && CATALINA_TMPDIR="${CATALINA_BASE}/temp"
+[ -z "$CATALINA_BASE" ] && CATALINA_BASE="${CATALINA_HOME}"
+[ -z "$CATALINA_TMPDIR" ] && CATALINA_TMPDIR="${CATALINA_BASE}/temp"
-[ -z "$TOMCAT_PIDNAME" ] && TOMCAT_PIDNAME="tomcat6.pid"
-[ -z "$TOMCAT_PIDFILE" ] && TOMCAT_PIDFILE="${CATALINA_BASE}/logs/${TOMCAT_PIDNAME}"
-[ -z "$TOMCAT_USER" ] && TOMCAT_USER=tomcat
+[ -z "$TOMCAT_PIDNAME" ] && TOMCAT_PIDNAME="tomcat6.pid"
+[ -z "$TOMCAT_PIDFILE" ] && TOMCAT_PIDFILE="${CATALINA_BASE}/logs/${TOMCAT_PIDNAME}"
+[ -z "$TOMCAT_USER" ] && TOMCAT_USER=tomcat
-[ -z "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=${CATALINA_BASE}/common/endorsed
+[ -z "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=${CATALINA_BASE}/common/endorsed
-[ -z "$JPDA_TRANSPORT" ] && JPDA_TRANSPORT=dt_socket
-[ -z "$JPDA_ADDRESS" ] && JPDA_ADDRESS=8000
+[ -z "$JPDA_TRANSPORT" ] && JPDA_TRANSPORT=dt_socket
+[ -z "$JPDA_ADDRESS" ] && JPDA_ADDRESS=8000
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
@@ -78,7 +78,7 @@
PID=
RUNNING=
STATUS=
-
+
if [ -f "$TOMCAT_PIDFILE" ]; then
PID=`cat $TOMCAT_PIDFILE`
if [ -n "$PID" -a `ps $PID | $WC -l` -gt 1 ]; then
@@ -97,20 +97,20 @@
start()
{
- # Run conf_setup.sh to check and repair the conf directory
- if [ -x "$CATALINA_HOME/bin/conf_setup.sh" ]; then
- CATALINA_BASE="$CATALINA_BASE" "$CATALINA_HOME/bin/conf_setup.sh"
- fi
+ # Run conf_setup.sh to check and repair the conf directory
+ if [ -x "$CATALINA_HOME/bin/conf_setup.sh" ]; then
+ CATALINA_BASE="$CATALINA_BASE" "$CATALINA_HOME/bin/conf_setup.sh"
+ fi
printf "Starting Tomcat..."
check
-
+
if [ -n "$RUNNING" ]; then
printf "already $STATUS\n"
else
# Remove any existing pid file
rm -f "$TOMCAT_PIDFILE"
-
+
# Start Tomcat using jsvc
$JSVC_ENV $JSVC $JSVC_DEBUG $JAVA_OPTS $JPDA_OPTS \
-home "$JAVA_HOME" \
@@ -124,14 +124,14 @@
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
org.apache.catalina.startup.Bootstrap "$@" start
-
+
# Wait for it to really start
for ((CNT=0; CNT < 15; ++CNT)); do
[ -f "$TOMCAT_PIDFILE" ] && break
printf "."
sleep 1
done
-
+
# Let 'em know what happened
check
if [ -n "$RUNNING" ]; then
@@ -147,22 +147,22 @@
{
printf "Stopping Tomcat..."
check
-
+
if [ -z "$RUNNING" ]; then
printf "already $STATUS\n"
else
printf "(pid $PID)"
-
+
# Stop Tomcat
kill $PID
-
+
# Wait for it to really stop
for ((CNT=0; CNT < 15; ++CNT)); do
[ -f "$TOMCAT_PIDFILE" ] || break
printf "."
sleep 1
done
-
+
# Let 'em know what happened
check
if [ -z "$RUNNING" ]; then
@@ -176,39 +176,39 @@
# Ensure at least one parameter
if [ $# -lt 1 ]; then
- usage
- exit 1
+ usage
+ exit 1
fi
# Parameter Handling
while [ $# -gt 0 ]; do
- case "$1" in
- --jpda)
- [ -z "$JPDA_OPTS" ] && JPDA_OPTS="-Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n"
- ;;
-
- start)
- start
- ;;
-
- stop)
- stop
- ;;
-
- restart)
- stop
- start
- ;;
-
- status)
- check
- printf "Tomcat is $STATUS\n"
- ;;
-
- info)
- check
- cat <<EOT
-
+ case "$1" in
+ --jpda)
+ [ -z "$JPDA_OPTS" ] && JPDA_OPTS="-Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n"
+ ;;
+
+ start)
+ start
+ ;;
+
+ stop)
+ stop
+ ;;
+
+ restart)
+ stop
+ start
+ ;;
+
+ status)
+ check
+ printf "Tomcat is $STATUS\n"
+ ;;
+
+ info)
+ check
+ cat <<EOT
+
Tomcat is $STATUS
CATALINA_HOME $CATALINA_HOME
@@ -220,16 +220,14 @@
JAVA_OPTS $JAVA_OPTS
JPDA_OPTS $JPDA_OPTS
EOT
- ;;
-
- *)
- printf "$0: unrecognized option '$1'\n"
- usage
- exit 1
- ;;
- esac
-
- shift
-done
+ ;;
+ *)
+ printf "$0: unrecognized option '$1'\n"
+ usage
+ exit 1
+ ;;
+ esac
+ shift
+done
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110117/2d0a135c/attachment-0001.html>
More information about the macports-changes
mailing list