--- bin/soapui.sh.orig 2010-03-01 17:37:32.000000000 +0100 +++ bin/soapui.sh 2010-04-01 16:29:19.000000000 +0200 @@ -5,25 +5,7 @@ ## ## ### ====================================================================== ### -### $Id$ ### - -DIRNAME=`dirname $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# Setup SOAPUI_HOME -if [ "x$SOAPUI_HOME" = "x" ]; -then - # get the full path (without any relative bits) - SOAPUI_HOME=`cd $DIRNAME/..; pwd` -fi -export SOAPUI_HOME +export SOAPUI_HOME=%%SOAPUI_HOME%% export SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-3.5.jar export SOAPUI_CLASSPATH=$SOAPUI_CLASSPATH:$SOAPUI_HOME/lib/activation-1.1.jar @@ -99,7 +81,7 @@ export SOAPUI_CLASSPATH -JAVA_OPTS="-Xms128m -Xmx384m -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME" +JAVA_OPTS=" ${JAVA_OPTS} -Xms128m -Xmx384m -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME" if [ $SOAPUI_HOME != "" ] then @@ -110,22 +92,15 @@ JAVA_OPTS="$JAVA_OPTS -Dwsi.dir=$SOAPUI_HOME/wsi-test-tools" JAVA_OPTS="$JAVA_OPTS -DGRE_HOME=$SOAPUI_HOME/xulrunner-linux" #uncomment to disable browser component -# JAVA_OPTS="$JAVA_OPTS -Dsoapui.jxbrowser.disable=true" + JAVA_OPTS="$JAVA_OPTS -Dsoapui.jxbrowser.disable=true" fi export JAVA_OPTS -# For Cygwin, switch paths to Windows format before running java -if [ $cygwin = "true" ] -then - SOAPUI_HOME=`cygpath --path --dos "$SOAPUI_HOME"` - SOAPUI_CLASSPATH=`cygpath --path --dos "$SOAPUI_CLASSPATH"` -fi - echo ================================ echo = echo = SOAPUI_HOME = $SOAPUI_HOME echo = echo ================================ -java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@" +%%JAVA%% $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@"