From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 6 Nov 2008 18:34:50 +0000 (+0000)
Subject: Using @-patterns in the non-docs files and
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5cfee91c52d03bc2317100d73325f6ad4913cdee;p=tomcat7.0

Using @-patterns in the non-docs files and
ant filters to replace the major version and also
major.minor.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711934 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/BUILDING.txt b/BUILDING.txt
index e569bf2cb..f5f199a84 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -18,10 +18,10 @@
 $Id$
 
             ====================================================
-            Building The Apache Tomcat 6.0 Servlet/JSP Container
+            Building The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP Container
             ====================================================
 
-This subproject contains the source code for Tomcat 6.0, a container that
+This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a container that
 implements the Servlet 2.5 and JSP 2.1 specifications from the Java
 Community Process <http://www.jcp.org/>.  In order to build a binary
 distribution version of the container from a source distribution, 
@@ -64,19 +64,19 @@ do the following:
   available, which will be used to actually perform the build.
 
 
-(2) Building Tomcat 6.0
+(2) Building Tomcat @VERSION_MAJOR_MINOR@
 
-(2.1) Checkout or obtain the source code for Tomcat 6.0
+(2.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@
 
 * Tomcat SVN repository URL:
-  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/
+  http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/
 
 * Download a source package from:
   http://tomcat.apache.org/download-60.cgi
 
 * Checkout the source using SVN, selecting the desired version or
   branch (current development source is at 
-  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/), or 
+  http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/), or 
   unpack the source package. The location where the source has been
   placed will be referred as ${tomcat.source}.
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b42b1048e..7b11ef55d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -41,9 +41,9 @@ KNOWN ISSUES IN THIS RELEASE:
 ===================
 Dependency Changes:
 ===================
-Tomcat 6.0 is designed to run on JSE 5.0 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on JSE 5.0 and later.
 
-In addition, Tomcat 6.0 uses the Eclipse JDT Java compiler for compiling
+In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler for compiling
 JSP pages.  This means you no longer need to have the complete
 Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
 (JRE) is sufficient.  The Eclipse JDT Java compiler is bundled with the 
@@ -76,7 +76,7 @@ during the lifetime of a particular JVM.
 =============
 Bundled APIs:
 =============
-A standard installation of Tomcat 6.0 makes all of the following APIs available
+A standard installation of Tomcat @VERSION_MAJOR_MINOR@ makes all of the following APIs available
 for use by web applications (by placing them in "lib"):
 * annotations-api.jar (Annotations package)
 * catalina.jar (Tomcat Catalina implementation)
diff --git a/RUNNING.txt b/RUNNING.txt
index 3b02f1534..3cbcddb02 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -18,10 +18,10 @@
 $Id$
 
             ===================================================
-            Running The Apache Tomcat 6.0 Servlet/JSP Container
+            Running The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP Container
             ===================================================
 
-Apache Tomcat 6.0 requires the Java 2 Standard Edition Runtime
+Apache Tomcat @VERSION_MAJOR_MINOR@ requires the Java 2 Standard Edition Runtime
 Environment (JRE) version 5.0 or later.
 
 =============================
diff --git a/bin/service.bat b/bin/service.bat
index c9f9eee5c..7a40f82ce 100755
--- a/bin/service.bat
+++ b/bin/service.bat
@@ -19,7 +19,7 @@ rem ---------------------------------------------------------------------------
 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 Tomcat@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 @@ rem Guess CATALINA_HOME if not defined
 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\tomcat@VERSION_MAJOR@.exe" 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\tomcat@VERSION_MAJOR@.exe" 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 @@ if not "%CATALINA_BASE%" == "" goto gotBase
 set CATALINA_BASE=%CATALINA_HOME%
 :gotBase
  
-set EXECUTABLE=%CATALINA_HOME%\bin\tomcat6.exe
+set EXECUTABLE=%CATALINA_HOME%\bin\tomcat@VERSION_MAJOR@.exe
 
 rem Set default Service name
-set SERVICE_NAME=Tomcat6
-set PR_DISPLAYNAME=Apache Tomcat
+set SERVICE_NAME=Tomcat@VERSION_MAJOR@
+set PR_DISPLAYNAME=Apache Tomcat @VERSION_MAJOR@
 
 if "%1" == "" goto displayUsage
 if "%2" == "" goto setServiceName
@@ -89,7 +89,7 @@ echo Using JAVA_HOME:        %JAVA_HOME%
 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_HOME%\bin\bootstrap.jar
