Author: asankha
Date: Mon May 7 02:43:17 2007
New Revision: 535820
URL: http://svn.apache.org/viewvc?view=rev&rev=535820
Log:
fix windows batch files to operate correctly even when spaces exist on the path
Modified:
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat
webservices/synapse/trunk/java/src/main/bin/synapse.bat
Modified:
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat?view=diff&rev=535820&r1=535819&r2=535820
==============================================================================
---
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat
(original)
+++
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat
Mon May 7 02:43:17 2007
@@ -30,10 +30,7 @@
if "%OS%"=="WINNT" @setlocal
rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_AXIS2_HOME=%~dp0
-
-if "%AXIS2_HOME%"=="" set AXIS2_HOME=%DEFAULT_AXIS2_HOME%
-set DEFAULT_AXIS2_HOME=
+if "%AXIS2_HOME%"=="" set AXIS2_HOME=%~dps0
rem find AXIS2_HOME if it does not exist due to either an invalid value passed
rem by the user or the %0 problem on Windows 9x
@@ -56,7 +53,7 @@
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
:setupArgs
-if ""%1""=="""" goto defaultParams
+if ""%1""=="""" goto runAxis2
if ""%1""==""-http"" goto httpport
if ""%1""==""-https"" goto httpsport
if ""%1""==""-name"" goto servername
@@ -82,10 +79,6 @@
shift
goto setupArgs
-:defaultParams
-set AXIS2_CMD_LINE_ARGS=-repo "%AXIS2_HOME%\repository" -conf
"%AXIS2_HOME%\repository\conf\axis2.xml"
-goto runAxis2
-
:noJavaHome
if "%_JAVACMD%" == "" set _JAVACMD=java.exe
echo JAVA_HOME environment variable is set incorrectly or Java runtime could
not be located.
@@ -118,7 +111,7 @@
echo Using AXIS2_HOME %AXIS2_HOME%
cd %AXIS2_HOME%
-"%_JAVACMD%" %_HTTPPORT% %_HTTPSPORT% %_SERVERNAME% %JAVA_OPTS% -cp
"%AXIS2_CLASS_PATH%" -Djava.endorsed.dirs="%AXIS2_ENDORSED%"
samples.util.SampleAxis2Server %AXIS2_CMD_LINE_ARGS%
+"%_JAVACMD%" %_HTTPPORT% %_HTTPSPORT% %_SERVERNAME% %JAVA_OPTS% -cp
"%AXIS2_CLASS_PATH%" -Djava.endorsed.dirs="%AXIS2_ENDORSED%"
samples.util.SampleAxis2Server -repo "%AXIS2_HOME%\repository" -conf
"%AXIS2_HOME%\repository\conf\axis2.xml"
goto end
:end
Modified: webservices/synapse/trunk/java/src/main/bin/synapse.bat
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/synapse.bat?view=diff&rev=535820&r1=535819&r2=535820
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/synapse.bat (original)
+++ webservices/synapse/trunk/java/src/main/bin/synapse.bat Mon May 7 02:43:17
2007
@@ -21,10 +21,7 @@
if "%OS%"=="WINNT" @setlocal
rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_SYNAPSE_HOME=%~dp0..
-
-if "%SYNAPSE_HOME%"=="" set SYNAPSE_HOME=%DEFAULT_SYNAPSE_HOME%
-set DEFAULT_SYNAPSE_HOME=
+set SYNAPSE_HOME=%~dps0..
set _USE_CLASSPATH=yes
set _SYNAPSE_XML=
@@ -40,14 +37,9 @@
if ""%1""==""-noclasspath"" goto clearclasspath
if ""%1""==""-xdebug"" goto xdebug
if ""%1""==""-port"" goto port
-set SYNAPSE_CMD_LINE_ARGS=%SYNAPSE_CMD_LINE_ARGS% %1
shift
goto setupArgs
-set SYNAPSE_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-
rem here is there is a -noclasspath in the options
:clearclasspath
set _USE_CLASSPATH=no
@@ -91,13 +83,7 @@
if "%JAVA_HOME%" == "" goto noJavaHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-if "%SYNAPSE_CMD_LINE_ARGS%" == "" goto defaultParams
-
-goto runSynapse
-
-:defaultParams
-set SYNAPSE_CMD_LINE_ARGS="%SYNAPSE_HOME%\repository"
+if "%_JAVACMD%" == "" set _JAVACMD="%JAVA_HOME%\bin\java.exe"
goto runSynapse
:noJavaHome
@@ -106,7 +92,7 @@
:runSynapse
rem set the classes by looping through the libs
setlocal EnableDelayedExpansion
-set SYNAPSE_CLASS_PATH="%SYNAPSE_HOME%/lib;%SYNAPSE_HOME%/repository/conf"
+set SYNAPSE_CLASS_PATH="%SYNAPSE_HOME%/lib";"%SYNAPSE_HOME%/repository/conf"
FOR %%C in ("%SYNAPSE_HOME%\lib\*.jar") DO set
SYNAPSE_CLASS_PATH=!SYNAPSE_CLASS_PATH!;"%%~fC"
set SYNAPSE_CLASS_PATH="%SYNAPSE_HOME%\lib";%SYNAPSE_CLASS_PATH%
@@ -137,7 +123,7 @@
echo Using JAVA_HOME: %JAVA_HOME%
echo Using SYNAPSE_XML: %_SYNAPSE_XML%
-"%_JAVACMD%" %_PORT% %_SYNAPSE_XML%
-Daxis2.xml="%SYNAPSE_HOME%\repository\conf\axis2.xml"
-Djava.endorsed.dirs=%SYNAPSE_ENDORSED% %_XDEBUG% -cp %SYNAPSE_CLASS_PATH%
org.apache.synapse.SynapseServer %SYNAPSE_CMD_LINE_ARGS%
+"%_JAVACMD%" %_PORT% %_SYNAPSE_XML%
-Daxis2.xml="%SYNAPSE_HOME%\repository\conf\axis2.xml"
-Djava.endorsed.dirs=%SYNAPSE_ENDORSED% %_XDEBUG% -cp %SYNAPSE_CLASS_PATH%
org.apache.synapse.SynapseServer "%SYNAPSE_HOME%\repository"
goto end
:end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
