svn commit: r1153075 - in /tomcat/trunk: res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Aug  2 09:22:24 2011
New Revision: 1153075

URL: http://svn.apache.org/viewvc?rev=1153075&view=rev
Log:
Prevent direct invocation of the Windows uninstaller without a service name 
from executing since the uninstall will not be complete.

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=1153075&r1=1153074&r2=1153075&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Tue Aug  2 09:22:24 2011
@@ -1085,6 +1085,14 @@ FunctionEnd
 
 Section Uninstall
 
+  ${If} $TomcatServiceName == ""
+    MessageBox MB_ICONSTOP|MB_OK \
+        "No service name specified to uninstall. This will be provided 
automatically if you uninstall via \
+         Add/Remove Programs or the shortcut on the Start menu. Alternatively, 
call the installer from \
+         the command line with -serviceName=$\"<name of service>$\"."
+    Quit
+  ${EndIf}
+  
   Delete "$INSTDIR\Uninstall.exe"
 
   ; Stop Tomcat service monitor if running

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1153075&r1=1153074&r2=1153075&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug  2 09:22:24 2011
@@ -244,6 +244,11 @@
         Correctly handle uninstall with the Windows installer of the service is
         installed with a name that contains a &apos;-&apos; character. (markt)
       </fix>
+      <fix>
+        <bug>51598</bug>: Prevent direct invocation of the Windows uninstaller
+        without a service name from executing since the uninstall will not be
+        complete. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org