This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
commit 8872f94fb5cd4fd65a6323dddfd0883e0c350eae
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 9 09:26:14 2020 +0000
Fix footer dates and add version finfo
---
HOWTO-RELEASE.txt | 1 +
xdocs/build.xml | 42 +++++++++++++++++++++++++++++++++++++++---
xdocs/tomcat-docs.xsl | 2 --
3 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 4c1bfd9..fcb8413 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -45,6 +45,7 @@ had to be updated:
native/iis/README
native/netscape/README
+xdocs/build.xml
xdocs/index.xml
xdocs/news/<THISYEAR0101>.xml
tools/dist/binaries/windows/README.html
diff --git a/xdocs/build.xml b/xdocs/build.xml
index e8bf338..d3fb74e 100644
--- a/xdocs/build.xml
+++ b/xdocs/build.xml
@@ -28,10 +28,18 @@
<property file="${user.home}/build.properties"/>
<property name="build.compiler" value="modern"/>
- <property name="build.dir" value="../build"/>
- <property name="dist.dir" value="../dist"/>
- <property name="dist.name" value="docs"/>
+ <property name="build.dir" value="../build"/>
+ <property name="dist.dir" value="../dist"/>
+ <property name="dist.name" value="docs"/>
+ <property name="version" value="1.2.48"/>
+
+ <tstamp>
+ <format property="year" pattern="yyyy" locale="en" timezone="UTC"/>
+ <format property="today" pattern="MMM d yyyy" locale="en" timezone="UTC"/>
+ <format property="today-iso-8601" pattern="yyyy-MM-dd" locale="en"
timezone="UTC"/>
+ <format property="tstamp" pattern="HH:mm:ss" locale="en" timezone="UTC"/>
+ </tstamp>
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
@@ -71,6 +79,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="reference/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- Common Howto -->
@@ -82,6 +94,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="common_howto/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- Webserver Howto -->
@@ -93,6 +109,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="webserver_howto/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- AJP Protocol Reference -->
@@ -104,6 +124,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="ajp/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- Miscellaneous Documentation -->
@@ -115,6 +139,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="miscellaneous/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- News -->
@@ -126,6 +154,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="news/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
</target>
@@ -142,6 +174,10 @@
excludes="build.xml project.xml empty.xml"
includes="*.xml">
<param name="relative-path" expression="."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
</target>
diff --git a/xdocs/tomcat-docs.xsl b/xdocs/tomcat-docs.xsl
index 828178c..8f517de 100644
--- a/xdocs/tomcat-docs.xsl
+++ b/xdocs/tomcat-docs.xsl
@@ -113,12 +113,10 @@
<a href="https://www.apache.org/"; target="_blank"><img src="{$src}"
alt="The Apache Software Foundation" style="width: 266px; height: 83px;"/></a>
</div>
<h1><xsl:value-of select="$project/title"/></h1>
- <!-- version and build-date aren't available, so we can't display them
<div class="versionInfo">
Version <xsl:value-of select="$version"/>,
<time datetime="{$build-date-iso-8601}"><xsl:value-of
select="$build-date"/></time>
</div>
- -->
<div style="height: 1px;"/>
<div style="clear: left;"/>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
