You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/04/18 10:16:09 UTC
svn commit: r1094338 - in /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin: client.bat deploy.bat

Author: violalu
Date: Mon Apr 18 08:16:08 2011
New Revision: 1094338

URL: http://svn.apache.org/viewvc?rev=1094338&view=rev
Log:
GERONIMO-5881 add space support in deploy.bat and client.bat.

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/deploy.bat

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat?rev=1094338&r1=1094337&r2=1094338&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat Mon Apr 18 08:16:08 2011
@@ -134,6 +134,26 @@ set BASEDIR=%GERONIMO_HOME%
 call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
 if not %errorlevel% == 0 goto end
 
+@REM Handle spaces in provided paths.  Also strips off quotes.
+if defined var GERONIMO_HOME(
+set GERONIMO_HOME=###%GERONIMO_HOME%###
+set GERONIMO_HOME=%GERONIMO_HOME:"###=%
+set GERONIMO_HOME=%GERONIMO_HOME:###"=%
+set GERONIMO_HOME=%GERONIMO_HOME:###=%
+@)
+if defined var JRE_HOME(
+set JRE_HOME=###%JRE_HOME%###
+set JRE_HOME=%JRE_HOME:"###=%
+set JRE_HOME=%JRE_HOME:###"=%
+set JRE_HOME=%JRE_HOME:###=%
+@)
+if defined var _RUNJAVA(
+set _RUNJAVA=###%_RUNJAVA%###
+set _RUNJAVA=%_RUNJAVA:"###=%
+set _RUNJAVA=%_RUNJAVA:###"=%
+set _RUNJAVA=%_RUNJAVA:###=%
+@)
+
 if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
 set GERONIMO_TMPDIR=var\temp
 :gotTmpdir

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/deploy.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/deploy.bat?rev=1094338&r1=1094337&r2=1094338&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/deploy.bat (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/deploy.bat Mon Apr 18 08:16:08 2011
@@ -134,6 +134,26 @@ set BASEDIR=%GERONIMO_HOME%
 call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
 if not %errorlevel% == 0 goto end
 
+@REM Handle spaces in provided paths.  Also strips off quotes.
+if defined var GERONIMO_HOME(
+set GERONIMO_HOME=###%GERONIMO_HOME%###
+set GERONIMO_HOME=%GERONIMO_HOME:"###=%
+set GERONIMO_HOME=%GERONIMO_HOME:###"=%
+set GERONIMO_HOME=%GERONIMO_HOME:###=%
+@)
+if defined var JRE_HOME(
+set JRE_HOME=###%JRE_HOME%###
+set JRE_HOME=%JRE_HOME:"###=%
+set JRE_HOME=%JRE_HOME:###"=%
+set JRE_HOME=%JRE_HOME:###=%
+@)
+if defined var _RUNJAVA(
+set _RUNJAVA=###%_RUNJAVA%###
+set _RUNJAVA=%_RUNJAVA:"###=%
+set _RUNJAVA=%_RUNJAVA:###"=%
+set _RUNJAVA=%_RUNJAVA:###=%
+@)
+
 if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
 set GERONIMO_TMPDIR=var\temp
 :gotTmpdir