[jbossws-commits] JBossWS SVN: r10897 - stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin.

[jbossws-commits at lists.jboss.org]

Author: jim.ma
Date: 2009-10-13 04:08:37 -0400 (Tue, 13 Oct 2009)
New Revision: 10897

Modified:
   stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
   stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
   stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
   stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat
Log:
[JBWS-2760]:Merge the fix to branch

Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat	2009-10-12 21:10:58 UTC (rev 10896)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat	2009-10-13 08:08:37 UTC (rev 10897)
@@ -8,14 +8,23 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
-set JAVA=%JAVA_HOME%\bin\java
+if "x%JAVA_HOME%" == "x" (
+  set  JAVA=java
+  echo JAVA_HOME is not set. Unexpected results may occur.
+  echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+  set "JAVA=%JAVA_HOME%\bin\java"
+  if exist "%JAVA_HOME%\lib\tools.jar" (
+    set "JAVAC_JAR=%JAVA_HOME%\lib\tools.jar"
+  )
+)
 if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\..
 
 rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 
 rem Shared libs
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVAC_JAR%
 set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
 set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
 set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar

Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat	2009-10-12 21:10:58 UTC (rev 10896)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat	2009-10-13 08:08:37 UTC (rev 10897)
@@ -8,14 +8,23 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
-set JAVA=%JAVA_HOME%\bin\java
+if "x%JAVA_HOME%" == "x" (
+  set  JAVA=java
+  echo JAVA_HOME is not set. Unexpected results may occur.
+  echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+  set "JAVA=%JAVA_HOME%\bin\java"
+  if exist "%JAVA_HOME%\lib\tools.jar" (
+    set "JAVAC_JAR=%JAVA_HOME%\lib\tools.jar"
+  )
+)
 if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\..
 
 rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 
 rem Shared libs
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JAVA_HOME%/lib/tools.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JAVAC_JAR%
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
 set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar

Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat	2009-10-12 21:10:58 UTC (rev 10896)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat	2009-10-13 08:08:37 UTC (rev 10897)
@@ -31,7 +31,16 @@
       goto loop
 :endloop
 
-set JAVA=%JAVA_HOME%\bin\java
+if "x%JAVA_HOME%" == "x" (
+  set  JAVA=java
+  echo JAVA_HOME is not set. Unexpected results may occur.
+  echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+  set "JAVA=%JAVA_HOME%\bin\java"
+  if exist "%JAVA_HOME%\lib\tools.jar" (
+    set "JAVAC_JAR=%JAVA_HOME%\lib\tools.jar"
+  )
+)
 set JBOSS_HOME=%DIRNAME%\..
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 

Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat	2009-10-12 21:10:58 UTC (rev 10896)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat	2009-10-13 08:08:37 UTC (rev 10897)
@@ -8,14 +8,23 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
-set JAVA=%JAVA_HOME%\bin\java
+if "x%JAVA_HOME%" == "x" (
+  set  JAVA=java
+  echo JAVA_HOME is not set. Unexpected results may occur.
+  echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+  set "JAVA=%JAVA_HOME%\bin\java"
+  if exist "%JAVA_HOME%\lib\tools.jar" (
+    set "JAVAC_JAR=%JAVA_HOME%\lib\tools.jar"
+  )
+)
 if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\..
 
 rem Setup the java endorsed dirs
 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%;%JAVAC_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