Return-Path: 
 <dev-return-133969-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 45B34E16E
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Sat, 15 Dec 2012 22:20:03 +0000 (UTC)
Received: (qmail 86849 invoked by uid 500); 15 Dec 2012 22:20:02 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 86787 invoked by uid 500); 15 Dec 2012 22:20:02 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 86778 invoked by uid 99); 15 Dec 2012 22:20:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Dec 2012 22:20:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Dec 2012 22:20:01 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2E5772388906
	for <dev@tomcat.apache.org>; Sat, 15 Dec 2012 22:19:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1422387 - in /tomcat/tc7.0.x/trunk: ./ build.xml
 webapps/docs/tomcat-docs.xsl
Date: Sat, 15 Dec 2012 22:19:40 -0000
To: dev@tomcat.apache.org
From: rjung@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121215221941.2E5772388906@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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&amp;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