diff --git a/build.xml b/build.xml
index 6a29726d4..f30fb8dc2 100644
--- a/build.xml
+++ b/build.xml
@@ -28,16 +28,19 @@
   <property file="build.properties.default"/>
 
   <!-- Project Properties -->
+  <property name="project"               value="apache-tomcat" />
   <property name="name"                  value="Apache Tomcat" />
   <property name="year"                  value="2008" />
   <property name="version.major"         value="6" />
   <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}" />
 
-  <property name="project"               value="apache-tomcat" />
   <property name="final.name"            value="${project}-${version}" />
   <property name="final-src.name"        value="${project}-${version}-src" />
 
@@ -74,8 +77,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}" />
@@ -87,6 +90,19 @@
     <pathelement location="${jdt.jar}"/>
   </path>
 
+  <!-- Version info filter set -->
+  <tstamp>
+    <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+    <format property="TSTAMP" pattern="hh:mm:ss"/>
+  </tstamp>
+  <filterset id="version.filters">
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_MAJOR" value="${version.major}"/>
+    <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
+    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+  </filterset>
+
   <!-- Just build Tomcat -->
   <target name="build-prepare">
 
@@ -116,22 +132,18 @@
            target="${compile.target}"
            optimize="${compile.optimize}"
            excludes="**/CVS/**,**/.svn/**">
-<!-- Comment this in to show unchecked warnings:     <compilerarg value="-Xlint:unchecked"/> -->
+<!-- Comment this in to show unchecked warnings:     
+      <compilerarg value="-Xlint:unchecked"/>
+ -->
       <classpath refid="tomcat.classpath" />
       <exclude name="org/apache/naming/factory/webservices/**" />
       <exclude name="org/apache/tomcat/bayeux/**" />
       <exclude name="org/apache/cometd/**" />
       <exclude name="org/apache/tomcat/jdbc/**" />
     </javac>
-    <tstamp>
-      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
-      <format property="TSTAMP" pattern="hh:mm:ss"/>
-    </tstamp>
     <!-- Copy static resource files -->
-    <filter token="VERSION" value="${version}"/>
-    <filter token="VERSION_NUMBER" value="${version.number}"/>
-    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
-    <copy todir="${tomcat.classes}" filtering="true">
+    <copy todir="${tomcat.classes}">
+      <filterset refid="version.filters"/>
       <fileset dir="java">
         <include name="**/*.properties"/>
         <include name="**/*.dtd"/>
@@ -217,8 +229,13 @@
     </jar>
 
     <!-- Bootstrap JAR File -->
+    <copy tofile="res/manifest.tmp"
+          file="res/bootstrap.jar.manifest"
+          overwrite="yes">
+      <filterset refid="version.filters"/>
+    </copy>
     <jar jarfile="${bootstrap.jar}"
-        manifest="res/bootstrap.jar.manifest">
+        manifest="res/manifest.tmp">
       <fileset dir="${tomcat.classes}">
         <include name="org/apache/catalina/startup/Bootstrap.class" />
         <include name="org/apache/catalina/startup/catalina.properties" />
@@ -368,14 +385,15 @@
         </fileset>
     </copy>
     <copy todir="${tomcat.build}/webapps/docs">
+      <filterset refid="version.filters"/>
       <fileset dir=".">
         <include name="BUILDING.txt"/>
         <include name="RUNNING.txt"/>
       </fileset>
     </copy>
-    <filter token="VERSION" value="${version}"/>
-    <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt" file="RELEASE-NOTES"
-          filtering="true" />
+    <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt" file="RELEASE-NOTES">
+      <filterset refid="version.filters"/>
+    </copy>
 
     <copy   tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml"
               file="webapps/docs/appdev/build.xml.txt"/>
@@ -452,11 +470,21 @@
     <copy todir="${tomcat.build}/bin">
       <fileset dir="bin">
          <exclude name="**/*.launch"/>
+         <exclude name="**/*.sh"/>
+         <exclude name="**/*.bat"/>
+      </fileset>
+    </copy>
+    <copy todir="${tomcat.build}/bin">
+      <filterset refid="version.filters"/>
+      <fileset dir="bin">
+         <include name="**/*.sh"/>
+         <include name="**/*.bat"/>
       </fileset>
     </copy>
 
     <!-- Copy static resource files -->
     <copy todir="${tomcat.build}/conf">
