You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/04/23 14:24:10 UTC
svn commit: r1589382 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/tomcat.nsi
webapps/docs/changelog.xml
Author: kkolinko
Date: Wed Apr 23 12:24:10 2014
New Revision: 1589382
URL: http://svn.apache.org/r1589382
Log:
Improvements to exe installer:
Specify explicit JVM memory sizes when installing the service (--JvmMs,
--JvmMx) with values of 128 Mb and 256 Mb respectively, the same as used
by service.bat file.
Explicitly specify --LogPath path when uninstalling Windows service. (The
default value for that option was "%SystemRoot%\System32\LogFiles\Apache".)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1589382&r1=1589381&r2=1589382&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 23 12:24:10 2014
@@ -28,16 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Improvements to exe installer:
- Specify explicit JVM memory sizes when installing the service (--JvmMs,
- --JvmMx) with values of 128 Mb and 256 Mb respectively, the same as used
- by service.bat file.
- Explicitly specify --LogPath path when uninstalling Windows service. (The
- default value for that option was "%SystemRoot%\System32\LogFiles\Apache".)
- https://people.apache.org/~kkolinko/patches/2014-04-11_tc6_tomcat_nsi.patch
- +1: kkolinko, markt, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Correct double unescaping
http://people.apache.org/~markt/patches/2014-04-17-attribute-escaping-tc6-v2.patch
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1589382&r1=1589381&r2=1589382&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Wed Apr 23 12:24:10 2014
@@ -318,7 +318,7 @@ Section -post
FileWrite $ServiceInstallLog "$\r$\n"
FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" //US//$TomcatServiceName --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
FileWrite $ServiceInstallLog "$\r$\n"
- FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" //US//$TomcatServiceName --StdOutput auto --StdError auto'
+ FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName" //US//$TomcatServiceName --StdOutput auto --StdError auto --JvmMs 128 --JvmMx 256'
FileWrite $ServiceInstallLog "$\r$\n"
FileClose $ServiceInstallLog
${EndIf}
@@ -326,7 +326,7 @@ Section -post
DetailPrint "Configuring $TomcatServiceName service"
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName" //US//$TomcatServiceName --Classpath "$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm'
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName" //US//$TomcatServiceName --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
- nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName" //US//$TomcatServiceName --StdOutput auto --StdError auto'
+ nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName" //US//$TomcatServiceName --StdOutput auto --StdError auto --JvmMs 128 --JvmMx 256'
${If} $TomcatShortcutAllUsers == "1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName" '"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
@@ -1099,7 +1099,7 @@ Section Uninstall
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceManagerFileName" //MQ//$TomcatServiceName'
; Delete Tomcat service
DetailPrint "Uninstalling $TomcatServiceName service"
- nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName" //DS//$TomcatServiceName'
+ nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName" //DS//$TomcatServiceName --LogPath "$INSTDIR\logs"'
ClearErrors
; Don't know if 32-bit or 64-bit registry was used so, for now, remove both
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1589382&r1=1589381&r2=1589382&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 23 12:24:10 2014
@@ -154,6 +154,14 @@
Remove svn keywords (such as $Id) from source files and documentation.
(kkolinko)
</scode>
+ <update>
+ Improvements to the Windows installer, to align it with installing
+ the sevice with <code>service.bat</code>. Use explicit memory sizes
+ (--JvmMs 128 Mb and --JvmMx 256 Mb). Specify log directory path
+ when ininstalling, so that the log file is written to the Tomcat logs
+ directory, instead of "%SystemRoot%\System32\LogFiles\Apache".
+ (kkolinko)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org