Author: kkolinko
Date: Thu Aug 4 10:25:38 2011
New Revision: 1153834
URL: http://svn.apache.org/viewvc?rev=1153834&view=rev
Log:
Various improvements to the Windows installer.
Completing the patch,
svn rm res/confinstall/server_1.xml
svn rm res/confinstall/server_2.xml
svn rm res/tickno.bmp
svn rm res/tickyes.bmp
svn rm res/main.ico
svn rm res/uninst.ico
Add issue numbers to changelog and remove item from STATUS.
Removed:
tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml
tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml
tomcat/tc6.0.x/trunk/res/main.ico
tomcat/tc6.0.x/trunk/res/tickno.bmp
tomcat/tc6.0.x/trunk/res/tickyes.bmp
tomcat/tc6.0.x/trunk/res/uninst.ico
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1153834&r1=1153833&r2=1153834&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Aug 4 10:25:38 2011
@@ -119,35 +119,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, kfujino
-1:
-* Multiple improvements to the Windows Installer
- - 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.
- - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40510
- Provide an option to install shortcuts for the current user or all users.
- Also ensure registry is correctly cleaned on uninstall for 64-bit
platforms.
- - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
- Provide the ability to specify the AJP port and service name when
installing
- Tomcat using the Windows installer. This permits multiple instances of the
- same Tomcat version to be installed side-by-side.
- - 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.
- - Simplify the installer by using search and replace for server.xml
- - Provide the ability to configure the shutdown port
- - Provide service name and port validation
- 1) Commands to remove files - removal of binaries cannot be expressed by the
patch
- svn rm res/confinstall/server_1.xml
- svn rm res/confinstall/server_2.xml
- svn rm res/tickno.bmp
- svn rm res/tickyes.bmp
- svn rm res/main.ico
- svn rm res/uninst.ico
- 2)
http://people.apache.org/~kkolinko/patches/2011-08-03_tc6_windows-installer_v2.patch
- +1: kkolinko, markt
- -1:
-
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49929
No definitive information that this is the fix but back-porting Mladen's fix
from 7.0.x can't hurt and may help
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1153834&r1=1153833&r2=1153834&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Aug 4 10:25:38 2011
@@ -349,6 +349,15 @@
Clarify error messages in *.sh files to mention that if a script is
not found it might be because execute permission is needed. (kkolinko)
</update>
+ <add>
+ <bug>33262</bug>, <bug>40510</bug>, <bug>50949</bug>, <bug>51135</bug>:
+ Various improvements to the Windows installer to be able to install
+ several copies of Tomcat 6 side by side. Allow to configure service
+ name, connector and shutdown ports. Allow to choose whether to install
+ Start menu shortcuts and Apache Tomcat monitor application for all
+ users or for the current one only. Improve server.xml file handling.
+ Fix uninstallation icon. (markt/kkolinko)
+ </add>
<fix>
<bug>50854</bug>: Add additional entries to the default catalina.policy
file to support running the manager web application from CATALINA_HOME
@@ -378,14 +387,6 @@
At build time use two alternative download locations for components
downloaded from apache.org. (kkolinko)
</update>
- <add>
- Various improvements to the Windows installer to be able to install
- several copies of Tomcat 6 side by side. Allow to configure service
- name, connector and shutdown ports. Allow to choose whether to install
- Start menu shortcuts and Apache Tomcat monitor application for all
- users or for the current one only. Improve server.xml file handling.
- Fix uninstallation icon. (markt/kkolinko)
- </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
