Author: kkolinko
Date: Mon Feb 17 09:19:36 2014
New Revision: 1568915
URL: http://svn.apache.org/r1568915
Log:
Backport r1532498, r1532501 from tomcat/trunk:
Add support for the following tags to tomcat-docs.xsl style sheet:
<version-major />
<version-major-minor />
<download>
<security>
<doc path="..">
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1532498-1532501
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1568915&r1=1568914&r2=1568915&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Mon Feb 17 09:19:36 2014
@@ -858,6 +858,8 @@
<param name="subdir" expression=""/>
<param name="relative-path" expression="."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="year" expression="${year}"/>
</xslt>
@@ -872,6 +874,8 @@
<param name="subdir" expression="appdev/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="year" expression="${year}"/>
</xslt>
@@ -886,6 +890,8 @@
<param name="subdir" expression="funcspecs/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="year" expression="${year}"/>
</xslt>
@@ -900,6 +906,8 @@
<param name="subdir" expression="config/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="year" expression="${year}"/>
</xslt>
@@ -914,6 +922,8 @@
<param name="subdir" expression="architecture/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="year" expression="${year}"/>
</xslt>
@@ -929,6 +939,8 @@
<param name="subdir" expression="tribes/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
+ <param name="majorversion" expression="${version.major}"/>
+ <param name="majorminorversion" expression="${version.major.minor}"/>
<param name="build-date" expression="${today}"/>
<param name="year" expression="${year}"/>
</xslt>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1568915&r1=1568914&r2=1568915&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Feb 17 09:19:36 2014
@@ -64,6 +64,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <scode>
+ In the documentation: add support for several documentation tags from
+ Tomcat 8. Such as <code><version-major/></code>. (kkolinko)
+ </scode>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<scode>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1568915&r1=1568914&r2=1568915&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Mon Feb 17 09:19:36 2014
@@ -36,7 +36,8 @@
<xsl:param name="subdir" select="''"/>
<xsl:param name="relative-path" select="'.'"/>
<xsl:param name="version" select="'7.0.x'"/>
- <xsl:param name="majorversion" select="'7.0'"/>
+ <xsl:param name="majorversion" select="'7'"/>
+ <xsl:param name="majorminorversion" select="'7.0'"/>
<xsl:param name="build-date" select="'MMM d yyyy'"/>
<xsl:param name="year" select="'yyyy'"/>
<xsl:param name="void-image" select="'/images/void.gif'"/>
@@ -44,6 +45,9 @@
<xsl:param name="standalone" select="''"/>
<xsl:param name="buglink"
select="'http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
<xsl:param name="revlink"
select="'http://svn.apache.org/viewvc?view=rev&rev='"/>
+ <xsl:param name="doclink"
select="'http://tomcat.apache.org/tomcat-7.0-doc'"/>
+ <xsl:param name="sylink"
select="'http://tomcat.apache.org/security-7.html'"/>
+ <xsl:param name="dllink"
select="'http://tomcat.apache.org/download-70.cgi'"/>
<xsl:param name="sitedir" select="''"/>
<xsl:param name="filename" select="'-'"/>
@@ -618,6 +622,32 @@
<a href="{$link}">r<xsl:apply-templates/></a>
</xsl:template>
+ <!-- Link to online docs -->
+ <xsl:template match="doc">
+ <xsl:variable name="link"><xsl:value-of select="$doclink"/><xsl:value-of
select="@path"/></xsl:variable>
+ <a href="{$link}"><xsl:apply-templates/></a>
+ </xsl:template>
+
+ <!-- Link to security page -->
+ <xsl:template match="security">
+ <xsl:variable name="link"><xsl:value-of select="$sylink"/></xsl:variable>
+ <a href="{$link}"><xsl:apply-templates/></a>
+ </xsl:template>
+
+ <!-- Link to download page -->
+ <xsl:template match="download">
+ <xsl:variable name="link"><xsl:value-of select="$dllink"/></xsl:variable>
+ <a href="{$link}"><xsl:apply-templates/></a>
+ </xsl:template>
+
+ <!-- Version numbers -->
+ <xsl:template match="version-major-minor">
+ <xsl:value-of select="$majorminorversion"/>
+ </xsl:template>
+ <xsl:template match="version-major">
+ <xsl:value-of select="$majorversion"/>
+ </xsl:template>
+
<!-- specially process td tags ala site.vsl -->
<xsl:template match="table[@class='detail-table']/tr/td">
<td bgcolor="{$table-td-bg}" valign="top" align="left">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
