Author: objectiser Date: 2011-03-29 09:57:53 -0400 (Tue, 29 Mar 2011) New Revision: 1338 Modified: trunk/distribution/src/main/release/bin/bpelc.bat trunk/distribution/src/main/release/bin/sendsoap.bat Log: RIFTSAW-362 - update classpath in the windows scripts to reference the jbossas installation. Modified: trunk/distribution/src/main/release/bin/bpelc.bat =================================================================== --- trunk/distribution/src/main/release/bin/bpelc.bat 2011-03-29 13:06:48 UTC (rev 1337) +++ trunk/distribution/src/main/release/bin/bpelc.bat 2011-03-29 13:57:53 UTC (rev 1338) @@ -1,81 +1,90 @@ -@echo off -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -if not "%OS%"=="Windows_NT" goto wrongOS - -@setlocal - -set command=%0 -set progname=%~n0 - -set ODE_HOME=%~dp0.. -set ODE_BIN=%~dp0..\bin -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 (%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 - -:append_cp -set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 -goto end - -===================================================================== - ERRORS -===================================================================== - - -:wrongOS -echo ERROR: ODE requires WindowsNT/XP. Aborting. -goto end - -:noJavaHome -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 - -REM ================================================================ -REM END -REM ================================================================ -:end -@endlocal +@echo off +rem +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem + +if not "%OS%"=="Windows_NT" goto wrongOS + +@setlocal + +set command=%0 +set progname=%~n0 + +set ODE_HOME=%~dp0.. +set ODE_BIN=%~dp0..\bin +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 +set LIB4=%JBOSS_HOME%/lib/endorsed +set LIB5=%JBOSS_HOME%/common/lib + +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 (%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 +call :append_cp %LIB3%\wsdl4j.jar +rem FOR %%c in (%LIB4%\*.jar) DO (call :append_cp %%c) +call :append_cp %LIB4%\xercesImpl.jar +call :append_cp %LIB4%\xalan.jar +rem FOR %%c in (%LIB5%\*.jar) DO (call :append_cp %%c) +call :append_cp %LIB5%\commons-collections.jar +call :append_cp %LIB5%\jaxen.jar + +%JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.bpelc.cline.BpelC %* +goto end + +:append_cp +set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 +goto end + +===================================================================== + ERRORS +===================================================================== + + +:wrongOS +echo ERROR: ODE requires WindowsNT/XP. Aborting. +goto end + +:noJavaHome +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 + +REM ================================================================ +REM END +REM ================================================================ +:end +@endlocal Modified: trunk/distribution/src/main/release/bin/sendsoap.bat =================================================================== --- trunk/distribution/src/main/release/bin/sendsoap.bat 2011-03-29 13:06:48 UTC (rev 1337) +++ trunk/distribution/src/main/release/bin/sendsoap.bat 2011-03-29 13:57:53 UTC (rev 1338) @@ -1,80 +1,81 @@ -@echo off -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -if not "%OS%"=="Windows_NT" goto wrongOS - -@setlocal - -set command=%0 -set progname=%~n0 - -set ODE_HOME=%~dp0.. -set ODE_BIN=%~dp0..\bin -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 (%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 - -:append_cp -set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 -goto end - -===================================================================== - ERRORS -===================================================================== - - -:wrongOS -echo ERROR: ODE requires WindowsNT/XP. Aborting. -goto end - -:noJavaHome -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 - -REM ================================================================ -REM END -REM ================================================================ -:end -@endlocal +@echo off +rem +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem + +if not "%OS%"=="Windows_NT" goto wrongOS + +@setlocal + +set command=%0 +set progname=%~n0 + +set ODE_HOME=%~dp0.. +set ODE_BIN=%~dp0..\bin +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 (%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.sendsoap.cline.HttpSoapSender %* +goto end + +:append_cp +set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 +goto end + +===================================================================== + ERRORS +===================================================================== + + +:wrongOS +echo ERROR: ODE requires WindowsNT/XP. Aborting. +goto end + +:noJavaHome +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 + +REM ================================================================ +REM END +REM ================================================================ +:end +@endlocal