[jbossws-commits] JBossWS SVN: r2314 - in branches/jbossws-1.2.0/build: hudson and 17 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Feb 9 05:55:31 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-09 05:55:31 -0500 (Fri, 09 Feb 2007)
New Revision: 2314
Added:
branches/jbossws-1.2.0/build/hudson/jboss/
branches/jbossws-1.2.0/build/hudson/jboss/bin/
branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh
branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh
Removed:
branches/jbossws-1.2.0/build/etc/jboss.sh
branches/jbossws-1.2.0/build/etc/runjboss.sh
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
Log:
Try to fix OOME because of missing run.conf
Deleted: branches/jbossws-1.2.0/build/etc/jboss.sh
===================================================================
--- branches/jbossws-1.2.0/build/etc/jboss.sh 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/etc/jboss.sh 2007-02-09 10:55:31 UTC (rev 2314)
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-JBOSS_HOME="$1"
-export JBOSS_HOME
-CMD="$2"
-
-#
-# Helper to complain.
-#
-warn() {
- echo "$PROGNAME: $*"
-}
-
-if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then
- warn "Cannot find: $JBOSS_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
- # Do you want to hide jboss output?
- /bin/bash $DIRNAME/runjboss.sh &> /dev/null &
- sleep 20
- ;;
-stop)
- pidfile="$JBOSS_HOME/bin/jboss.pid"
- 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, using shutdown"
- $JBOSS_HOME/bin/shutdown.sh -S > /dev/null &
- fi
- ;;
-restart)
- $0 stop
- $0 start
- ;;
-*)
- echo "usage: $0 jboss_instance (start|stop|restart|help)"
-esac
Deleted: branches/jbossws-1.2.0/build/etc/runjboss.sh
===================================================================
--- branches/jbossws-1.2.0/build/etc/runjboss.sh 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/etc/runjboss.sh 2007-02-09 10:55:31 UTC (rev 2314)
@@ -1,208 +0,0 @@
-#!/bin/bash
-### ====================================================================== ###
-## ##
-## JBoss Bootstrap Script ##
-## ##
-### ====================================================================== ###
-
-### $Id: run.sh 58679 2006-11-27 10:21:09Z mladen.turk at jboss.com $ ###
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-GREP="grep"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to puke.
-#
-die() {
- warn $*
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-
- Darwin*)
- darwin=true
- ;;
-esac
-
-# Read an optional running configuration file
-if [ "x$RUN_CONF" = "x" ]; then
- RUN_CONF="$DIRNAME/run.conf"
-fi
-if [ -r "$RUN_CONF" ]; then
- . "$RUN_CONF"
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$JBOSS_HOME" ] &&
- JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$JAVAC_JAR" ] &&
- JAVAC_JAR=`cygpath --unix "$JAVAC_JAR"`
-fi
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Increase the maximum file descriptors if we can
-if [ "$cygwin" = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-# Setup the classpath
-runjar="$JBOSS_HOME/bin/run.jar"
-if [ ! -f "$runjar" ]; then
- die "Missing required file: $runjar"
-fi
-JBOSS_BOOT_CLASSPATH="$runjar"
-
-# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
-# compatible distribution which JAVA_HOME points to
-if [ "x$JAVAC_JAR" = "x" ]; then
- JAVAC_JAR="$JAVA_HOME/lib/tools.jar"
-fi
-if [ ! -f "$JAVAC_JAR" ]; then
- # MacOSX does not have a seperate tools.jar
- if [ "$darwin" != "true" ]; then
- warn "Missing file: $JAVAC_JAR"
- warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not a JRE."
- fi
-fi
-
-if [ "x$JBOSS_CLASSPATH" = "x" ]; then
- JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
-else
- JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
-fi
-
-# If -server not set in JAVA_OPTS, set it, if supported
-SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
-if [ "x$SERVER_SET" = "x" ]; then
-
- # Check for SUN(tm) JVM w/ HotSpot support
- if [ "x$HAS_HOTSPOT" = "x" ]; then
- HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
- fi
-
- # Enable -server if we have Hotspot, unless we can't
- if [ "x$HAS_HOTSPOT" != "x" ]; then
- # MacOS does not support -server flag
- if [ "$darwin" != "true" ]; then
- JAVA_OPTS="-server $JAVA_OPTS"
- fi
- fi
-fi
-
-# Setup JBosst Native library path
-JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native"
-if [ -d "$JBOSS_NATIVE_DIR" ]; then
- if $cygwin ; then
- export PATH="$JBOSS_NATIVE_DIR:$PATH"
- JBOSS_NATIVE_DIR=`cygpath --dos "$JBOSS_NATIVE_DIR"`
- fi
- if [ "x$LD_LIBRARY_PATH" = "x" ]; then
- LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
- else
- LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
- fi
- export LD_LIBRARY_PATH
- if [ "x$JAVA_OPTS" = "x" ]; then
- JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR"
- else
- JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR"
- fi
-fi
-
-#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
-#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
- JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
-# Display our environment
-echo "========================================================================="
-echo ""
-echo " JBoss Bootstrap Environment"
-echo ""
-echo " JBOSS_HOME: $JBOSS_HOME"
-echo ""
-echo " JAVA: $JAVA"
-echo ""
-echo " JAVA_OPTS: $JAVA_OPTS"
-echo ""
-echo " CLASSPATH: $JBOSS_CLASSPATH"
-echo ""
-echo "========================================================================="
-echo ""
-# enable monitor mode (job control needed)
-set -m
-STATUS=10
-while [ $STATUS -eq 10 ]
-do
-# Execute the JVM
- "$JAVA" $JAVA_OPTS \
- -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
- -classpath "$JBOSS_CLASSPATH" \
- org.jboss.Main "$@" &
- echo $! > $JBOSS_HOME/bin/jboss.pid
- fg
- STATUS=$?
- # if it doesn't work, you may want to take a look at this:
- # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
-done
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -22,7 +22,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -33,7 +33,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# build the testsuite
@@ -57,7 +57,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -22,7 +22,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -35,7 +35,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# build the testsuite
@@ -59,7 +59,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -22,7 +22,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -33,7 +33,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# build the testsuite
@@ -57,7 +57,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -22,7 +22,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -33,7 +33,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# build the testsuite
@@ -57,7 +57,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -16,7 +16,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -27,7 +27,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
@@ -46,7 +46,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -16,7 +16,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -27,7 +27,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
@@ -46,7 +46,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -16,7 +16,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -27,7 +27,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
@@ -46,7 +46,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -16,7 +16,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -27,7 +27,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
@@ -46,7 +46,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -26,7 +26,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# build jbossws samples
@@ -36,7 +36,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute samples
@@ -49,7 +49,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -26,7 +26,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# build jbossws samples
@@ -36,7 +36,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute samples
@@ -49,7 +49,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -26,7 +26,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# build jbossws samples
@@ -36,7 +36,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute samples
@@ -49,7 +49,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -22,7 +22,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -32,7 +32,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
@@ -44,7 +44,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -22,7 +22,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -34,7 +34,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
@@ -46,7 +46,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -22,7 +22,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -32,7 +32,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
@@ -44,7 +44,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-02-09 10:02:09 UTC (rev 2313)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-02-09 10:55:31 UTC (rev 2314)
@@ -22,7 +22,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
# deploy to jboss
@@ -32,7 +32,7 @@
#
# start jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
#
# execute tests
@@ -44,7 +44,7 @@
#
# stop jbossas
#
-$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop
+$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
</command>
</hudson.tasks.Shell>
</builders>
Added: branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh
===================================================================
--- branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh (rev 0)
+++ branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh 2007-02-09 10:55:31 UTC (rev 2314)
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+JBOSS_HOME="$1"
+export JBOSS_HOME
+CMD="$2"
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "$PROGNAME: $*"
+}
+
+if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then
+ warn "Cannot find: $JBOSS_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
+ # Do you want to hide jboss output?
+ /bin/bash $DIRNAME/runjboss.sh &> /dev/null &
+ sleep 20
+ ;;
+stop)
+ pidfile="$JBOSS_HOME/bin/jboss.pid"
+ 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, using shutdown"
+ $JBOSS_HOME/bin/shutdown.sh -S > /dev/null &
+ fi
+ ;;
+restart)
+ $0 stop
+ $0 start
+ ;;
+*)
+ echo "usage: $0 jboss_instance (start|stop|restart|help)"
+esac
Property changes on: branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh
===================================================================
--- branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh (rev 0)
+++ branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh 2007-02-09 10:55:31 UTC (rev 2314)
@@ -0,0 +1,149 @@
+#!/bin/bash
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Script ##
+## ##
+### ====================================================================== ###
+
+### $Id: run.sh 58679 2006-11-27 10:21:09Z mladen.turk at jboss.com $ ###
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+GREP="grep"
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+MAX_FD="maximum"
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "${PROGNAME}: $*"
+}
+
+#
+# Helper to puke.
+#
+die() {
+ warn $*
+ exit 1
+}
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+ # get the full path (without any relative bits)
+ JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_HOME
+
+# Read an optional running configuration file
+if [ "x$RUN_CONF" = "x" ]; then
+ RUN_CONF="$JBOSS_HOME/bin/run.conf"
+fi
+if [ -r "$RUN_CONF" ]; then
+ . "$RUN_CONF"
+fi
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ JAVA="java"
+ fi
+fi
+
+# Setup the classpath
+runjar="$JBOSS_HOME/bin/run.jar"
+if [ ! -f "$runjar" ]; then
+ die "Missing required file: $runjar"
+fi
+JBOSS_BOOT_CLASSPATH="$runjar"
+
+# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
+# compatible distribution which JAVA_HOME points to
+if [ "x$JAVAC_JAR" = "x" ]; then
+ JAVAC_JAR="$JAVA_HOME/lib/tools.jar"
+fi
+if [ ! -f "$JAVAC_JAR" ]; then
+ warn "Missing file: $JAVAC_JAR"
+ warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not a JRE."
+fi
+
+if [ "x$JBOSS_CLASSPATH" = "x" ]; then
+ JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
+else
+ JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
+fi
+
+# If -server not set in JAVA_OPTS, set it, if supported
+SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
+if [ "x$SERVER_SET" = "x" ]; then
+
+ # Check for SUN(tm) JVM w/ HotSpot support
+ if [ "x$HAS_HOTSPOT" = "x" ]; then
+ HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
+ fi
+
+ # Enable -server if we have Hotspot, unless we can't
+ if [ "x$HAS_HOTSPOT" != "x" ]; then
+ JAVA_OPTS="-server $JAVA_OPTS"
+ fi
+fi
+
+# Setup JBosst Native library path
+JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native"
+if [ -d "$JBOSS_NATIVE_DIR" ]; then
+ if [ "x$LD_LIBRARY_PATH" = "x" ]; then
+ LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
+ else
+ LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
+ fi
+ export LD_LIBRARY_PATH
+ if [ "x$JAVA_OPTS" = "x" ]; then
+ JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR"
+ else
+ JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR"
+ fi
+fi
+
+#JPDA options. Uncomment and modify as appropriate to enable remote debugging .
+#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
+
+# Setup the java endorsed dirs
+JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+
+# Display our environment
+echo "========================================================================="
+echo ""
+echo " JBoss Bootstrap Environment"
+echo ""
+echo " JBOSS_HOME: $JBOSS_HOME"
+echo ""
+echo " JAVA: $JAVA"
+echo ""
+echo " JAVA_OPTS: $JAVA_OPTS"
+echo ""
+echo " CLASSPATH: $JBOSS_CLASSPATH"
+echo ""
+echo "========================================================================="
+echo ""
+# enable monitor mode (job control needed)
+set -m
+STATUS=10
+while [ $STATUS -eq 10 ]
+do
+# Execute the JVM
+ "$JAVA" $JAVA_OPTS \
+ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+ -classpath "$JBOSS_CLASSPATH" \
+ org.jboss.Main "$@" &
+ echo $! > $JBOSS_HOME/bin/jboss.pid
+ fg
+ STATUS=$?
+ # if it doesn't work, you may want to take a look at this:
+ # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
+done
Property changes on: branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh
___________________________________________________________________
Name: svn:executable
+ *
More information about the jbossws-commits
mailing list