+      <filterset refid="version.filters"/>
       <fileset dir="conf">
         <include name="**/*.policy"/>
         <include name="**/*.xml"/>
@@ -474,9 +502,9 @@
       </fileset>
     </copy>
 
-    <filter token="VERSION" value="${version}"/>
-    <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt" file="RELEASE-NOTES"
-          filtering="true" />
+    <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt" file="RELEASE-NOTES">
+      <filterset refid="version.filters"/>
+    </copy>
 
     <!-- Build classes for examples webapp -->
     <javac   srcdir="webapps/examples/WEB-INF/classes"
@@ -698,8 +726,8 @@
       <param name="destfile" value="${nsis.exe}"/>
   	  <param name="destdir" value="${nsis.home}/.."/>
     </antcall>
-  	
-  	<!-- Download json libraries -->
+
+       <!-- Download json libraries -->
     <antcall target="downloadfile">
       <param name="sourcefile" value="${json-lib.lib}"/>
       <param name="destfile" value="${json-lib.home}/${json-lib.jar}"/>
diff --git a/conf/catalina.policy b/conf/catalina.policy
index 5bebcaec1..e7dde7373 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -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
diff --git a/dist.xml b/dist.xml
index 49da9883a..3e49d0aeb 100644
--- a/dist.xml
+++ b/dist.xml
@@ -28,16 +28,19 @@
   <property file="build.properties.default"/>
 
   <!-- Project Properties -->
+  <property name="project"               value="apache-tomcat" />
   <property name="name"                  value="Apache Tomcat" />
   <property name="year"                  value="2008" />
   <property name="version.major"         value="6" />
   <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}" />
 
-  <property name="project"               value="apache-tomcat" />
   <property name="final.name"            value="${project}-${version}" />
   <property name="final-src.name"        value="${project}-${version}-src" />
 
@@ -71,11 +74,19 @@
   <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"/>
 
+  <!-- Version info filter set -->
+  <filterset id="version.filters">
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_MAJOR" value="${version.major}"/>
+    <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
+  </filterset>
+
   <target name="build-webapps-precompile" description="Precompile webapps" >
 
     <!-- JSPC -->
@@ -208,19 +219,19 @@
   <target name="fix-webapps">
     <!-- Extra build steps for webapps -->
 
-    <filter token="VERSION" value="${version}"/>
-
     <!-- Add release notes to the root webapp -->
     <copy file="${basedir}/RELEASE-NOTES"
-        tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
-        filtering="true" />
+        tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt">
+      <filterset refid="version.filters"/>
+    </copy>
 
     <!-- Add documents to the tomcat-docs webapp -->
     <copy file="${basedir}/resources/build.xml"
         todir="${tomcat.build}/webapps/tomcat-docs" />
     <copy file="./RELEASE-NOTES"
-        tofile="${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt"
-        filtering="true" />
+        tofile="${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt">
+      <filterset refid="version.filters"/>
+    </copy>
 
     <!-- Build JARs for webapps classes -->
     <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
@@ -306,8 +317,8 @@
     <mkdir dir="${tomcat.dist}/temp"/>
     <mkdir dir="${tomcat.dist}/webapps"/>
     <mkdir dir="${tomcat.dist}/work"/>
-  	<mkdir dir="${tomcat.release}/v${version}/bin" />
-  	<mkdir dir="${tomcat.release}/v${version}/src" />
+    <mkdir dir="${tomcat.release}/v${version}/bin" />
+    <mkdir dir="${tomcat.release}/v${version}/src" />
   </target>
 
 
@@ -315,8 +326,8 @@
   <target name="dist-static" depends="dist-prepare">
 
     <!-- Copy the top-level documentation files -->
-    <filter token="VERSION" value="${version}"/>
-    <copy todir="${tomcat.dist}" filtering="true">
+    <copy todir="${tomcat.dist}">
+      <filterset refid="version.filters"/>
       <fileset dir=".">
         <include name="INSTALLING.txt"/>
         <include name="LICENSE"/>
@@ -339,7 +350,7 @@
       </fileset>
     </copy>
 
-  	<copy todir="${tomcat.dist}/webapps">
+    <copy todir="${tomcat.dist}/webapps">
       <fileset dir="${tomcat.build}/webapps">
         <exclude name="**/balancer/WEB-INF/classes/**" />
         <exclude name="**/ROOT/WEB-INF/classes/**" />
@@ -445,17 +456,16 @@
     <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
     <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
     <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
