Author: andygumbrecht
Date: Thu May 16 08:00:22 2013
New Revision: 1483225
URL: http://svn.apache.org/r1483225
Log:
Fix/modify service parameters.
Modified:
tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat
tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/service.bat
Modified:
tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat?rev=1483225&r1=1483224&r2=1483225&view=diff
==============================================================================
---
tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat
(original)
+++
tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/service.install.as.admin.bat
Thu May 16 08:00:22 2013
@@ -128,12 +128,15 @@ REM Extensive documentation can be found
--StartMode=jvm ^
--StartClass=org.apache.openejb.daemon.NTService --StartMethod=start ^
--StopMode=jvm ^
+ --JvmMs=512 ^
+ --JvmMx=1024 ^
+ --JvmSs=2048 ^
--StopClass=org.apache.openejb.daemon.NTService --StopMethod=stop ^
--LogPrefix=service ^
--LogPath="%logs%" --StdOutput="%logs%\service.out.log"
--StdError="%logs%\service.err.log" --PidFile=service.pid ^
--LogLevel=Info ^
--LibraryPath="%openejb%\bin" ^
-
++JvmOptions=-Dopenejb.home="%openejb%";-Xms128M;-Xmx512M;-XX:MaxPermSize=256M
+ ++JvmOptions=-Dopenejb.home="%openejb%";-XX:MaxPermSize=256M
REM ++DependsOn=AnotherServiceName
REM Add ^ symbol to end of ++JvmOptions line if ++DependsOn is
uncommented
Modified: tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/service.bat
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/service.bat?rev=1483225&r1=1483224&r2=1483225&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/service.bat
(original)
+++ tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/service.bat Thu May
16 08:00:22 2013
@@ -17,6 +17,16 @@ rem limitations under the License.
rem The following line can be used to define a specific jre or jdk path
rem set "JAVA_HOME=C:/JDK"
+REM Prefer a local JRE if we find one in the current bin directory
+IF EXIST "%~dp0jre" (
+ SET "JRE_HOME=%~dp0jre"
+)
+
+REM Prefer a local JDK if we find one in the current bin directory
+IF EXIST "%~dp0jdk" (
+ SET "JAVA_HOME=%~dp0jdk"
+)
+
@IF NOT "%ECHO%" == "" ECHO %ECHO%
@IF "%OS%" == "Windows_NT" setlocal
@@ -173,6 +183,11 @@ echo Using JVM: "%PR_JVM%"
--StartParams start ^
--StopParams stop ^
--Startup auto ^
+ --JvmMs=512 ^
+ --JvmMx=1024 ^
+ --JvmSs=2048 ^
+ --StartMode jvm ^
+ --StopMode jvm ^
--LogLevel Info ^
--LogPrefix TomEE
@@ -193,9 +208,7 @@ set PR_JVM=
rem Set extra parameters
"%EXECUTABLE%" //US//%SERVICE_NAME% ^
- ++JvmOptions
"-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed"
^
- --StartMode jvm ^
- --StopMode jvm
+ ++JvmOptions
"-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed"
rem More extra parameters
set "PR_LOGPATH=%CATALINA_BASE%\logs"
@@ -205,7 +218,7 @@ set PR_STDERROR=auto
rem before this option was added:
"++JvmOptions=-Djava.library.path="%CATALINA_BASE%\bin" ^"
rem the drawback was it was preventing custom native lib to be loaded even if
added to Path
"%EXECUTABLE%" //US//%SERVICE_NAME% ^
- ++JvmOptions
"-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties;-Djava.awt.headless=true;-XX:+UseParallelGC;-XX:MaxPermSize=256M;-Xss2048k;-Xmx1024m"
+ ++JvmOptions
"-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties;-Djava.awt.headless=true;-XX:+UseParallelGC;-XX:MaxPermSize=256M"
echo The service '%SERVICE_NAME%' has been installed.
