Author: richard.opalka(a)jboss.com Date: 2008-09-25 09:30:51 -0400 (Thu, 25 Sep 2008) New Revision: 8225 Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat Log: [JBWS-2320] fix windows tools scripts Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2008-09-25 12:33:29 UTC (rev 8224) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2008-09-25 13:30:51 UTC (rev 8225) @@ -23,7 +23,7 @@ REM :endloop set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. +@if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\.. rem Setup the java endorsed dirs set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2008-09-25 12:33:29 UTC (rev 8224) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2008-09-25 13:30:51 UTC (rev 8225) @@ -23,7 +23,7 @@ REM :endloop set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. +if "%JBOSS_HOME%" = "" set JBOSS_HOME=%DIRNAME%\.. rem Setup the java endorsed dirs set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2008-09-25 12:33:29 UTC (rev 8224) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2008-09-25 13:30:51 UTC (rev 8225) @@ -33,8 +33,7 @@ :endloop set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs +if "%JBOSS_HOME%" = "" set JBOSS_HOME=%DIRNAME%\.. rem Setup the java endorsed dirs set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat 2008-09-25 12:33:29 UTC (rev 8224) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat 2008-09-25 13:30:51 UTC (rev 8225) @@ -23,7 +23,7 @@ REM :endloop set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. +if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\.. rem Setup the java endorsed dirs set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed @@ -38,13 +38,14 @@ set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/concurrent.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar - +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar rem Display our environment echo =========================================================================" @@ -57,7 +58,7 @@ echo . echo JAVA_OPTS: %JAVA_OPTS% echo . -rem echo CLASSPATH: %WSTOOLS_CLASSPATH% +echo CLASSPATH: %WSTOOLS_CLASSPATH% rem echo . echo =========================================================================" echo .