Author: rjung
Date: Thu Jan 14 09:44:28 2010
New Revision: 899134
URL: http://svn.apache.org/viewvc?rev=899134&view=rev
Log:
Remove hard coded version numbers and instead apply version filter
already defined in ant scripts.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/service.bat
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/conf/catalina.policy
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/res/welcome.bin.html
tomcat/tc6.0.x/trunk/res/welcome.main.html
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=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 14 09:44:28 2010
@@ -106,30 +106,6 @@
The 'set "a=%b%"' trick is nice, because if you only use the quotation
marks around the rhs, Windows actually adds them to the value of 'a'.
-* Remove hard coded version numbers and instead apply version filter
- already defined in ant scripts.
- Backport from trunk of
- http://svn.apache.org/viewvc?rev=711934&view=rev
- http://svn.apache.org/viewvc?rev=712053&view=rev
- Complete patch applicable to TC6:
- http://people.apache.org/~rjung/patches/tc6-version_filter.patch
- +1: rjung, yoavs, kkolinko (with exception of text files)
- -1:
- kkolinko: (
- -0 for changes of the *.txt files:
- - RELEASE-NOTES
- - RUNNING.txt
- - BUILDING.txt
-
- 1) I see no point. These are specific for the major.minor branch.
- Turning them into a template looks wrong.
- I do not expect doing merges to these files.
- 2) It results in an unfiltered BUILDING.txt in our src bundles. That
- is not pretty. This also affects our TC 7 builds.
-
- +1 for all the other changes
- )
-
* Fix various EL issues (with test cases) including BZ47413#c8 & BZ48112
The actual fixes
svn copy
https://svn.apache.org/repos/asf/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
Modified: tomcat/tc6.0.x/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/service.bat?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/service.bat Thu Jan 14 09:44:28 2010
@@ -19,7 +19,7 @@
rem NT Service Install/Uninstall script
rem
rem Options
-rem install Install the service using Tomcat6 as service name.
+rem install Install the service using tom...@version_major@ as
service name.
rem Service is installed using default settings.
rem remove Remove the service from the System.
rem
@@ -33,12 +33,12 @@
set CURRENT_DIR=%cd%
if not "%CATALINA_HOME%" == "" goto gotHome
set CATALINA_HOME=%cd%
-if exist "%CATALINA_HOME%\bin\tomcat6.exe" goto okHome
+if exist "%catalina_home%\bin\tom...@[email protected]" goto okHome
rem CD to the upper dir
cd ..
set CATALINA_HOME=%cd%
:gotHome
-if exist "%CATALINA_HOME%\bin\tomcat6.exe" goto okHome
+if exist "%catalina_home%\bin\tom...@[email protected]" goto okHome
echo The tomcat.exe was not found...
echo The CATALINA_HOME environment variable is not defined correctly.
echo This environment variable is needed to run this program
@@ -53,11 +53,11 @@
set CATALINA_BASE=%CATALINA_HOME%
:gotBase
-set EXECUTABLE=%CATALINA_HOME%\bin\tomcat6.exe
+set executable=%catalina_home%\bin\tom...@[email protected]
rem Set default Service name
-set SERVICE_NAME=Tomcat6
-set PR_DISPLAYNAME=Apache Tomcat 6
+set service_name=tom...@version_major@
+set PR_DISPLAYNAME=Apache Tomcat @VERSION_MAJOR@
if "%1" == "" goto displayUsage
if "%2" == "" goto setServiceName
@@ -89,7 +89,7 @@
rem Use the environment variables as an example
rem Each command line option is prefixed with PR_
-set PR_DESCRIPTION=Apache Tomcat Server - http://tomcat.apache.org/
+set PR_DESCRIPTION=Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/
set PR_INSTALL=%EXECUTABLE%
set PR_LOGPATH=%CATALINA_BASE%\logs
set
PR_CLASSPATH=%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Jan 14 09:44:28 2010
@@ -24,12 +24,12 @@
# $Id$
# -----------------------------------------------------------------------------
-# ----- Vesion Control Flags -----
+# ----- Version Control Flags -----
version.major=6
version.minor=0
version.build=0
version.patch=0
-version=6.0-snapshot
+version.suffix=-dev
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Jan 14 09:44:28 2010
@@ -44,7 +44,9 @@
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
- <property name="version" value="6.0.0-dev" />
+ <property name="version.suffix" value="-dev" />
+
+ <property name="version"
value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.major.minor"
value="${version.major}.${version.minor}" />
@@ -86,8 +88,8 @@
<property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
<property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
- <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" />
- <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" />
+ <property name="tomcat-dbcp.home"
value="${base.path}/tomcat${version.major}-deps/dbcp" />
+ <property name="jasper-jdt.home"
value="${base.path}/tomcat${version.major}-deps/jdt" />
<property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
<available property="tomcat-dbcp.present" file="${tomcat-dbcp.jar}" />
Modified: tomcat/tc6.0.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.policy?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc6.0.x/trunk/conf/catalina.policy Thu Jan 14 09:44:28 2010
@@ -14,7 +14,7 @@
// limitations under the License.
// ============================================================================
-// catalina.corepolicy - Security Policy Permissions for Tomcat 6
+// catalina.corepolicy - Security Policy Permissions for Tomcat @VERSION_MAJOR@
//
// This file contains a default set of security policies to be enforced (by the
// JVM) when Catalina is executed with the "-security" option. In addition
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Jan 14 09:44:28 2010
@@ -44,7 +44,9 @@
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
- <property name="version" value="6.0.0-dev" />
+ <property name="version.suffix" value="-dev" />
+
+ <property name="version"
value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.major.minor"
value="${version.major}.${version.minor}" />
@@ -81,8 +83,8 @@
<property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
<property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
- <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" />
- <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" />
+ <property name="tomcat-dbcp.home"
value="${base.path}/tomcat${version.major}-deps/dbcp" />
+ <property name="jasper-jdt.home"
value="${base.path}/tomcat${version.major}-deps/jdt" />
<property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
@@ -220,8 +222,9 @@
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/api"
author="true" version="true"
- windowtitle="Tomcat API Documentation"
- doctitle="Tomcat API"
+ windowtitle="Apache Tomcat ${version} API Documentation"
+ doctitle="Apache Tomcat ${version} API"
+ header="<b>Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
additionalparam="-breakiterator"
maxmemory="256m" >
@@ -612,13 +615,13 @@
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="tomcat-6.0-doc">
+ <tarfileset dir="${tomcat.dist}"
prefix="tomcat-${version.major.minor}-doc">
<include name="LICENSE" />
<include name="NOTICE" />
<include name="README.txt" />
<include name="RUNNING.txt" />
</tarfileset>
- <tarfileset dir="${tomcat.dist}/webapps/docs" prefix="tomcat-6.0-doc">
+ <tarfileset dir="${tomcat.dist}/webapps/docs"
prefix="tomcat-${version.major.minor}-doc">
<include name="**" />
</tarfileset>
</tar>
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Thu Jan 14 09:44:28 2010
@@ -44,7 +44,9 @@
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
- <property name="version" value="6.0.0-dev" />
+ <property name="version.suffix" value="-dev" />
+
+ <property name="version"
value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.major.minor"
value="${version.major}.${version.minor}" />
@@ -82,8 +84,8 @@
<property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
<property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
- <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" />
- <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" />
+ <property name="tomcat-dbcp.home"
value="${base.path}/tomcat${version.major}-deps/dbcp" />
+ <property name="jasper-jdt.home"
value="${base.path}/tomcat${version.major}-deps/jdt" />
<property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Jan 14 09:44:28 2010
@@ -48,8 +48,8 @@
!define MUI_HEADERIMAGE_BITMAP header.bmp
!define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt"
- !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat6w.exe
- !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat6
+ !define MUI_FINISHPAGE_RUN $instdir\bin\tom...@[email protected]
+ !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//tom...@version_major@
!define MUI_FINISHPAGE_NOREBOOTSUPPORT
!define MUI_ABORTWARNING
@@ -109,7 +109,7 @@
!insertmacro MUI_LANGUAGE English
;Folder-select dialog
- InstallDir "$PROGRAMFILES\Apache Software Foundation\Tomcat 6.0"
+ InstallDir "$PROGRAMFILES\Apache Software Foundation\Tomcat
@VERSION_MAJOR_MINOR@"
;Install types
InstType Normal
@@ -117,7 +117,7 @@
InstType Full
; Main registry key
- InstallDirRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" ""
+ InstallDirRegKey HKLM "SOFTWARE\Apache Software
foundation\tomc...@version_major_minor@" ""
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
ReserveFile "jvm.ini"
@@ -183,7 +183,7 @@
InstallRetry:
ClearErrors
- 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"'
+ nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//IS//tom...@version_major@ --DisplayName "Apache Tomcat @VERSION_MAJOR@"
--Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/";
--LogPath "$INSTDIR\logs" --Install "$instdir\bin\tom...@[email protected]"
--Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
Pop $0
StrCmp $0 "0" InstallOk
MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
@@ -210,9 +210,9 @@
Call findJVMPath
Pop $2
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Startup auto'
+ nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --Startup auto'
; Behave like Apache Httpd (put the icon in tray on login)
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor" '"$INSTDIR\bin\tomcat6w.exe" //MS//Tomcat6'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor" '"$instdir\bin\tom...@[email protected]"
//MS//tom...@version_major@'
ClearErrors
@@ -253,48 +253,48 @@
!insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
- SetOutPath "$SMPROGRAMS\Apache Tomcat 6.0"
+ SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@"
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Home Page.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\tomcat Home
Page.lnk" \
"http://tomcat.apache.org/";
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Welcome.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\welcome.lnk"
\
"http://localhost:$R0/";
; IfFileExists "$INSTDIR\webapps\admin" 0 NoAdminApp
;
-; CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Administration.lnk" \
+; CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\tomcat
Administration.lnk" \
; "http://localhost:$R0/admin/";
;NoAdminApp:
IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Manager.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\tomcat
Manager.lnk" \
"http://localhost:$R0/manager/html";
NoManagerApp:
IfFileExists "$INSTDIR\webapps\webapps\tomcat-docs" 0 NoDocumentaion
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Documentation.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\tomcat
Documentation.lnk" \
"$INSTDIR\webapps\tomcat-docs\index.html"
NoDocumentaion:
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Uninstall Tomcat 6.0.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\uninstall
Tomcat @[email protected]" \
"$INSTDIR\Uninstall.exe"
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat 6.0 Program
Directory.lnk" \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\tomcat
@VERSION_MAJOR_MINOR@ Program Directory.lnk" \
"$INSTDIR"
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Monitor Tomcat.lnk" \
- "$INSTDIR\bin\tomcat6w.exe" \
- '//MS//Tomcat6' \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\monitor
Tomcat.lnk" \
+ "$instdir\bin\tom...@[email protected]" \
+ '//MS//tom...@version_major@' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
- CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Configure Tomcat.lnk" \
- "$INSTDIR\bin\tomcat6w.exe" \
- '//ES//Tomcat6' \
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat @version_major_mi...@\configure
Tomcat.lnk" \
+ "$instdir\bin\tom...@[email protected]" \
+ '//ES//tom...@version_major@' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
SectionEnd
@@ -368,16 +368,16 @@
;SectionEnd
Section -post
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Classpath
"$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start
--StopParams stop --StartMode jvm --StopMode jvm'
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"
--StdOutput auto --StdError auto'
+ nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --Classpath "$INSTDIR\bin\bootstrap.jar"
--StartClass org.apache.catalina.startup.Bootstrap --StopClass
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
--StartMode jvm --StopMode jvm'
+ nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//US//tom...@version_major@ --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"
--StdOutput auto --StdError auto'
WriteUninstaller "$INSTDIR\Uninstall.exe"
- WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0"
"InstallPath" $INSTDIR
- WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" "Version"
@VERSION@
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache
Tomcat 6.0" \
- "DisplayName" "Apache Tomcat 6.0 (remove only)"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache
Tomcat 6.0" \
+ WriteRegStr HKLM "SOFTWARE\Apache Software
foundation\tomc...@version_major_minor@" "InstallPath" $INSTDIR
+ WriteRegStr HKLM "SOFTWARE\Apache Software
foundation\tomc...@version_major_minor@" "Version" @VERSION@
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache
Tomcat @VERSION_MAJOR_MINOR@" \
+ "DisplayName" "Apache Tomcat @VERSION_MAJOR_MINOR@ (remove
only)"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache
Tomcat @VERSION_MAJOR_MINOR@" \
"UninstallString" '"$INSTDIR\Uninstall.exe"'
SectionEnd
@@ -766,16 +766,16 @@
Delete "$INSTDIR\Uninstall.exe"
; Stop Tomcat service monitor if running
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6w.exe" //MQ//Tomcat6'
+ nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//MQ//tom...@version_major@'
; Delete Tomcat service
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //DS//Tomcat6'
+ nsExec::ExecToLog '"$instdir\bin\tom...@[email protected]"
//DS//tom...@version_major@'
ClearErrors
DeleteRegKey HKCR "JSPFile"
- DeleteRegKey HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 6.0"
- DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0"
+ DeleteRegKey HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat
@VERSION_MAJOR_MINOR@"
+ DeleteRegKey HKLM "SOFTWARE\Apache Software
foundation\tomc...@version_major_minor@"
DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor"
- RMDir /r "$SMPROGRAMS\Apache Tomcat 6.0"
+ RMDir /r "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@"
Delete "$INSTDIR\tomcat.ico"
Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\NOTICE"
@@ -796,7 +796,7 @@
; if $INSTDIR was removed, skip these next ones
IfFileExists "$INSTDIR" 0 Removed
MessageBox MB_YESNO|MB_ICONQUESTION \
- "Remove all files in your Tomcat 6.0 directory? (If you have anything \
+ "Remove all files in your Tomcat @VERSION_MAJOR_MINOR@ directory? (If
you have anything \
you created that you want to keep, click No)" IDNO Removed
RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user hits
no
RMDir "$INSTDIR\webapps"
Modified: tomcat/tc6.0.x/trunk/res/welcome.bin.html
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/welcome.bin.html?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/welcome.bin.html (original)
+++ tomcat/tc6.0.x/trunk/res/welcome.bin.html Thu Jan 14 09:44:28 2010
@@ -26,8 +26,8 @@
<ul>
<li><a href="../RELEASE-NOTES">Release notes</a>, with important information
about known issues</li>
-<li><a
href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html";>Changelog</a></li>
-<li><a
href="http://tomcat.apache.org/tomcat-6.0-doc/status.html";>Status</a></li>
+<li><a
href="http://tomcat.apache.org/tomc...@version_major_minor@-doc/changelog.html";>Changelog</a></li>
+<li><a
href="http://tomcat.apache.org/tomc...@version_major_minor@-doc/status.html";>Status</a></li>
</ul>
</p>
@@ -36,7 +36,7 @@
of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
these files.</b></P>
-<p><font color="red">Tomcat 6.0 requires JRE 5.0 or later. Read the
+<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires JRE 5.0 or later.
Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
</font></p>
Modified: tomcat/tc6.0.x/trunk/res/welcome.main.html
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/welcome.main.html?rev=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/welcome.main.html (original)
+++ tomcat/tc6.0.x/trunk/res/welcome.main.html Thu Jan 14 09:44:28 2010
@@ -26,8 +26,8 @@
<ul>
<li><a href="RELEASE-NOTES">Release notes</a>, with important information
about known issues</li>
-<li><a
href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html";>Changelog</a></li>
-<li><a
href="http://tomcat.apache.org/tomcat-6.0-doc/status.html";>Status</a></li>
+<li><a
href="http://tomcat.apache.org/tomc...@version_major_minor@-doc/changelog.html";>Changelog</a></li>
+<li><a
href="http://tomcat.apache.org/tomc...@version_major_minor@-doc/status.html";>Status</a></li>
</ul>
</p>
@@ -36,7 +36,7 @@
of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
these files.</b></P>
-<p><font color="red">Tomcat 6.0 requires JRE 5.0 or later. Read the
+<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires JRE 5.0 or later.
Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
</font></p>
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=899134&r1=899133&r2=899134&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 14 09:44:28 2010
@@ -98,6 +98,10 @@
<subsection name="Other">
<changelog>
<fix>
+ Remove hard coded version numbers and instead apply version filter
+ already defined in ant scripts. (rjung)
+ </fix>
+ <fix>
<bug>47609</bug>: Correct regression in previous fix. (markt)
</fix>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
