*** bin/run.sh.orig	2011-10-28 10:50:15.180339618 +0200
--- bin/run.sh	2011-10-28 14:11:53.188342367 +0200
***************
*** 31,37 ****
--- 31,50 ----
              JBOSSCONF=`echo $SWITCH|sed 's/\-\-configuration=//'`
              break
          fi
+         arg_count=`expr $arg_count + 1`
+         eval SWITCH=\${$arg_count}
+ done
  
+ # Save jboss.server.base.dir in JBOSS_BASE_DIR if present
+ eval SWITCH=\${$arg_count}
+ arg_count=1
+ while [ ! -z "$SWITCH" ]
+ do
+         echo "$SWITCH" | grep "^\-Djboss.server.base.dir=" #> /dev/null
+         if [ $? -eq 0 ]; then
+             JBOSS_BASE_DIR=`echo $SWITCH|sed 's/\-Djboss.server.base.dir=//'`
+             break
+         fi
          arg_count=`expr $arg_count + 1`
          eval SWITCH=\${$arg_count}
  done
***************
*** 83,89 ****
--- 98,109 ----
      if [ ! -z "$JBOSSCONF" ] && [ -f "$DIRNAME/../server/$JBOSSCONF/run.conf" ]; then
          RUN_CONF="$DIRNAME/../server/$JBOSSCONF/run.conf"
      else
+ 	# Use run.conf file in base directory if jboss.server.base.dir present
+ 	if [ ! -z "$JBOSSCONF" ] && [ -f "$JBOSS_BASE_DIR/$JBOSSCONF/run.conf" ]; then
+             RUN_CONF="$JBOSS_BASE_DIR/$JBOSSCONF/run.conf"
+     else
          RUN_CONF="$DIRNAME/run.conf"
+         fi
      fi
  fi
  if [ -r "$RUN_CONF" ]; then