You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2012/12/15 23:19:40 UTC
svn commit: r1422387 - in /tomcat/tc7.0.x/trunk: ./ build.xml
webapps/docs/tomcat-docs.xsl
Author: rjung
Date: Sat Dec 15 22:19:39 2012
New Revision: 1422387
URL: http://svn.apache.org/viewvc?rev=1422387&view=rev
Log:
Pass some more context information to style
sheet which generates docs. Will be used
when embedding the docs comments feature.
Backport of r1417465 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1417465
Modified: tomcat/tc7.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1422387&r1=1422386&r2=1422387&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sat Dec 15 22:19:39 2012
@@ -767,8 +767,11 @@
destdir="${tomcat.build}/webapps/docs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="build.xml project.xml"
includes="*.xml">
+ <param name="sitedir" expression="tomcat-${version.major.minor}-docs/"/>
+ <param name="subdir" expression=""/>
<param name="relative-path" expression="."/>
<param name="version" expression="${version}"/>
<param name="build-date" expression="${today}"/>
@@ -778,8 +781,11 @@
destdir="${tomcat.build}/webapps/docs/appdev"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+ <param name="sitedir" expression="tomcat-${version.major.minor}-docs/"/>
+ <param name="subdir" expression="appdev/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
<param name="build-date" expression="${today}"/>
@@ -789,8 +795,11 @@
destdir="${tomcat.build}/webapps/docs/funcspecs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+ <param name="sitedir" expression="tomcat-${version.major.minor}-docs/"/>
+ <param name="subdir" expression="funcspecs/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
<param name="build-date" expression="${today}"/>
@@ -800,8 +809,11 @@
destdir="${tomcat.build}/webapps/docs/config"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+ <param name="sitedir" expression="tomcat-${version.major.minor}-docs/"/>
+ <param name="subdir" expression="config/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
<param name="build-date" expression="${today}"/>
@@ -811,8 +823,11 @@
destdir="${tomcat.build}/webapps/docs/architecture"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+ <param name="sitedir" expression="tomcat-${version.major.minor}-docs/"/>
+ <param name="subdir" expression="architecture/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
<param name="build-date" expression="${today}"/>
@@ -823,8 +838,11 @@
destdir="${tomcat.build}/webapps/docs/tribes"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+ <param name="sitedir" expression="tomcat-${version.major.minor}-docs/"/>
+ <param name="subdir" expression="tribes/"/>
<param name="relative-path" expression=".."/>
<param name="version" expression="${version}"/>
<param name="build-date" expression="${today}"/>
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=1422387&r1=1422386&r2=1422387&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Sat Dec 15 22:19:39 2012
@@ -35,8 +35,10 @@
<xsl:param name="home-logo" select="'/images/tomcat.gif'"/>
<xsl:param name="printer-logo" select="'/images/printer.gif'"/>
<xsl:param name="apache-logo" select="'/images/asf-logo.gif'"/>
+ <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="build-date" select="'MMM d yyyy'"/>
<xsl:param name="year" select="'yyyy'"/>
<xsl:param name="void-image" select="'/images/void.gif'"/>
@@ -44,6 +46,8 @@
<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="sitedir" select="''"/>
+ <xsl:param name="filename" select="'-'"/>
<!-- Defined variables (non-overrideable) -->
<xsl:variable name="body-bg" select="'#ffffff'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org