Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ED81E934B for ; Wed, 21 Mar 2012 15:14:34 +0000 (UTC) Received: (qmail 16404 invoked by uid 500); 21 Mar 2012 15:14:34 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 16351 invoked by uid 500); 21 Mar 2012 15:14:34 -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 16343 invoked by uid 99); 21 Mar 2012 15:14:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2012 15:14:34 +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; Wed, 21 Mar 2012 15:14:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4EF4B2388860; Wed, 21 Mar 2012 15:14:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1303432 - /geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat Date: Wed, 21 Mar 2012 15:14:11 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120321151411.4EF4B2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Wed Mar 21 15:14:10 2012 New Revision: 1303432 URL: http://svn.apache.org/viewvc?rev=1303432&view=rev Log: GERONIMO-5560 Add maxPermSize to avoid OOM exception when starting server via windows service, for 2.1 Modified: geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat Modified: geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat?rev=1303432&r1=1303431&r2=1303432&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat (original) +++ geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat Wed Mar 21 15:14:10 2012 @@ -195,6 +195,11 @@ goto setArgs set SHUTDOWN_ARGS=--user#system#--password#manager :doneSetArgs +@REM Using default JAVA_OPTS if it's not set +if not "%JAVA_OPTS%" == "" goto skipDefaultJavaOpts +set JAVA_OPTS=-XX:MaxPermSize=256m +:skipDefaultJavaOpts + @REM Setup the Java programming language agent set JAVA_AGENT_JAR=%GERONIMO_HOME%\bin\jpa.jar set JAVA_AGENT_OPTS= @@ -212,7 +217,7 @@ set PR_STDERROR=%PR_LOGPATH%\geronimosrv @REM set jvm arguments to avoid killing the service when logging off, when using Sun JDK. set JVMARGS=-Xrs -"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartImage %JAVA_EXE% --StartPath "%GERONIMO_HOME%" --StartMode exe --StartParams %JVMARGS%#%JAVA_AGENT_OPTS%#-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed';'%JRE_HOME%\lib\endorsed"#-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext';'%JRE_HOME%\lib\ext"#-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"#-Djava.io.tmpdir="%GERONIMO_TMPDIR%"#-jar#"%GERONIMO_HOME%\bin\server.jar"#%STARTUP_ARGS% --StopImage %JAVA_EXE% --StopPath "%GERONIMO_HOME%" --StopMode exe --StopParams %JAVA_AGENT_OPTS%#-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed';'%JRE_HOME%\lib\endorsed"#-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext';'%JRE_HOME%\lib\ext"#-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"#-Djava.io.tmpdir="%GERONIMO_TMPDIR%"#-jar#"%GERONIMO_HOME%\bin\shutdown.jar"#%SHUTDOWN_ARGS% +"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartImage %JAVA_EXE% --StartPath "%GERONIMO_HOME%" --StartMode exe --StartParams %JVMARGS%#"%JAVA_OPTS%"#%JAVA_AGENT_OPTS%#-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed';'%JRE_HOME%\lib\endorsed"#-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext';'%JRE_HOME%\lib\ext"#-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"#-Djava.io.tmpdir="%GERONIMO_TMPDIR%"#-jar#"%GERONIMO_HOME%\bin\server.jar"#%STARTUP_ARGS% --StopImage %JAVA_EXE% --StopPath "%GERONIMO_HOME%" --StopMode exe --StopParams %JAVA_AGENT_OPTS%#-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed';'%JRE_HOME%\lib\endorsed"#-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext';'%JRE_HOME%\lib\ext"#-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"#-Djava.io.tmpdir="%GERONIMO_TMPDIR%"#-jar#"%GERONIMO_HOME%\bin\shutdown.jar"#%SHUTDOWN_ARGS% if not errorlevel 1 goto installed echo Failed to install "%SERVICE_NAME%" service. Refer to the log in var/log/geronimosrv.log goto end