Author: kkolinko
Date: Fri Oct 14 16:07:51 2011
New Revision: 1183404
URL: http://svn.apache.org/viewvc?rev=1183404&view=rev
Log:
Add build date and version to documentation pages
Automate copyright end date
It is based on r962466
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1183404&r1=1183403&r2=1183404&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 14 16:07:51 2011
@@ -64,13 +64,6 @@ PATCHES PROPOSED TO BACKPORT:
- getStuckThreadIds() returns a list of ids. It might be useful to
have a similar method that returns Thread.getName() names.
-* Add build date and version to documentation pages
- Automate copyright end date
- It is based on r962466
- http://people.apache.org/~kkolinko/patches/2011-09-26_tc6_docs-date.patch
- +1: kkolinko, kfujino, markt
- -1:
-
* Backport (copy in) JULI OneLineFormatter plus DateFormatCache helper class
from TC 7 JULI.
http://people.apache.org/~rjung/patches/tc6-onelineformatter.patch
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1183404&r1=1183403&r2=1183404&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Fri Oct 14 16:07:51 2011
@@ -417,6 +417,9 @@
excludes="build.xml project.xml"
includes="*.xml">
<param name="relative-path" expression="."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${TODAY}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/appdev"
destdir="${tomcat.build}/webapps/docs/appdev"
@@ -425,6 +428,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${TODAY}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/funcspecs"
destdir="${tomcat.build}/webapps/docs/funcspecs"
@@ -433,6 +439,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${TODAY}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/config"
destdir="${tomcat.build}/webapps/docs/config"
@@ -441,6 +450,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${TODAY}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/architecture"
destdir="${tomcat.build}/webapps/docs/architecture"
@@ -449,6 +461,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${TODAY}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<xslt basedir="webapps/docs/tribes"
@@ -458,6 +473,9 @@
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${TODAY}"/>
+ <param name="year" expression="${year}"/>
</xslt>
</target>
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=1183404&r1=1183403&r2=1183404&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct 14 16:07:51 2011
@@ -124,6 +124,10 @@
Correct the documentation for the connectionLinger atribute of the HTTP
connector. (markt)
</fix>
+ <add>
+ Show build date and version in the header on every documentation
+ page. (kkolinko)
+ </add>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1183404&r1=1183403&r2=1183404&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl Fri Oct 14 16:07:51 2011
@@ -36,6 +36,9 @@
<xsl:param name="printer-logo" select="'/images/printer.gif'"/>
<xsl:param name="apache-logo" select="'/images/asf-logo.gif'"/>
<xsl:param name="relative-path" select="'.'"/>
+ <xsl:param name="version" select="'6.0.x'"/>
+ <xsl:param name="build-date" select="'MMM d yyyy'"/>
+ <xsl:param name="year" select="'yyyy'"/>
<xsl:param name="void-image" select="'/images/void.gif'"/>
<xsl:param name="project-menu" select="'menu'"/>
<xsl:param name="standalone" select="''"/>
@@ -61,7 +64,7 @@
select="document('project.xml')/project"/>
<html>
<head>
- <title><xsl:value-of select="project/title"/> - <xsl:value-of
select="properties/title"/></title>
+ <title><xsl:value-of select="project/title"/> (<xsl:value-of
select="$version"/>) - <xsl:value-of select="properties/title"/></title>
<xsl:for-each select="properties/author">
<xsl:variable name="name">
<xsl:value-of select="."/>
@@ -107,6 +110,7 @@
</td>
<td>
<h1><font face="arial,helvetica,sanserif"><xsl:value-of
select="$project/title"/></font></h1>
+ <font face="arial,helvetica,sanserif">Version <xsl:value-of
select="$version"/>, <xsl:value-of select="$build-date"/></font>
</td>
<td>
<xsl:comment>APACHE LOGO</xsl:comment>
@@ -155,7 +159,7 @@
<xsl:comment>PAGE FOOTER</xsl:comment>
<tr><td colspan="2">
<div align="center"><font color="{$body-link}" size="-1"><em>
- Copyright © 1999-2011, Apache Software Foundation
+ Copyright © 1999-<xsl:value-of select="$year"/>, Apache Software
Foundation
</em></font></div>
</td></tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