-    <copy file="res/procrun/tomcat6.exe"
-        tofile="${tomcat.dist}/bin/tomcat6.exe" />
-    <copy file="res/procrun/tomcat6w.exe"
-        tofile="${tomcat.dist}/bin/tomcat6w.exe" />
+    <copy file="res/procrun/tomcat${version.major}.exe"
+        tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
+    <copy file="res/procrun/tomcat${version.major}w.exe"
+        tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
     <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
         tofile="${tomcat.dist}/bin/tcnative-1.dll" />
 
-    <filter token="VERSION" value="${version}"/>
-    <filter token="VERSION_NUMBER" value="${version.number}"/>
-
-    <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" filtering="true" overwrite="true"/>
+    <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" overwrite="true">
+      <filterset refid="version.filters"/>
+    </copy>
     <exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">
       <arg value="/DNSISDIR=${nsis.home}" />
       <arg value="tomcat.nsi" />
@@ -480,18 +490,20 @@
   <target name="release" depends="clean,dist-static,dist-deployer,installer,package-zip,package-tgz,package-deployer-zip,package-deployer-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz"
    description="Create a Tomcat 6 packaged distribution">
 
-    <filter token="VERSION" value="${version}"/>
     <copy file="KEYS"
          todir="${tomcat.release}/v${version}"/>
     <copy file="RELEASE-NOTES"
-         todir="${tomcat.release}/v${version}"
-     filtering="true"/>
+         todir="${tomcat.release}/v${version}">
+      <filterset refid="version.filters"/>
+    </copy>
     <copy file="res/welcome.main.html"
-        tofile="${tomcat.release}/v${version}/README.html"
-     filtering="true"/>
+        tofile="${tomcat.release}/v${version}/README.html">
+      <filterset refid="version.filters"/>
+    </copy>
     <copy file="res/welcome.bin.html"
-        tofile="${tomcat.release}/v${version}/bin/README.html"
-     filtering="true"/>
+        tofile="${tomcat.release}/v${version}/bin/README.html">
+      <filterset refid="version.filters"/>
+    </copy>
 
     <mkdir dir="${tomcat.release}/v${version}/bin/extras" />
     <copy todir="${tomcat.release}/v${version}/bin/extras">
@@ -499,7 +511,7 @@
         <include name="*.*"/>
       </fileset>
     </copy>
-  	
+
   </target>
 
   <!-- Packages the core zip distro -->
@@ -559,7 +571,7 @@
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="README.txt" />
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="RELEASE-NOTES" />
     </zip>
-   
+
     <checksum file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip"
               forceOverwrite="yes" fileext=".md5" />
     <echo     file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip.md5"
@@ -687,13 +699,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>
@@ -718,7 +730,7 @@
 
   <!-- Packages the source code distribution in tar.gz format -->
   <target name="package-src-tgz">
