Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 63102 invoked from network); 22 Nov 2004 15:05:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 22 Nov 2004 15:05:05 -0000 Received: (qmail 62592 invoked by uid 500); 22 Nov 2004 15:03:03 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 62468 invoked by uid 500); 22 Nov 2004 15:03:01 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 62271 invoked by uid 500); 22 Nov 2004 15:03:00 -0000 Received: (qmail 62256 invoked by uid 99); 22 Nov 2004 15:03:00 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 22 Nov 2004 07:02:58 -0800 Received: (qmail 61453 invoked by uid 1670); 22 Nov 2004 15:02:55 -0000 Date: 22 Nov 2004 15:02:55 -0000 Message-ID: <20041122150255.61452.qmail@minotaur.apache.org> From: yoavs@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N yoavs 2004/11/22 07:02:55 Modified: . Tag: TOMCAT_5_0 tomcat.nsi webapps/docs Tag: TOMCAT_5_0 changelog.xml Log: Bugzilla 32282: modified Windows Uninstaller to only remove webapps/ROOT and webapps if user asks to remove everything. Revision Changes Path No revision No revision 1.45.2.2 +5 -5 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.45.2.1 retrieving revision 1.45.2.2 diff -u -r1.45.2.1 -r1.45.2.2 --- tomcat.nsi 2 Sep 2004 10:02:05 -0000 1.45.2.1 +++ tomcat.nsi 22 Nov 2004 15:02:54 -0000 1.45.2.2 @@ -553,12 +553,10 @@ RMDir "$INSTDIR\logs" RMDir /r "$INSTDIR\server" RMDir /r "$INSTDIR\webapps\balancer" - RMDir /r "$INSTDIR\webapps\ROOT" RMDir /r "$INSTDIR\webapps\tomcat-docs" RMDir /r "$INSTDIR\webapps\servlets-examples" RMDir /r "$INSTDIR\webapps\jsp-examples" RMDir /r "$INSTDIR\webapps\webdav" - RMDir "$INSTDIR\webapps" RMDir /r "$INSTDIR\work" RMDir /r "$INSTDIR\temp" RMDir /r "$INSTDIR\src" @@ -567,9 +565,11 @@ ; if $INSTDIR was removed, skip these next ones IfFileExists "$INSTDIR" 0 Removed MessageBox MB_YESNO|MB_ICONQUESTION \ - "Remove all files in your Tomcat 5.0 directory? (If you have anything\ + "Remove all files in your Tomcat 5.0 directory? (If you have anything \ you created that you want to keep, click No)" IDNO Removed - Delete "$INSTDIR\*.*" ; this would be skipped if the user hits no + RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user hits no + RMDir "$INSTDIR\webapps" + Delete "$INSTDIR\*.*" RMDir /r "$INSTDIR" Sleep 500 IfFileExists "$INSTDIR" 0 Removed No revision No revision 1.70.2.81 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.80 retrieving revision 1.70.2.81 diff -u -r1.70.2.80 -r1.70.2.81 --- changelog.xml 22 Nov 2004 14:54:56 -0000 1.70.2.80 +++ changelog.xml 22 Nov 2004 15:02:55 -0000 1.70.2.81 @@ -32,6 +32,9 @@ When the package protection is not used, do not create the doPrivileged objects so we don't suffer the performance hit. + + 32282: Modify Windows Uninstaller to remove webapps and webapps/ROOT only if user asks to remove everything. (yoavs) + --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org