Author: markt
Date: Thu Dec 15 15:56:38 2011
New Revision: 1214818
URL: http://svn.apache.org/viewvc?rev=1214818&view=rev
Log:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059
Fix a typo in Windows uninstaller:
Do not forget to remove Tomcat keys from 32-bit registry on deinstallation.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/tomcat.nsi
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1214818&r1=1214817&r2=1214818&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 15 15:56:38 2011
@@ -27,13 +27,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK/
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059
- http://svn.apache.org/viewvc?rev=1186763&view=rev
- Fix a typo in Windows uninstaller:
- Do not forget to remove Tomcat keys from 32-bit registry on deinstallation.
- +1: kkolinko, rjung, markt
- -1:
-
* Make configuration issue for RemoteAddrValve, RemoteHostValve result
in the failure of the valve rather than just a warning message.
Ensure changes to the configuration of these valves via JMX are thread-safe.
Modified: tomcat/tc5.5.x/trunk/build/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/tomcat.nsi?rev=1214818&r1=1214817&r2=1214818&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/tomcat.nsi (original)
+++ tomcat/tc5.5.x/trunk/build/tomcat.nsi Thu Dec 15 15:56:38 2011
@@ -1134,7 +1134,7 @@ Section Uninstall
; Don't know if 32-bit or 64-bit registry was used so, for now, remove both
SetRegView 32
DeleteRegKey HKLM
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat
@VERSION_MAJOR_MINOR@ $TomcatServiceName"
- DeleteRegKey HKLM "SOFTWARE\Apache Software
Foundation\Tomcat\@VERSION_MAJOR_MINOR@ $TomcatServiceName"
+ DeleteRegKey HKLM "SOFTWARE\Apache Software
Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName"
DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
SetRegView 64
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1214818&r1=1214817&r2=1214818&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Dec 15
15:56:38 2011
@@ -37,7 +37,7 @@
<body>
<!-- Section names:
- General, Catalina, Coyote, Jasper, Cluster, Webapps
+ General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
<section name="Tomcat 5.5.35 (jim)" rtext="">
<subsection name="General">
@@ -60,6 +60,14 @@
</update>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>52059</bug>: Ensure Windows registry keys are removed when using
+ the un-install option of the Windows installer. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 5.5.34 (jim)" rtext="released 2011-09-22">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
