Author: markt
Date: Thu Jun 23 18:27:39 2011
New Revision: 1139029
URL: http://svn.apache.org/viewvc?rev=1139029&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=33262
Install monitor to auto-start for current user only rather than all users to be
consistent with menu item creation.
Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1139029&r1=1139028&r2=1139029&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Jun 23 18:27:39 2011
@@ -230,7 +230,7 @@ Section "Service Startup" SecTomcatServi
DetailPrint "Configuring Tomcat@VERSION_MAJOR@ service"
nsExec::ExecToLog '"$INSTDIR\bin\tomcat@[email protected]"
//US//Tomcat@VERSION_MAJOR@ --Startup auto'
; Behave like Apache Httpd (put the icon in tray on login)
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@"
'"$INSTDIR\bin\tomcat@[email protected]" //MS//Tomcat@VERSION_MAJOR@'
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@"
'"$INSTDIR\bin\tomcat@[email protected]" //MS//Tomcat@VERSION_MAJOR@'
ClearErrors
@@ -917,7 +917,7 @@ Section Uninstall
DeleteRegKey HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat
@VERSION_MAJOR_MINOR@"
DeleteRegKey HKLM "SOFTWARE\Apache Software
Foundation\Tomcat\@VERSION_MAJOR_MINOR@"
- DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@"
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@"
RMDir /r "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@"
Delete "$INSTDIR\tomcat.ico"
Delete "$INSTDIR\LICENSE"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1139029&r1=1139028&r2=1139029&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 23 18:27:39 2011
@@ -217,6 +217,10 @@
</subsection>
<subsection name="Other">
<changelog>
+ <fix>
+ <bug>33262</bug>: Install monitor to auto-start for current user only
+ rather than all users to be consistent with menu item creation. (markt)
+ </fix>
<update>
Clean up shell and batch scripts (improve consistency,
clarify comments, add <code>configtest</code> command support for
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
