From d24589289c3b8119c6d42954bc816f6bc9d33ae6 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 23 Jun 2011 18:27:39 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1139029 13f79535-47bb-0310-9956-ffa450edef68 --- res/tomcat.nsi | 4 ++-- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index d0cef193d..2c74c2452 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -230,7 +230,7 @@ Section "Service Startup" SecTomcatService DetailPrint "Configuring Tomcat@VERSION_MAJOR@ service" nsExec::ExecToLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //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@VERSION_MAJOR@w.exe" //MS//Tomcat@VERSION_MAJOR@' + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@" '"$INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe" //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" diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index cd9e4b78c..747163129 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -217,6 +217,10 @@ + + 33262: Install monitor to auto-start for current user only + rather than all users to be consistent with menu item creation. (markt) + Clean up shell and batch scripts (improve consistency, clarify comments, add configtest command support for -- 2.11.0