-  	<fixcrlf srcdir="${tomcat.dist}/src"
+    <fixcrlf srcdir="${tomcat.dist}/src"
      excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe.**/*.pdf,**/*.bin,**/*.dia"
           eol="lf"/>
     <tar longfile="gnu" compression="gzip"
diff --git a/extras.xml b/extras.xml
index 12a0ae1fa..844531e47 100644
--- a/extras.xml
+++ b/extras.xml
@@ -28,16 +28,19 @@
   <property file="build.properties.default"/>
 
   <!-- Project Properties -->
+  <property name="project"               value="apache-tomcat" />
   <property name="name"                  value="Apache Tomcat" />
-  <property name="year"                  value="2007" />
+  <property name="year"                  value="2008" />
   <property name="version.major"         value="6" />
   <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}" />
 
-  <property name="project"               value="apache-tomcat" />
   <property name="final.name"            value="${project}-${version}" />
   <property name="final-src.name"        value="${project}-${version}-src" />
 
@@ -68,8 +71,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"/>
 
diff --git a/res/bootstrap.jar.manifest b/res/bootstrap.jar.manifest
index 10469d8f5..561830cd7 100644
--- a/res/bootstrap.jar.manifest
+++ b/res/bootstrap.jar.manifest
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 Main-Class: org.apache.catalina.startup.Bootstrap
 Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar
 Specification-Title: Catalina
-Specification-Version: 6.0
\ No newline at end of file
+Specification-Version: @VERSION_MAJOR_MINOR@
\ No newline at end of file
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 4ac2bce7d..150151628 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -48,8 +48,8 @@ ${StrRep}
   !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\tomcat@VERSION_MAJOR@w.exe
+  !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat@VERSION_MAJOR@
   !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 
   !define MUI_ABORTWARNING
@@ -105,7 +105,7 @@ ${StrRep}
   !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
@@ -113,7 +113,7 @@ ${StrRep}
   InstType Full
 
   ; Main registry key
-  InstallDirRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" ""
+  InstallDirRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@" ""
 
   !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
   ReserveFile "jvm.ini"
@@ -171,11 +171,11 @@ Section "Core" SecTomcatCore
 
   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\tomcat@VERSION_MAJOR@.exe" //IS//Tomcat@VERSION_MAJOR@ --DisplayName "Apache Tomcat @VERSION_MAJOR@" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
   Pop $0
   StrCmp $0 "0" InstallOk
     MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
-      "Failed to install Tomcat6 service.$\r$\nCheck your settings and permissions$\r$\nIgnore and continue anyway (not recommended)?" \
+      "Failed to install Tomcat@VERSION_MAJOR@ service.$\r$\nCheck your settings and permissions$\r$\nIgnore and continue anyway (not recommended)?" \
        /SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry
   Quit
   InstallOk:
@@ -198,9 +198,9 @@ Section "Service" SecTomcatService
   Call findJVMPath
   Pop $2
 
-  nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Startup auto'
+  nsExec::ExecToLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@VERSION_MAJOR@ --Startup auto'
   ; Bahave like Apache Httpd (put the icon in try 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\tomcat@VERSION_MAJOR@w.exe" //MS//Tomcat@VERSION_MAJOR@'
 
   ClearErrors
 
@@ -225,42 +225,42 @@ Section "Start Menu Items" SecMenu
 
   !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_MINOR@\Tomcat Home Page.lnk" \
                  "http://tomcat.apache.org/"
 
-  CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Welcome.lnk" \
+  CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Welcome.lnk" \
                  "http://127.0.0.1:$R0/"
 
   IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp
 
-  CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Manager.lnk" \
+  CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\Tomcat Manager.lnk" \
                  "http://127.0.0.1:$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_MINOR@\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_MINOR@\Uninstall Tomcat @VERSION_MAJOR_MINOR@.lnk" \
                  "$INSTDIR\Uninstall.exe"
 
-  CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat 6.0 Program Directory.lnk" \
+  CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@\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_MINOR@\Monitor Tomcat.lnk" \
+                 "$INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe" \
+                 '//MS//Tomcat@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_MINOR@\Configure Tomcat.lnk" \
+                 "$INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe" \
+                 '//ES//Tomcat@VERSION_MAJOR@' \
                  "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
 
 SectionEnd
@@ -284,16 +284,16 @@ Section "Examples" SecExamples
 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\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@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\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@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\Tomcat\@VERSION_MAJOR_MINOR@" "InstallPath" $INSTDIR
+  WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@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
@@ -606,16 +606,16 @@ Section Uninstall
   Delete "$INSTDIR\Uninstall.exe"
 
   ; Stop Tomcat service monitor if running
-  nsExec::ExecToLog '"$INSTDIR\bin\tomcat6w.exe" //MQ//Tomcat6'
+  nsExec::ExecToLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe" //MQ//Tomcat@VERSION_MAJOR@'
   ; Delete Tomcat service
-  nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //DS//Tomcat6'
+  nsExec::ExecToLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //DS//Tomcat@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\Tomcat\@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"
@@ -634,7 +634,7 @@ Section Uninstall
   ; 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"
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index ce5c631c1..af0f1a38e 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -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/tomcat-@VERSION_MAJOR_MINOR@-doc/changelog.html">Changelog</a></li>
+<li><a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/status.html">Status</a></li>
 </ul>
 </p>
 
@@ -36,7 +36,7 @@ and must be untarred with a GNU compatible version of tar. The version
 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.  Read the 
+<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires JRE 5.0.  Read the 
 RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
 </font></p>
 
diff --git a/res/welcome.main.html b/res/welcome.main.html
index f766f3ece..0fb06a2a5 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -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/tomcat-@VERSION_MAJOR_MINOR@-doc/changelog.html">Changelog</a></li>
+<li><a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/status.html">Status</a></li>
 </ul>
 </p>
 
@@ -36,7 +36,7 @@ and must be untarred with a GNU compatible version of tar. The version
 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.  Read the 
+<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires JRE 5.0.  Read the 
 RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
 </font></p>