I kind of liked what you did, replacing the hard-coded numbers with tags / tokens. But I don't feel strongly enough about it either way, so +0 to what you did ;)
Yoav On Thu, Jan 14, 2010 at 4:55 AM, Rainer Jung <rainer.j...@kippdata.de> wrote: > Konstantin gave some arguments, why the use of @VERSION@ and similar ant > tags in top level text files (and filtering them) instead of directly using > explicit version numbers like 7 or 7.0 might not be good. The files are > - RELEASE-NOTES > - RUNNING.txt > - BUILDING.txt > and his arguments were > 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. > If we agree on this I will replace the tags in trunk by the explicit version > numbers in those three files. The topic showed up, since I now backported > using the version tags from trunk to TC6 (except for those text files). > > I guess we can easily come to a uniform handling in TC6 and 7, either use > tags in those files as well, or explicit version numbers. I don't have a > strong opinion, so I'm fine with Konstantin's arguments. > > Any preferences? > > The changes are: > > Index: RELEASE-NOTES > =================================================================== > --- RELEASE-NOTES (revision 896608) > +++ RELEASE-NOTES (working copy) > @@ -43,9 +43,9 @@ > =================== > 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 > @@ -78,7 +78,7 @@ > ============= > 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) > Index: RUNNING.txt > =================================================================== > --- RUNNING.txt (revision 896608) > +++ RUNNING.txt (working copy) > @@ -18,10 +18,10 @@ > $Id: RUNNING.txt 354430 2005-12-06 13:44:26Z yoavs $ > > =================================================== > - 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. > > ============================= > Index: BUILDING.txt > =================================================================== > --- BUILDING.txt (revision 896608) > +++ BUILDING.txt (working copy) > @@ -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 @@ > 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/t...@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/t...@version_major_minor@.x/trunk/), > or > unpack the source package. The location where the source has been > placed will be referred as ${tomcat.source}. > > Regards, > > Rainer > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
