You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by so...@apache.org on 2007/10/29 17:52:10 UTC
svn commit: r589735 - /lenya/branches/BRANCH_1_2_X/lenya.sh
Author: solprovider
Date: Mon Oct 29 09:52:09 2007
New Revision: 589735
URL: http://svn.apache.org/viewvc?rev=589735&view=rev
Log:
Modified lenya.sh to allow multiple instances of Lenya and add stop command. Stops this instance before start attempts. Reduced dependence on environment variables: LENYA_HOME is set to current directory, and JETTY_PORT is set here.
Modified:
lenya/branches/BRANCH_1_2_X/lenya.sh
Modified: lenya/branches/BRANCH_1_2_X/lenya.sh
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/lenya.sh?rev=589735&r1=589734&r2=589735&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/lenya.sh (original)
+++ lenya/branches/BRANCH_1_2_X/lenya.sh Mon Oct 29 09:52:09 2007
@@ -22,7 +22,8 @@
# -----------------------------------------------------------------------------
# Configuration variables
-#
+JETTY_PORT="8888"
+
# LENYA_HOME
# The root of the Lenya distribution
#
@@ -61,6 +62,7 @@
echo " servlet-admin Run Lenya in a servlet container and turn on container web administration"
echo " servlet-debug Run Lenya in a servlet container and turn on JVM remote debug"
echo " servlet-profile Run Lenya in a servlet container and turn on JVM profiling"
+ echo " stop Stop Lenya in a servlet container"
exit 1
}
@@ -88,9 +90,11 @@
JAVA_OPTIONS='-Xms32M -Xmx512M'
fi
-if [ "$LENYA_HOME" = "" ] ; then
- LENYA_HOME='.'
-fi
+# Set Lenya home to directory containing this script
+ENDSLASH=`expr match "$0" '.*/'`
+LENYA_HOME=`expr substr "$0" 1 $ENDSLASH`
+cd $LENYA_HOME
+LENYA_HOME=`pwd -P`
if [ "$LENYA_WEBAPP_HOME" = "" ] ; then
STANDALONE_WEBAPP=../webapp
@@ -154,6 +158,22 @@
JETTY_ADMIN_ARGS="-Djetty.admin.port=$JETTY_ADMIN_PORT"
JETTY_LIBRARIES="-Dloader.jar.repositories=$LENYA_HOME/tools/jetty/lib${PATHSEP}${ENDORSED_LIBS}"
+# ---- Stop Lenya -------------------------------------------------------------
+ if [ -f $LENYA_HOME/lenya.pid ] ; then
+ echo -n $"Stopping $prog: "
+ kill -9 `cat lenya.pid`
+ rm -f $LENYA_HOME/lenya.pid
+ if [ "stop" = $ACTION ]; then
+ exit 0
+ fi
+ sleep 10
+ else
+ if [ "stop" = $ACTION ]; then
+ echo "Cannot stop Lenya. No lenya.pid."
+ exit 1
+ fi
+ fi
+
# ----- Do the action ----------------------------------------------------------
if [ -d build ]; then
@@ -177,22 +197,26 @@
case "$ACTION" in
cli)
$JAVA $JAVA_OPTIONS -cp $LOADER_LIB $ENDORSED $CLI_LIBRARIES $CLI $LOADER $ARGS
- ;;
+ ;;
servlet)
- $JAVA $JAVA_OPTIONS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN
+ $JAVA $JAVA_OPTIONS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN &
+ echo $! >lenya.pid
;;
servlet-admin)
- $JAVA $JAVA_OPTIONS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_ADMIN_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN $JETTY_ADMIN
+ $JAVA $JAVA_OPTIONS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_ADMIN_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN $JETTY_ADMIN &
+ echo $! >lenya.pid
;;
servlet-debug)
- $JAVA $JAVA_OPTIONS $JAVA_DEBUG_ARGS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN
+ $JAVA $JAVA_OPTIONS $JAVA_DEBUG_ARGS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_PORT_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN &
+ echo $! >lenya.pid
;;
servlet-profile)
- $JAVA $JAVA_OPTIONS $JAVA_PROFILE_ARGS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN
+ $JAVA $JAVA_OPTIONS $JAVA_PROFILE_ARGS -cp $LOADER_LIB $ENDORSED $PARSER $JETTY_ARGS $JETTY_LIBRARIES $JETTY_WEBAPP $JETTY_HOME $JETTY $LOADER $JETTY_MAIN &
+ echo $! >lenya.pid
;;
*)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org