Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 49897 invoked from network); 29 Mar 2011 09:11:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Mar 2011 09:11:08 -0000 Received: (qmail 70269 invoked by uid 500); 29 Mar 2011 09:11:08 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 70228 invoked by uid 500); 29 Mar 2011 09:11:08 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 70221 invoked by uid 99); 29 Mar 2011 09:11:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Mar 2011 09:11:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Mar 2011 09:11:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 18F8923889E3; Tue, 29 Mar 2011 09:10:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1086524 - /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat Date: Tue, 29 Mar 2011 09:10:47 -0000 To: scm@geronimo.apache.org From: violalu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110329091047.18F8923889E3@eris.apache.org> Author: violalu Date: Tue Mar 29 09:10:46 2011 New Revision: 1086524 URL: http://svn.apache.org/viewvc?rev=1086524&view=rev Log: GERONIMO-5881 Remove double quotes, now space and parenthesis works fine on winxp, win2008 Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat?rev=1086524&r1=1086523&r2=1086524&view=diff ============================================================================== --- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat (original) +++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat Tue Mar 29 09:10:46 2011 @@ -171,6 +171,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:###=% +@) + @REM Using default JAVA_OPTS if it's not set if not "%JAVA_OPTS%" == "" goto skipDefaultJavaOpts set JAVA_OPTS=-Xmx256m -XX:MaxPermSize=128m