Author: objectiser Date: 2010-10-06 09:59:00 -0400 (Wed, 06 Oct 2010) New Revision: 1020 Modified: trunk/distribution/src/main/release/bin/bpelc.bat trunk/distribution/src/main/release/bin/sendsoap.bat Log: RIFTSAW-261 - sort out the remaining task of getting the windows scripts to work with the reduced set of distributed libs. Modified: trunk/distribution/src/main/release/bin/bpelc.bat =================================================================== --- trunk/distribution/src/main/release/bin/bpelc.bat 2010-10-05 17:31:18 UTC (rev 1019) +++ trunk/distribution/src/main/release/bin/bpelc.bat 2010-10-06 13:59:00 UTC (rev 1020) @@ -28,13 +28,23 @@ set ODE_LIB=%~dp0..\lib set ODE_ETC=%~dp0..\etc +if "%JBOSS_HOME%"=="" goto noJBossHome + +set LIB1=%ODE_HOME%/modules/riftsaw.sar/lib +set LIB2=%ODE_HOME%/lib +set LIB3=%JBOSS_HOME%/client + if "%JAVA_HOME%"=="" goto noJavaHome if not exist "%JAVA_HOME%"\bin\java.exe goto noJava set JAVACMD="%JAVA_HOME%\bin\java.exe" set LOCALCLASSPATH=%ODE_CLASSPATH%;%ODE_LIB% -FOR %%c in (%ODE_LIB%\*.jar) DO (call :append_cp %%c) +FOR %%c in (%LIB1%\*.jar) DO (call :append_cp %%c) +FOR %%c in (%LIB2%\*.jar) DO (call :append_cp %%c) +rem FOR %%c in (%LIB3%\*.jar) DO (call :append_cp %%c) +call :append_cp %LIB3%\log4j.jar +call :append_cp %LIB3%\commons-logging.jar %JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.bpelc.cline.BpelC %* goto end @@ -56,6 +66,10 @@ echo ERROR: JAVA_HOME not set! Aborting. goto end +:noJBossHome +echo ERROR: JBOSS_HOME not set! Please set this to the location of the JBossAS installation. +goto end + :noJava echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting goto end Modified: trunk/distribution/src/main/release/bin/sendsoap.bat =================================================================== --- trunk/distribution/src/main/release/bin/sendsoap.bat 2010-10-05 17:31:18 UTC (rev 1019) +++ trunk/distribution/src/main/release/bin/sendsoap.bat 2010-10-06 13:59:00 UTC (rev 1020) @@ -28,13 +28,22 @@ set ODE_LIB=%~dp0..\lib set ODE_ETC=%~dp0..\etc +if "%JBOSS_HOME%"=="" goto noJBossHome + +set LIB1=%ODE_HOME%/modules/riftsaw.sar/lib +set LIB2=%ODE_HOME%/lib +set LIB3=%JBOSS_HOME%/client + if "%JAVA_HOME%"=="" goto noJavaHome if not exist "%JAVA_HOME%"\bin\java.exe goto noJava set JAVACMD="%JAVA_HOME%\bin\java.exe" set LOCALCLASSPATH=%ODE_CLASSPATH%;%ODE_LIB% -FOR %%c in (%ODE_LIB%\*.jar) DO (call :append_cp %%c) +FOR %%c in (%LIB1%\*.jar) DO (call :append_cp %%c) +FOR %%c in (%LIB2%\*.jar) DO (call :append_cp %%c) +rem FOR %%c in (%LIB3%\*.jar) DO (call :append_cp %%c) +call :append_cp %LIB3%\log4j.jar %JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.sendsoap.cline.HttpSoapSender %* goto end @@ -56,6 +65,10 @@ echo ERROR: JAVA_HOME not set! Aborting. goto end +:noJBossHome +echo ERROR: JBOSS_HOME not set! Please set this to the location of the JBossAS installation. +goto end + :noJava echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting goto end