[jboss-cvs] JBossAS SVN: r88442 - in projects/jboss-osgi/trunk/build/hudson/hudson-home: bin and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri May 8 10:36:21 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-05-08 10:36:20 -0400 (Fri, 08 May 2009)
New Revision: 88442

Added:
   projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/startup.sh
Removed:
   projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh
Modified:
   projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
Log:
refactor container startup

Deleted: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh	2009-05-08 14:30:43 UTC (rev 88441)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh	2009-05-08 14:36:20 UTC (rev 88442)
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-RUNTIME_HOME="$1"
-BINDADDR="$3"
-CMD="$2"
-
-export RUNTIME_HOME
-
-#
-# Helper to complain.
-#
-warn() {
-   echo "$PROGNAME: $*"
-}
-
-if [ ! -f "$RUNTIME_HOME/bin/run.sh" ]; then
-   warn "Cannot find: $RUNTIME_HOME/bin/run.sh"
-   exit 1
-fi
-
-case "$CMD" in
-start)
-    # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
-    # It relies on bash specific features
-    /bin/bash $RUNTIME_HOME/bin/run.sh -b $BINDADDR &
-    ;;
-stop)
-    pidfile="$RUNTIME_HOME/bin/pid.txt"
-    if [ -f "$pidfile" ]; then
-       pid=`cat "$pidfile"`
-       echo "kill pid: $pid"
-       kill $pid
-       if [ "$?" -eq 0 ]; then
-         # process exists, wait for it to die, and force if not
-         sleep 20
-         kill -9 $pid &> /dev/null
-       fi
-       rm "$pidfile"
-    else
-       warn "No pid found!"
-    fi
-    ;;
-restart)
-    $0 stop
-    $0 start
-    ;;
-*)
-    echo "usage: $0 jboss_home (start|stop|restart|help)"
-esac

Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/startup.sh (from rev 88441, projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh)
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/startup.sh	                        (rev 0)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/startup.sh	2009-05-08 14:36:20 UTC (rev 88442)
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+RUNTIME_HOME="$1"
+BINDADDR="$3"
+CMD="$2"
+
+export RUNTIME_HOME
+
+#
+# Helper to complain.
+#
+warn() {
+   echo "$PROGNAME: $*"
+}
+
+if [ ! -f "$RUNTIME_HOME/bin/run.sh" ]; then
+   warn "Cannot find: $RUNTIME_HOME/bin/run.sh"
+   exit 1
+fi
+
+case "$CMD" in
+start)
+    # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
+    # It relies on bash specific features
+    /bin/bash $RUNTIME_HOME/bin/run.sh -b $BINDADDR &
+    ;;
+stop)
+    pidfile="$RUNTIME_HOME/bin/pid.txt"
+    if [ -f "$pidfile" ]; then
+       pid=`cat "$pidfile"`
+       echo "kill pid: $pid"
+       kill $pid
+       if [ "$?" -eq 0 ]; then
+         # process exists, wait for it to die, and force if not
+         sleep 20
+         kill -9 $pid &> /dev/null
+       fi
+       rm "$pidfile"
+    else
+       warn "No pid found!"
+    fi
+    ;;
+restart)
+    $0 stop
+    $0 start
+    ;;
+*)
+    echo "usage: $0 jboss_home (start|stop|restart|help)"
+esac

Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh	2009-05-08 14:30:43 UTC (rev 88441)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh	2009-05-08 14:36:20 UTC (rev 88442)
@@ -79,13 +79,13 @@
 #
 # start jbossas
 #
-$HUDSONDIR/bin/runtime.sh $RUNTIME_HOME start $JBOSS_BINDADDR
+$HUDSONDIR/bin/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
 
 # Was it successfully started?
 $HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
 if [ -e $WORKSPACE/spider.failed ]; then
   tail -n 200 $RUNTIME_LOG
-  $HUDSONDIR/bin/runtime.sh $RUNTIME_HOME stop
+  $HUDSONDIR/bin/startup.sh $RUNTIME_HOME stop
   exit 1
 fi
 
@@ -100,7 +100,7 @@
 #
 # stop jbossas
 #
-$HUDSONDIR/bin/runtime.sh $RUNTIME_HOME stop
+$HUDSONDIR/bin/startup.sh $RUNTIME_HOME stop
 
 #
 # copy test.log to workspace

Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml	2009-05-08 14:30:43 UTC (rev 88441)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml	2009-05-08 14:36:20 UTC (rev 88442)
@@ -46,15 +46,17 @@
 #
 # Start JBossAS
 #
-$HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
+cp $HUDSONDIR/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSONDIR/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
 
 # 
 # Was it successfully started?
 #
-$HUDSONDIR/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
 if [ -e $WORKSPACE/spider.failed ]; then
   tail -n 200 $JBOSS_HOME/server/default/log/server.log
-  $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
+  $HUDSONDIR/bin/startup.sh $JBOSS_HOME stop
   exit 1
 fi
 

Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml	2009-05-08 14:30:43 UTC (rev 88441)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml	2009-05-08 14:36:20 UTC (rev 88442)
@@ -46,15 +46,17 @@
 #
 # Start JBossAS
 #
-$HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
+cp $HUDSONDIR/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSONDIR/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
 
 # 
 # Was it successfully started?
 #
-$HUDSONDIR/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
 if [ -e $WORKSPACE/spider.failed ]; then
   tail -n 200 $JBOSS_HOME/server/default/log/server.log
-  $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
+  $HUDSONDIR/bin/startup.sh $JBOSS_HOME stop
   exit 1
 fi
 




More information about the jboss-cvs-commits mailing list