[jboss-cvs] JBossAS SVN: r112510 - branches/JBPAPP_5_1_3_interim/main/src/bin.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 8 22:15:15 EST 2011
Author: jameslivingston
Date: 2011-12-08 22:15:15 -0500 (Thu, 08 Dec 2011)
New Revision: 112510
Modified:
branches/JBPAPP_5_1_3_interim/main/src/bin/run.sh
Log:
Fix JBPAPP-7454.
Allow the specification of alternative run.conf files via a --run-conf parameter to run.sh
Modified: branches/JBPAPP_5_1_3_interim/main/src/bin/run.sh
===================================================================
--- branches/JBPAPP_5_1_3_interim/main/src/bin/run.sh 2011-12-09 01:47:57 UTC (rev 112509)
+++ branches/JBPAPP_5_1_3_interim/main/src/bin/run.sh 2011-12-09 03:15:15 UTC (rev 112510)
@@ -23,15 +23,28 @@
if [ "$SWITCH" = "-c" ]; then
eval JBOSSCONF=\$`expr $arg_count + 1`
CONF_SPECIFIED=true
- break
fi
echo "$SWITCH" | grep "^\-\-configuration=" > /dev/null
if [ $? -eq 0 ]; then
JBOSSCONF=`echo $SWITCH|sed 's/\-\-configuration=//'`
- break
fi
+ echo "$SWITCH" | grep "^\-Djboss.server.base.dir=" #> /dev/null
+ if [ $? -eq 0 ]; then
+ JBOSS_BASE_DIR=`echo $SWITCH|sed 's/\-Djboss.server.base.dir=//'`
+ fi
+
+ echo "$SWITCH" | grep "^--run-conf=" > /dev/null
+ if [ $? -eq 0 ]; then
+ RUN_CONF=`echo $SWITCH|sed 's/--run-conf=//'`
+
+ #rebuild the parameter list to drop this one
+ set -- `echo "$@" | sed "s!$SWITCH!!"`
+ eval SWITCH=\${$arg_count}
+ continue
+ fi
+
arg_count=`expr $arg_count + 1`
eval SWITCH=\${$arg_count}
done
@@ -80,7 +93,9 @@
# Read an optional running configuration file
if [ "x$RUN_CONF" = "x" ]; then
- if [ ! -z "$JBOSSCONF" ] && [ -f "$DIRNAME/../server/$JBOSSCONF/run.conf" ]; then
+ if [ ! -z "$JBOSSCONF" ] && [ -f "$JBOSS_BASE_DIR/$JBOSSCONF/run.conf" ]; then
+ RUN_CONF="$JBOSS_BASE_DIR/$JBOSSCONF/run.conf"
+ elif [ ! -z "$JBOSSCONF" ] && [ -f "$DIRNAME/../server/$JBOSSCONF/run.conf" ]; then
RUN_CONF="$DIRNAME/../server/$JBOSSCONF/run.conf"
else
RUN_CONF="$DIRNAME/run.conf"
More information about the jboss-cvs-commits
mailing list