Author: markt
Date: Wed Jan 14 15:00:49 2009
New Revision: 734543
URL: http://svn.apache.org/viewvc?rev=734543&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861
Use Apache Tomact 6 as service name
Consider wider replacement patch separately
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/service.bat
tomcat/tc6.0.x/trunk/res/tomcat.nsi
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=734543&r1=734542&r2=734543&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 15:00:49 2009
@@ -118,21 +118,6 @@
really old to me, so where would this come from ?)
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861
- Add major version number to Tomcat service name created by Windows installer
- http://svn.apache.org/viewvc?rev=710066&view=rev
- +1: markt, rjung, funkman
- -1:
- rjung: tomcat.nsi already uses replacement patterns like @vers...@.
- So it might be more robust, to add another replacement like
- VERSION_MAJOR or VERSION_MAIN to dist.xml resolving
- to ${version.major} or $version.major}.${version.minor}
- and then replace all occurences of "6" with @VERSION_MAJOR@
- or @version_m...@.
- rjung: Should be added to PR_DESCRIPTION in bin/service.bat as well.
- Just did that for trunk (r711934; but it contains also other changes).
- Caution: at the moment there's no @VERSION@ substitution for
service.bat.
-
* [4] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45154 (add
sendfile support to NIO/SSL) - performance improvement
http://svn.apache.org/viewvc?rev=720724&view=rev
http://svn.apache.org/viewvc?rev=720728&view=rev
Modified: tomcat/tc6.0.x/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/service.bat?rev=734543&r1=734542&r2=734543&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/service.bat Wed Jan 14 15:00:49 2009
@@ -57,7 +57,7 @@
rem Set default Service name
set SERVICE_NAME=Tomcat6
-set PR_DISPLAYNAME=Apache Tomcat
+set PR_DISPLAYNAME=Apache Tomcat 6
if "%1" == "" goto displayUsage
if "%2" == "" goto setServiceName
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=734543&r1=734542&r2=734543&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Wed Jan 14 15:00:49 2009
@@ -173,7 +173,7 @@
InstallRetry:
ClearErrors
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName
"Apache Tomcat" --Description "Apache Tomcat @VERSION@ Server -
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install
"$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath
"$INSTDIR"'
+ nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName
"Apache Tomcat 6" --Description "Apache Tomcat @VERSION@ Server -
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install
"$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath
"$INSTDIR"'
Pop $0
StrCmp $0 "0" InstallOk
MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
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=734543&r1=734542&r2=734543&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 15:00:49 2009
@@ -407,6 +407,10 @@
<subsection name="Other">
<changelog>
<fix>
+ <bug>41861</bug>: Update service name to Apache Tomcat 6 to prevent
+ conflicts with previous major Tomcat versions. (markt/rjung)
+ </fix>
+ <fix>
<bug>45852</bug>: Add special handling for cp932 (aka ms932) when
creating tomcat-users.xml with Windows installer. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
