pkg://jetty4-4.2.20-1jpp.src.rpm:10543741/jetty-4.2-djetty.patch  info  downloads

--- Jetty-4.2.17/bin/jetty.sh.orig	2003-01-24 18:26:18.000000000 +0200
+++ Jetty-4.2.17/bin/jetty.sh	2004-02-22 05:32:21.570197917 +0200
@@ -155,6 +155,7 @@
         Jetty                    \
         jetty3                   \
         Jetty3                   \
+        jetty4                   \
         "
         
   JETTY_HOME=
@@ -202,15 +203,15 @@
     if [ -f $A ] 
     then
        CONF="$A" 
-    elif [ -f $JETTY_HOME/etc/$A ] 
+    elif [ -f $JETTY_HOME/conf/$A ] 
     then
-       CONF="$JETTY_HOME/etc/$A" 
+       CONF="$JETTY_HOME/conf/$A" 
     elif [ -f ${A}.xml ] 
     then
        CONF="${A}.xml" 
-    elif [ -f $JETTY_HOME/etc/${A}.xml ] 
+    elif [ -f $JETTY_HOME/conf/${A}.xml ] 
     then
-       CONF="$JETTY_HOME/etc/${A}.xml" 
+       CONF="$JETTY_HOME/conf/${A}.xml" 
     else
        echo "** ERROR: Cannot find configuration '$A' specified in the command line." 
        exit 1
@@ -232,9 +233,9 @@
 ##################################################
 if [ -z "$JETTY_CONF" ] 
 then
-  if [ -f /etc/jetty.conf ]
+  if [ -f /etc/jetty4/jetty4.conf ]
   then
-     JETTY_CONF=/etc/jetty.conf
+     JETTY_CONF=/etc/jetty4/jetty4.conf
   else
-     JETTY_CONF="${JETTY_HOME}/etc/jetty.conf"
+     JETTY_CONF="${JETTY_HOME}/conf/jetty.conf"
   fi
@@ -291,9 +292,9 @@
 then
   if [ "$ACTION" = "demo" ]
   then
-    CONFIGS="${JETTY_HOME}/etc/demo.xml ${JETTY_HOME}/etc/admin.xml"
+    CONFIGS="${JETTY_HOME}/conf/demo.xml ${JETTY_HOME}/conf/admin.xml"
   else
-    CONFIGS="${JETTY_HOME}/etc/jetty.xml"
+    CONFIGS="${JETTY_HOME}/conf/jetty.xml"
   fi
 fi
 
@@ -303,7 +304,7 @@
 #####################################################
 if [  -z "$JETTY_RUN" ] 
 then
-  JETTY_RUN=`findDirectory -w /var/run /usr/var/run /tmp`
+  JETTY_RUN="/var/run/jetty4"
 fi
 
 #####################################################
@@ -311,7 +312,7 @@
 #####################################################
 if [  -z "$JETTY_PID" ] 
 then
-  JETTY_PID="$JETTY_RUN/jetty.pid"
+  JETTY_PID="$JETTY_RUN/jetty4.pid"
 fi
 
 #####################################################
@@ -468,17 +469,19 @@
   start)
         echo "Starting Jetty: "
 
-        if [ -f $JETTY_PID ]
-        then
-            echo "Already Running!!"
-            exit 1
+        if [ -f $JETTY_PID ]; then
+		read kpid < $JETTY_PID
+		if [ `ps --pid $kpid 2> /dev/null | grep -c $kpid 2> /dev/null` = '0' ]; then
+			echo "Already Running!"
+			exit 1
+		fi
         fi
 
         echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
 
         nohup sh -c "exec $RUN_CMD >>$JETTY_CONSOLE 2>&1" >/dev/null &
         echo $! > $JETTY_PID
-        echo "Jetty running pid="`cat $JETTY_PID`
+        echo "Jetty running PID="`cat $JETTY_PID`
         ;;
 
   stop)
@@ -508,13 +511,19 @@
   run|demo)
         echo "Running Jetty: "
 
-        if [ -f $JETTY_PID ]
-        then
-            echo "Already Running!!"
-            exit 1
+        if [ -f $JETTY_PID ]; then
+		read kpid < $JETTY_PID
+		if [ `ps --pid $kpid 2> /dev/null | grep -c $kpid 2> /dev/null` = '0' ]; then
+                        echo "Already Running!"
+                        exit 1
+                fi
         fi
 
-        exec $RUN_CMD
+	 echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
+
+        nohup sh -c "exec $RUN_CMD >>$JETTY_CONSOLE 2>&1" >/dev/null &
+        echo $! > $JETTY_PID
+        echo "Jetty running PID="`cat $JETTY_PID`
         ;;
 
   check)
@@ -533,9 +542,9 @@
         echo "RUN_CMD        =  $RUN_CMD"
         echo
         
-        if [ -f $JETTY_RUN/jetty.pid ]
+        if [ -f $JETTY_RUN/jetty4.pid ]
         then
-            echo "Jetty running pid="`cat $JETTY_RUN/jetty.pid`
+            echo "Jetty running pid="`cat $JETTY_RUN/jetty4.pid`
             exit 0
         fi
         exit 1