Updated patch to address kkolinko's concerns along with a handful of similar issues I spotted with a more careful review of the diff.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk@1160258 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS.txt b/STATUS.txt
index e708c89..5cff43b 100644
--- a/STATUS.txt
+++ b/STATUS.txt
@@ -39,7 +39,7 @@
- Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51135
Fix auto-detection of JAVA_HOME for 64-bit Windows platforms that only have
a 32-bit JVM installed.
- http://people.apache.org/~markt/patches/2011-08-16-windows-installer-tc55.patch
+ http://people.apache.org/~markt/patches/2011-08-22-windows-installer-tc55.patch
Plus
svn rm build/resources/confinstall/server_1.xml
svn rm build/resources/confinstall/server_2.xml
@@ -48,20 +48,7 @@
svn rm build/resources/main.ico
svn rm build/resources/uninst.ico
+1: markt
- -1: kkolinko:
- 1) Minor glitch in TEXT_JVM_LABEL1 message: s/Java SE 1.4/Java SE 5.0/
- like it was before, because this installer does not install "compatibility"
- package that allows to run on 1.4 JVM and thus 5.0 is required.
- 2) The following was removed:
- LangString DESC_SecWebapps ${LANG_ENGLISH} "Installs other utility web applications (WebDAV, balancer, etc)."
- as well as the SecWebapps section.
- 3) The following line:
- SetOutPath $INSTDIR\lib
- is for TC6+. The code for 5.5 in that place was different.
- 4) In Function un.onInit:
- ${GetOPtions} $R0 "-ServiceName=" $R1
- s/OPtions/Options/
- We have the same in TC6. Apparently NSIS is case-insensitive here.
+ -1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51550
Display error page rather than an empty response for an IllegalStateException
