Author: richard.opalka(a)jboss.com Date: 2008-01-14 08:10:49 -0500 (Mon, 14 Jan 2008) New Revision: 5469 Modified: stack/native/trunk/src/main/etc/wsrunclient.bat stack/native/trunk/src/main/etc/wsrunclient.sh stack/native/trunk/src/main/etc/wstools.bat Log: [JBWS-1819] fixing batch and shell scripts issues Modified: stack/native/trunk/src/main/etc/wsrunclient.bat =================================================================== --- stack/native/trunk/src/main/etc/wsrunclient.bat 2008-01-11 23:19:46 UTC (rev 5468) +++ stack/native/trunk/src/main/etc/wsrunclient.bat 2008-01-14 13:10:49 UTC (rev 5469) @@ -38,19 +38,19 @@ set JBOSS_HOME=%DIRNAME%\.. rem Setup the java endorsed dirs -# Setup the java endorsed dirs +rem Setup the java endorsed dirs set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed -# Setup the client classpath +rem Setup the client classpath set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -# JBossAS-5.0 subset of jbossall-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME/client/jboss-logging-spi.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME/client/jboss-common-core.jar +rem JBossAS-5.0 subset of jbossall-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-logging-spi.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-common-core.jar -# JBossAS-4.2 subset of jbossall-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME/client/jboss-common-client.jar +rem JBossAS-4.2 subset of jbossall-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-common-client.jar rem Execute the JVM "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% Modified: stack/native/trunk/src/main/etc/wsrunclient.sh =================================================================== --- stack/native/trunk/src/main/etc/wsrunclient.sh 2008-01-11 23:19:46 UTC (rev 5468) +++ stack/native/trunk/src/main/etc/wsrunclient.sh 2008-01-14 13:10:49 UTC (rev 5469) @@ -33,7 +33,7 @@ while [ $# -ge 1 ]; do case $1 in "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;; - *) args="$args \"$1\"";; + *) args="$1";; esac shift done @@ -83,7 +83,7 @@ fi # Execute the JVM -eval "$JAVA" $JAVA_OPTS \ +"$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -Dlog4j.configuration=wstools-log4j.xml \ -classpath "$WSRUNCLIENT_CLASSPATH" \ Modified: stack/native/trunk/src/main/etc/wstools.bat =================================================================== --- stack/native/trunk/src/main/etc/wstools.bat 2008-01-11 23:19:46 UTC (rev 5468) +++ stack/native/trunk/src/main/etc/wstools.bat 2008-01-14 13:10:49 UTC (rev 5469) @@ -30,7 +30,7 @@ set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed rem Setup the wstools classpath -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;$JAVA_HOME/lib/tools.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JAVA_HOME%/lib/tools.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/activation.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar