Attachment #30760 for bug #55383

View | Details | Raw Unified | Return to bug 55383
Collapse All | Expand All




  <tstamp>
    <format property="year" pattern="yyyy" locale="en"/>
    <format property="today" pattern="MMM d yyyy" locale="en"/>
    <format property="today-iso-8601" pattern="yyyy-MM-dd" locale="en"/>
    <format property="tstamp" pattern="hh:mm:ss"/>
  </tstamp>
  <filterset id="version.filters">

      <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>
    <xslt basedir="webapps/docs/appdev"

      <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>
    <xslt basedir="webapps/docs/funcspecs"

      <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>
    <xslt basedir="webapps/docs/config"

      <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>
    <xslt basedir="webapps/docs/architecture"

      <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>


      <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>




@charset "utf-8";
/*
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
  this work for additional information regarding copyright ownership.
  The ASF licenses this file to You under the Apache License, Version 2.0
  (the "License"); you may not use this file except in compliance with
  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
*/


/* General style */

body {
  margin: 0;
}

body, input {
  font-family: 'Lucida Sans Unicode', Arial, Helvetica, sans-serif;
  font-size: 10.5pt;
}

code, pre {
  font-family: Consolas, monospace;
}

img {
  border: 0;
}

table {
  border-collapse: collapse;
}

main {
  /* Remove this once all IEs support <main> element */
  display: block;
}


/* Layout */

#wrapper {
  min-width: 400px;
}

#header {
  box-shadow: 0 0 7px #aaa;
  border-bottom: 1px solid #bbb;
}

#header > div {
  padding-left: 15px;
  padding-right: 15px;
  
  background: linear-gradient(to bottom, #ffffff -10%, #F8F3E4 100%);
  position: relative;
}

#header .logo {
  float: left;
  padding-top: 10px;
  min-width: 190px;
}

#header .logo  img{
  /* To avoid that the Font Descender being added to the parent div's height */
  vertical-align: middle;
}

#header .asfLogo {
  float: right;
  position: relative;
  top: 8px;
}

#header h1 {
  margin-top: 0.6em;
  margin-bottom: 0;
}

#header .versionInfo {
  font-size: 13pt;
  margin-bottom: 1em;
}

#middle {

  display: table;
  table-layout: fixed;
  margin: 0;
  
  width: 100%;
  
  
}
#middle > div { display: table-row; }
#middle > div > div { display: table-cell; vertical-align: top; }



#mainLeft {
  width: 190px;
}

#mainLeft > div {
  margin-top: -1px; /* to overwrite border of element above */
  padding-left: 16px;
  padding-right: 14px;
  padding-top: 6px;
  padding-bottom: 15px;
  background-color: #F8F3E4;
  border-right: 1px solid #bbb;
  border-bottom: 1px solid #bbb;
  font-size: 10pt;
  border-bottom-right-radius: 20px;
  box-shadow: 0 0 5px #aaa;
}

#mainLeft h2 {
  margin-bottom: 0.2em;
  font-size: 1.2em;
}

#mainLeft ul {
  padding: 0;
  margin: 0;
  list-style-type: none;
}

#mainLeft ul a {
  text-indent: -0.6em;
  padding-left: 1.4em;
  display: block;
  text-decoration: none;
  color: #444;
}
#mainLeft ul a:hover {
  color: #000;
  background-color: #D1c9b9;
}

#mainRight {
  padding-left: 14px;
  padding-right: 20px;
  
}

#footer {
  margin-top: 30px;
  padding-top: 20px;
  padding-bottom: 20px;
  padding-left: 20px;
  padding-right: 20px;
  border-top: 1px solid #ccc;
  color: #444;
  text-align: center;
  /* font-style: italic; */
  font-size: 9pt;
}


/* Content */

#content div.text {
  padding-left: 1em;
  padding-left: 1em;
}

#content h3, #content h4, #content h5, #content h6 {
  padding-left: 5px;
  padding-right: 5px;
  background-color: #eaeaea;
  border: 1px solid #ccc;
  border-radius: 4px;
}

#content h4, #content h5, #content h6 {
  background-color: #f6f6f6;
}

code {
  background-color: rgb(224,255,255);
  padding: 0 0.1em;
}

div.codeBox pre code, code.attributeName, code.propertyName {
  background-color: transparent;
}
div.codeBox {
  overflow: auto;
  /* TODO: Maybe add margin-top and margin-bottom like with <p> */
}
div.codeBox pre {
  margin: 0;
  padding: 4px;
  border: 1px solid #999;
  border-radius: 5px;
  background-color: #eff8ff;
  display: table; /* To prevent <pre>s from taking the complete available width. */
  /*
  When it is officially supported, use the following CSS instead of display: table
  to prevent big <pre>s from exceeding the browser window:
  max-width: available;
  width: min-content;
  */
}

div.codeBox pre.wrap {
  white-space: pre-wrap;
}


table.defaultTable th {
  background-color: #88b;
  color: #fff;
}

table.detail-table th {
  background-color: #039acc;
  color: #fff;
}
table.detail-table td {
  background-color: #DAF2FA;
}

table.defaultTable th, table.defaultTable td, table.detail-table th, table.detail-table td {
  border: 1px solid #777;
  padding: 5px;
  text-align: left;
}


p.notice {
  border: 1px solid rgb(255, 0, 0);
  background-color: rgb(238, 238, 238);
  color: rgb(0, 51, 102);
  padding: 0.5em;
  margin: 1em 2em 1em 1em;
}


/* Changelog-Styles */

ul.changelog {
  padding-left: 1em;
  list-style-type: none;
}

ul.changelog  li{
  padding-top: 5px;
  padding-bottom: 5px;
}

ul.changelog img {
  vertical-align: middle
}




<?xml version="1.0" encoding="UTF-8"?>
<!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with

<!-- $Id$ -->

<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  version="3.0">


  <!-- Output method -->
  <xsl:output method="html"
              html-version="5.0"
              encoding="UTF-8"
              indent="no"
              doctype-system="about:legacy-compat"/>


  <!-- Defined parameters (overrideable) -->
  <xsl:param    name="home-name"           select="'The Tomcat Project'"/>
  <xsl:param    name="home-href"           select="'http://tomcat.apache.org/'"/>
  <xsl:param    name="home-logo"           select="'/images/tomcat-new.png'"/>
  <xsl:param    name="home-stylesheet"     select="'/images/docs-stylesheet.css'"/>
  <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="'8.0.x'"/>
  <xsl:param    name="majorversion"        select="'8.0'"/>
  <xsl:param    name="build-date"          select="'MMM d yyyy'"/>
  <xsl:param    name="build-date-iso-8601" select="'yyyy-dd-MM'"/>
  <xsl:param    name="year"                select="'yyyy'"/>
  <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="'-'"/>
  <xsl:param    name="sitedir"          select="''"/>
  <xsl:param    name="filename"         select="'-'"/>

  <!-- Defined variables (non-overrideable) -->
  <xsl:variable name="body-bg"          select="'#ffffff'"/>
  <xsl:variable name="body-fg"          select="'#000000'"/>
  <xsl:variable name="body-link"        select="'#525D76'"/>
  <xsl:variable name="banner-bg"        select="'#525D76'"/>
  <xsl:variable name="banner-fg"        select="'#ffffff'"/>
  <xsl:variable name="sub-banner-bg"    select="'#828DA6'"/>
  <xsl:variable name="sub-banner-fg"    select="'#ffffff'"/>
  <xsl:variable name="source-color"     select="'#023264'"/>
  <xsl:variable name="attributes-color" select="'#023264'"/>
  <xsl:variable name="table-th-bg"      select="'#039acc'"/>
  <xsl:variable name="table-td-bg"      select="'#a0ddf0'"/>
  <xsl:variable name="commentslink">/<xsl:value-of select="$sitedir"/>comments.html</xsl:variable>

  <!-- Process an entire document into an HTML page -->

  <xsl:template match="document">
  <xsl:variable name="project"
              select="document('project.xml')/project"/>
<html lang="en">
<head>
  <!-- Note: XLST seems to always output a 
       <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
       when method="html",
       therefore we can't use
       <meta charset="UTF-8"/>.

       In XHTML, this is not needed as the encoding will be
       specified in the XML declaration.
  -->

  <xsl:variable name="css-src">
    <xsl:value-of select="$relative-path"/><xsl:value-of select="$home-stylesheet"/>
  </xsl:variable>
  <link href="{$css-src}" rel="stylesheet" type="text/css"/>
  <style type="text/css" media="print"><![CDATA[
    .noPrint { display: none; }
    #middle > div > div#mainLeft { display: none; }
    a { color: inherit; text-decoration: none; }
  ]]></style>

  <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="."/>
    </xsl:variable>
    <!--
      <xsl:variable name="email">
        <xsl:value-of select="@email"/>
      </xsl:variable>
    -->
    <meta name="author" content="{$name}"/>
    <!-- Don't publish e-mail addresses
    <meta name="email" content="{$email}"/>
    -->
  </xsl:for-each>
        <style type="text/css" media="print">
            .noPrint {display: none;}
            td#mainBody {width: 100%;}
        </style>
        <style type="text/css">
            code {background-color:rgb(224,255,255);padding:0 0.1em;}
            code.attributeName, code.propertyName {background-color:transparent;}
        </style>
        <style type="text/css">
            .wrapped-source code { display: block; background-color: transparent; }
            .wrapped-source div { margin: 0 0 0 1.25em; }
            .wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
        </style>
        <style type="text/css">
            p.notice {
                border: 1px solid rgb(255, 0, 0);
                background-color: rgb(238, 238, 238);
                color: rgb(0, 51, 102);
                padding: 0.5em;
                margin: 1em 2em 1em 1em;
            }
        </style>
    </head>

  <!-- Script for ASF Comments System. -->
  <!-- 
    Use data-* attributes for retrieval of XSLT-generated data
    in JavaScript.
    Use this approach rather than directly inserting text
    in a JS string literal as that would cause
    problems when the string contains special characters
    like ", ', \n etc.
  -->
  <xsl:variable name="comments-identifier">
    <xsl:value-of select="$sitedir"/><xsl:value-of select="$subdir"/><xsl:value-of select="substring($filename,1,string-length($filename)-4)"/>
  </xsl:variable>
  <script type="application/javascript"
      data-comments-identifier="{$comments-identifier}"><![CDATA[
    "use strict"; // Enable strict mode

    (function() {
      var thisScript = document.currentScript;
      if (!thisScript) { // Workaround for IE <= 11
        var scripts = document.getElementsByTagName("script");
        thisScript = scripts[scripts.length - 1];
      }
      document.addEventListener("DOMContentLoaded", (function() {
        var commentsDiv = document.getElementById("comments_thread");
        var commentsShortname = "tomcat";
        var commentsIdentifier = "http://tomcat.apache.org/" +
          thisScript.getAttribute("data-comments-identifier") + ".html";

        (function(w, d) {
          if (w.location.hostname.toLowerCase() == "tomcat.apache.org") {
            commentsDiv.appendChild(d.createTextNode("Loading comments…"));
            var s = d.createElement("script");
            s.type = "application/javascript";
            s.async = true;
            s.src = "https://comments.apache.org/show_comments.lua?site=" +
              encodeURIComponent(commentsShortname) +
              "&page=" + encodeURIComponent(commentsIdentifier);
            d.head.appendChild(s);
          } else {
            commentsDiv.appendChild(d.createTextNode("Comments are disabled for this page at the moment."));
          }
        })(window, document);
      }), false);
    })();
  ]]></script>
  </head>

  <body>
  <div id="wrapper">
  <!-- Header -->
  <header id="header">
    <div>
      <div>
        <xsl:if test="project/logo">
          <xsl:variable name="alt">
            <xsl:value-of select="project/logo"/>
          </xsl:variable>
          <xsl:variable name="home">
            <xsl:value-of select="project/@href"/>
          </xsl:variable>
          <xsl:variable name="src">
            <xsl:value-of select="$relative-path"/><xsl:value-of select="$home-logo"/>
          </xsl:variable>
          <div class="logo noPrint">
            <a href="{project/@href}"><img alt="Tomcat Home" src="{$src}"/></a>
          </div>
            <img src="{$src}" align="right" alt="{$alt}" border="0"/>
          </a>
        </xsl:if>
        </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>
          <xsl:variable name="src">
            <xsl:value-of select="$relative-path"/><xsl:value-of select="$apache-logo"/>
          </xsl:variable>
          <a href="http://www.apache.org/">
            <img src="{$src}" align="right" alt="Apache Logo" border="0"/>
          </a>
        </td>
      </tr>
    </table>

        <div style="height: 1px;"/>
        <div class="asfLogo"><a href="http://www.apache.org/" target="_blank"><img src="http://www.apache.org/images/feather.png" alt="The Apache Software Foundation" style="width: 266px; height: 83px;"/></a></div>
        <h1><xsl:value-of select="$project/title"/></h1>
        <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>
    </div>
  </header>

  <div id="middle">
    <div>
      <div id="mainLeft" class="noprint">
        <div>
          <!-- Navigation -->
          <nav>
            <xsl:apply-templates select="project/body/menu"/>
          </nav>
        </div>
      </div>
      <div id="mainRight">
        <div id="content">
          <!-- Main Part -->
          <main>
            <h2><xsl:value-of select="properties/title"/></h2>
            <xsl:apply-templates select="body/section"/>

            <!-- Comments Section -->
            <xsl:if test="not(properties/no-comments)">
              <div class="noprint">
                <h3 id="comments_section">
                  Comments
                </h3>

                <div class="text">
                  <p class="notice">
                    <strong>Notice: </strong>This comments section collects your suggestions
                    on improving documentation for Apache Tomcat.<br/><br/>
                    If you have trouble and need help, read
                    <a href="http://tomcat.apache.org/findhelp.html">Find Help</a> page
                    and ask your question on the tomcat-users
                    <a href="http://tomcat.apache.org/lists.html">mailing list</a>.
                    Do not ask such questions here. This is not a Q&amp;A section.<br/><br/>
                    The Apache Comments System is explained <a href="{$commentslink}">here</a>.
                    Comments may be removed by our moderators if they are either
                    implemented or considered invalid/off-topic.
                  </p>
                  <div id="comments_thread"/>
                </div>
              </div>
            </xsl:if>

          </main>
        </div>
      </div>
    </div>
  </div>

  <!-- Footer -->
  <footer id="footer">
    Copyright © 1999-<xsl:value-of select="$year"/>, The Apache Software Foundation
  </footer>
</div>
</body>
</html>

      <xsl:if test="not(properties/no-comments)">
      <tr class="noPrint">

        <td width="20%" valign="top" nowrap="nowrap" class="noPrint">
        </td>
        <td width="80%" valign="top" align="left">
          <table border="0" cellspacing="0" cellpadding="2">
            <!-- Comment heading -->
            <tr><td bgcolor="{$banner-bg}">
                <font color="{$banner-fg}" face="arial,helvetica.sanserif">
                <a name="comments_section" id="comments_section"><strong>Comments</strong></a></font>
              </td>
            </tr>
            <!-- Comment body -->
            <tr><td>
            <blockquote>
            <p class="notice">
              <strong>Notice: </strong>This comments section collects your suggestions
              on improving documentation for Apache Tomcat.<br/><br/>
              If you have trouble and need help, read
              <a href="http://tomcat.apache.org/findhelp.html">Find Help</a> page
              and ask your question on the tomcat-users
              <a href="http://tomcat.apache.org/lists.html">mailing list</a>.
              Do not ask such questions here. This is not a Q&amp;A section.<br/><br/>
              The Apache Comments System is explained <a href="{$commentslink}">here</a>.
              Comments may be removed by our moderators if they are either
              implemented or considered invalid/off-topic.</p>
              <script type="text/javascript">
              <xsl:text disable-output-escaping="yes"><![CDATA[<!--//--><![CDATA[//><!--
              var comments_shortname = 'tomcat';
              var comments_identifier = 'http://tomcat.apache.org/]]></xsl:text><xsl:value-of select="$sitedir"/><xsl:value-of select="$subdir"/><xsl:value-of select="substring($filename,1,string-length($filename)-4)"/><xsl:text disable-output-escaping="yes"><![CDATA[.html';
              (function(w, d) {
                  if (w.location.hostname.toLowerCase() == "tomcat.apache.org") {
                      d.write('<div id="comments_thread"><\/div>');
                      var s = d.createElement('script');
                      s.type = 'text/javascript';
                      s.async = true;
                      s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
                      (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
                  }
                  else {
                      d.write('<div id="comments_thread"><strong>Comments are disabled for this page at the moment.<\/strong><\/div>');
                  }
              })(window, document);
              //--><!]]]]>></xsl:text></script>
            </blockquote></td></tr>
          </table>
        </td>
      </tr>
      </xsl:if>

      <xsl:comment>FOOTER SEPARATOR</xsl:comment>
      <tr>
        <td colspan="2">
          <hr noshade="noshade" size="1"/>
        </td>
      </tr>

      <xsl:comment>PAGE FOOTER</xsl:comment>
      <tr><td colspan="2">
        <div align="center"><font color="{$body-link}" size="-1"><em>
        Copyright &#169; 1999-<xsl:value-of select="$year"/>, Apache Software Foundation
        </em></font></div>
      </td></tr>

    </table>
    </body>
    </html>

  </xsl:template>


  <!-- Process a menu for the navigation bar -->
  <xsl:template match="menu">
  <div>
    <h2><strong><xsl:value-of select="@name"/></strong></h2>
    <ul>
      <xsl:apply-templates select="item"/>
    </ul>
  </div>
  </xsl:template>




  <!-- Process a documentation section -->
  <xsl:template match="section">
    <xsl:variable name="name2">
      <xsl:choose>
        <xsl:when test="@anchor">
          <xsl:value-of select="@anchor" />

        </xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
    <xsl:variable name="name">
      <xsl:value-of select="translate($name2, ' #', '__')"/>
    </xsl:variable>


    <!-- Section heading -->
    <h3 id="{$name}">
          <xsl:if test="$name != $name2"><a name="{$name}"><xsl:comment>()</xsl:comment></a></xsl:if>
          <a name="{$name2}">
          <strong><xsl:value-of select="@name"/></strong></a></font>
        </td>
      <xsl:if test="@rtext">
        <!-- Additional right-aligned text cell in section heading. It is used by changelog.xml -->
        <span style="float: right;">
          <xsl:value-of select="@rtext"/>
        </span><xsl:text>&#x20;</xsl:text> <!-- Ensure a space follows after </span> -->
        </td>
      </xsl:if>
      <xsl:value-of select="@name"/>
    </h3>
    <!-- Section body -->
    <div class="text">
      <xsl:apply-templates/>
    </div>

        <xsl:apply-templates/>
      </blockquote></td></tr>
    </table>
  </xsl:template>


  <!-- Process a documentation subsection -->
  <xsl:template match="subsection">
    <xsl:variable name="name2">
      <xsl:choose>
        <xsl:when test="@anchor">
          <xsl:value-of select="@anchor" />

        </xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
    <xsl:variable name="name">
      <xsl:value-of select="translate($name2, ' #', '__')"/>
    </xsl:variable>

    <div class="subsection">
      <!-- Subsection heading -->
      <h4 id="{$name}">
        <xsl:value-of select="@name"/>
      </h4>
          <a name="{$name2}">
          <strong><xsl:value-of select="@name"/></strong></a></font>
      </td></tr>
      <!-- Subsection body -->
      <div class="text">
        <xsl:apply-templates/>
      </div>
    </div>

  </xsl:template>



  </xsl:template>

  <xsl:template mode="toc" match="section|subsection">
    <xsl:variable name="name2">
      <xsl:choose>
        <xsl:when test="@anchor">
          <xsl:value-of select="@anchor" />

        </xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
    <xsl:variable name="name">
      <xsl:value-of select="translate($name2, ' #', '__')"/>
    </xsl:variable>
    <li><a href="#{$name}"><xsl:value-of select="@name"/></a>
    <xsl:if test="subsection">
      <ol><xsl:apply-templates mode="toc" select="subsection"/></ol>
    </xsl:if>


  <!-- Process a source code example -->
  <xsl:template match="source">
  <div class="codeBox">
    <pre>
      <xsl:if test="@wrapped='true'">
        <xsl:attribute name="class">wrap</xsl:attribute>
      </xsl:if>
      <code><xsl:apply-templates/></code>
    </pre>
  </div>
          </td>
          <td bgcolor="{$source-color}" height="1">
            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
          </td>
          <td bgcolor="{$source-color}" width="1" height="1">
            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
          </td>
        </tr>
        <tr>
          <td bgcolor="{$source-color}" width="1">
            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
          </td>
    <xsl:choose>
      <xsl:when test="@wrapped='true'">
          <td bgcolor="#ffffff" height="1">
            <div class="wrapped-source">
            <code>
              <xsl:apply-templates />
            </code>
            </div>
          </td>
      </xsl:when>
      <xsl:otherwise>
          <td bgcolor="#ffffff" height="1"><pre>
            <xsl:value-of select="."/>
          </pre></td>
      </xsl:otherwise>
    </xsl:choose>
          <td bgcolor="{$source-color}" width="1">
            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
          </td>
        </tr>
        <tr>
          <td bgcolor="{$source-color}" width="1" height="1">
            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
          </td>
          <td bgcolor="{$source-color}" height="1">
            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
          </td>
          <td bgcolor="{$source-color}" width="1" height="1">
            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
          </td>
        </tr>
      </table>
    </div>
  </xsl:template>




  <!-- Process an attributes list with nested attribute elements -->
  <xsl:template match="attributes">
    <table class="defaultTable">
      <tr>
        <th style="width: 15%;">
          Attribute
        </th>
        <th style="width: 85%;">
          Description
        </th>
      </tr>
      <xsl:for-each select="attribute">
        <tr>
          <td>
            <xsl:if test="@required = 'true'">
              <strong><code class="attributeName"><xsl:value-of select="@name"/></code></strong>
            </xsl:if>

              <code class="attributeName"><xsl:value-of select="@name"/></code>
            </xsl:if>
          </td>
          <td>
            <xsl:apply-templates/>
          </td>
        </tr>


  <!-- Process a properties list with nested property elements -->
  <xsl:template match="properties">
    <table class="defaultTable">
      <tr>
        <th style="width: 15%;">
          Property
        </th>
        <th style="width: 85%;">
          Description
        </th>
      </tr>
      <xsl:for-each select="property">
        <tr>
          <td>
            <code class="propertyName"><xsl:value-of select="@name"/></code>
          </td>
          <td>
            <xsl:apply-templates/>
          </td>
        </tr>

    </table>
  </xsl:template>

  <!-- Fix relative links in printer friendly versions of the docs -->
  <xsl:template match="a">
    <xsl:variable name="href" select="@href"/>
    <xsl:choose>
      <xsl:when test="$standalone = 'standalone'">
        <xsl:apply-templates/>
      </xsl:when>
      <xsl:when test="$project-menu != 'menu' and starts-with(@href,'../')">
        <a href="../{$href}"><xsl:apply-templates/></a>
      </xsl:when>
      <xsl:when test="$project-menu != 'menu' and starts-with(@href,'./') and contains(substring(@href,3),'/')">
        <a href=".{$href}"><xsl:apply-templates/></a>
      </xsl:when>
      <xsl:when test="$project-menu != 'menu' and not(contains(@href,'//')) and not(starts-with(@href,'/')) and not(starts-with(@href,'#')) and contains(@href,'/')">
        <a href="../{$href}"><xsl:apply-templates/></a>
      </xsl:when>
      <xsl:when test="$href != ''">
        <a href="{$href}"><xsl:apply-templates/></a>
      </xsl:when>
      <xsl:otherwise>
        <xsl:variable name="name" select="@name"/>
        <a name="{$name}"><xsl:apply-templates/></a>
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>

  <!-- Changelog related tags -->
  <xsl:template match="changelog">
    <ul class="changelog">
      <xsl:apply-templates/>
    </ul>
  </xsl:template>

  <xsl:template match="changelog/add">
    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/add.gif</xsl:variable>
    <li>
    <img alt="Add: " class="icon" src="{$src}"/><xsl:apply-templates/>
  </li>
    </tr>
  </xsl:template>

  <xsl:template match="changelog/update">
    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/update.gif</xsl:variable>
    <li>
    <img alt="Update: " class="icon" src="{$src}"/><xsl:apply-templates/>
  </li>
    </tr>
  </xsl:template>

  <xsl:template match="changelog/design">
    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/design.gif</xsl:variable>
    <li>
    <img alt="Design: " class="icon" src="{$src}"/><xsl:apply-templates/>
  </li>
    </tr>
  </xsl:template>

  <xsl:template match="changelog/docs">
    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/docs.gif</xsl:variable>
    <li>
    <img alt="Docs: " class="icon" src="{$src}"/><xsl:apply-templates/>
  </li>
    </tr>
  </xsl:template>

  <xsl:template match="changelog/fix">
    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/fix.gif</xsl:variable>
    <li>
    <img alt="Fix: " class="icon" src="{$src}"/><xsl:apply-templates/>
  </li>
    </tr>
  </xsl:template>

  <xsl:template match="changelog/scode">
    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/code.gif</xsl:variable>
    <li>
    <img alt="Code: " class="icon" src="{$src}"/><xsl:apply-templates/>
  </li>
    </tr>
  </xsl:template>

  <!-- Process an attributes list with nested attribute elements -->
  <xsl:template match="status">
    <table border="1" cellpadding="5">
      <tr>
        <th width="15%" bgcolor="{$attributes-color}">
          <font color="#ffffff">Priority</font>
        </th>
        <th width="50%" bgcolor="{$attributes-color}">
          <font color="#ffffff">Action Item</font>
        </th>
        <th width="25%" bgcolor="{$attributes-color}">
          <font color="#ffffff">Volunteers</font>
        </th>
        <xsl:for-each select="item">
        <tr>
          <td align="left" valign="center">
            <xsl:value-of select="@priority"/>
          </td>
          <td align="left" valign="center">
            <xsl:apply-templates/>
          </td>
          <td align="left" valign="center">
            <xsl:value-of select="@owner"/>
          </td>
        </tr>
        </xsl:for-each>
      </tr>
    </table>
  </xsl:template>

  <!-- Link to a bug report -->
  <xsl:template match="bug">
      <xsl:variable name="link"><xsl:value-of select="$buglink"/><xsl:value-of select="text()"/></xsl:variable>

      <a href="{$link}">r<xsl:apply-templates/></a>
  </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">
        <xsl:if test="@colspan"><xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute></xsl:if>
        <xsl:if test="@rowspan"><xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute></xsl:if>
        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
            <xsl:apply-templates/>
        </font>
    </td>
  </xsl:template>

  <!-- handle th ala site.vsl -->
  <xsl:template match="table[@class='detail-table']/tr/th">
    <td bgcolor="{$table-th-bg}" valign="top">
        <xsl:if test="@colspan"><xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute></xsl:if>
        <xsl:if test="@rowspan"><xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute></xsl:if>
        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
            <xsl:apply-templates />
        </font>
    </td>
  </xsl:template>

  <!-- Process everything else by just passing it through -->
  <xsl:template match="*|@*">
    <xsl:copy>

Return to bug 55383

Lines 210-215 Link Here

(-)build.xml (+7 lines)
210	<tstamp>	210	<tstamp>
211	<format property="year" pattern="yyyy" locale="en"/>	211	<format property="year" pattern="yyyy" locale="en"/>
212	<format property="today" pattern="MMM d yyyy" locale="en"/>	212	<format property="today" pattern="MMM d yyyy" locale="en"/>
		213	<format property="today-iso-8601" pattern="yyyy-MM-dd" locale="en"/>
213	<format property="tstamp" pattern="hh:mm:ss"/>	214	<format property="tstamp" pattern="hh:mm:ss"/>
214	</tstamp>	215	</tstamp>
215	<filterset id="version.filters">	216	<filterset id="version.filters">
Lines 845-850 Link Here
845	<param name="relative-path" expression="."/>	846	<param name="relative-path" expression="."/>
846	<param name="version" expression="${version}"/>	847	<param name="version" expression="${version}"/>
847	<param name="build-date" expression="${today}"/>	848	<param name="build-date" expression="${today}"/>
		849	<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
848	<param name="year" expression="${year}"/>	850	<param name="year" expression="${year}"/>
849	</xslt>	851	</xslt>
850	<xslt basedir="webapps/docs/appdev"	852	<xslt basedir="webapps/docs/appdev"
Lines 859-864 Link Here
859	<param name="relative-path" expression=".."/>	861	<param name="relative-path" expression=".."/>
860	<param name="version" expression="${version}"/>	862	<param name="version" expression="${version}"/>
861	<param name="build-date" expression="${today}"/>	863	<param name="build-date" expression="${today}"/>
		864	<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
862	<param name="year" expression="${year}"/>	865	<param name="year" expression="${year}"/>
863	</xslt>	866	</xslt>
864	<xslt basedir="webapps/docs/funcspecs"	867	<xslt basedir="webapps/docs/funcspecs"
Lines 873-878 Link Here
873	<param name="relative-path" expression=".."/>	876	<param name="relative-path" expression=".."/>
874	<param name="version" expression="${version}"/>	877	<param name="version" expression="${version}"/>
875	<param name="build-date" expression="${today}"/>	878	<param name="build-date" expression="${today}"/>
		879	<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
876	<param name="year" expression="${year}"/>	880	<param name="year" expression="${year}"/>
877	</xslt>	881	</xslt>
878	<xslt basedir="webapps/docs/config"	882	<xslt basedir="webapps/docs/config"
Lines 887-892 Link Here
887	<param name="relative-path" expression=".."/>	891	<param name="relative-path" expression=".."/>
888	<param name="version" expression="${version}"/>	892	<param name="version" expression="${version}"/>
889	<param name="build-date" expression="${today}"/>	893	<param name="build-date" expression="${today}"/>
		894	<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
890	<param name="year" expression="${year}"/>	895	<param name="year" expression="${year}"/>
891	</xslt>	896	</xslt>
892	<xslt basedir="webapps/docs/architecture"	897	<xslt basedir="webapps/docs/architecture"
Lines 901-906 Link Here
901	<param name="relative-path" expression=".."/>	906	<param name="relative-path" expression=".."/>
902	<param name="version" expression="${version}"/>	907	<param name="version" expression="${version}"/>
903	<param name="build-date" expression="${today}"/>	908	<param name="build-date" expression="${today}"/>
		909	<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
904	<param name="year" expression="${year}"/>	910	<param name="year" expression="${year}"/>
905	</xslt>	911	</xslt>
906		912
Lines 916-921 Link Here
916	<param name="relative-path" expression=".."/>	922	<param name="relative-path" expression=".."/>
917	<param name="version" expression="${version}"/>	923	<param name="version" expression="${version}"/>
918	<param name="build-date" expression="${today}"/>	924	<param name="build-date" expression="${today}"/>
		925	<param name="build-date-iso-8601" expression="${today-iso-8601}"/>
919	<param name="year" expression="${year}"/>	926	<param name="year" expression="${year}"/>
920	</xslt>	927	</xslt>
921	</target>	928	</target>

Line 0 Link Here

(-)webapps/docs/images/docs-stylesheet.css (+265 lines)
		1	@charset "utf-8";
		2	/*
		3	Licensed to the Apache Software Foundation (ASF) under one or more
		4	contributor license agreements. See the NOTICE file distributed with
		5	this work for additional information regarding copyright ownership.
		6	The ASF licenses this file to You under the Apache License, Version 2.0
		7	(the "License"); you may not use this file except in compliance with
		8	the License. You may obtain a copy of the License at
		9
		10	http://www.apache.org/licenses/LICENSE-2.0
		11
		12	Unless required by applicable law or agreed to in writing, software
		13	distributed under the License is distributed on an "AS IS" BASIS,
		14	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		15	See the License for the specific language governing permissions and
		16	limitations under the License.
		17	*/
		18
		19
		20	/* General style */
		21
		22	body {
		23	margin: 0;
		24	}
		25
		26	body, input {
		27	font-family: 'Lucida Sans Unicode', Arial, Helvetica, sans-serif;
		28	font-size: 10.5pt;
		29	}
		30
		31	code, pre {
		32	font-family: Consolas, monospace;
		33	}
		34
		35	img {
		36	border: 0;
		37	}
		38
		39	table {
		40	border-collapse: collapse;
		41	}
		42
		43	main {
		44	/* Remove this once all IEs support <main> element */
		45	display: block;
		46	}
		47
		48
		49	/* Layout */
		50
		51	#wrapper {
		52	min-width: 400px;
		53	}
		54
		55	#header {
		56	box-shadow: 0 0 7px #aaa;
		57	border-bottom: 1px solid #bbb;
		58	}
		59
		60	#header > div {
		61	padding-left: 15px;
		62	padding-right: 15px;
		63
		64	background: linear-gradient(to bottom, #ffffff -10%, #F8F3E4 100%);
65	position: relative;
66	}
67
68	#header .logo {
69	float: left;
70	padding-top: 10px;
71	min-width: 190px;
72	}
73
74	#header .logo img{
75	/* To avoid that the Font Descender being added to the parent div's height */
76	vertical-align: middle;
77	}
78
79	#header .asfLogo {
80	float: right;
81	position: relative;
82	top: 8px;
83	}
84
85	#header h1 {
86	margin-top: 0.6em;
87	margin-bottom: 0;
88	}
89
90	#header .versionInfo {
91	font-size: 13pt;
92	margin-bottom: 1em;
93	}
94
95	#middle {
96
97	display: table;
98	table-layout: fixed;
99	margin: 0;
100
101	width: 100%;
102
103
104	}
105	#middle > div { display: table-row; }
106	#middle > div > div { display: table-cell; vertical-align: top; }
107
108
109
110	#mainLeft {
111	width: 190px;
112	}
113
114	#mainLeft > div {
115	margin-top: -1px; /* to overwrite border of element above */
116	padding-left: 16px;
117	padding-right: 14px;
118	padding-top: 6px;
119	padding-bottom: 15px;
120	background-color: #F8F3E4;
121	border-right: 1px solid #bbb;
122	border-bottom: 1px solid #bbb;
123	font-size: 10pt;
124	border-bottom-right-radius: 20px;
125	box-shadow: 0 0 5px #aaa;
126	}
127
128	#mainLeft h2 {
129	margin-bottom: 0.2em;
130	font-size: 1.2em;
131	}
132
133	#mainLeft ul {
134	padding: 0;
135	margin: 0;
136	list-style-type: none;
137	}
138
139	#mainLeft ul a {
140	text-indent: -0.6em;
141	padding-left: 1.4em;
142	display: block;
143	text-decoration: none;
144	color: #444;
145	}
146	#mainLeft ul a:hover {
147	color: #000;
148	background-color: #D1c9b9;
149	}
150
151	#mainRight {
152	padding-left: 14px;
153	padding-right: 20px;
154
155	}
156
157	#footer {
158	margin-top: 30px;
159	padding-top: 20px;
160	padding-bottom: 20px;
161	padding-left: 20px;
162	padding-right: 20px;
163	border-top: 1px solid #ccc;
164	color: #444;
165	text-align: center;
166	/* font-style: italic; */
167	font-size: 9pt;
168	}
169
170
171	/* Content */
172
173	#content div.text {
174	padding-left: 1em;
175	padding-left: 1em;
176	}
177
178	#content h3, #content h4, #content h5, #content h6 {
179	padding-left: 5px;
180	padding-right: 5px;
181	background-color: #eaeaea;
182	border: 1px solid #ccc;
183	border-radius: 4px;
184	}
185
186	#content h4, #content h5, #content h6 {
187	background-color: #f6f6f6;
188	}
189
190	code {
191	background-color: rgb(224,255,255);
192	padding: 0 0.1em;
193	}
194
195	div.codeBox pre code, code.attributeName, code.propertyName {
196	background-color: transparent;
197	}
198	div.codeBox {
199	overflow: auto;
200	/* TODO: Maybe add margin-top and margin-bottom like with <p> */
201	}
202	div.codeBox pre {
203	margin: 0;
204	padding: 4px;
205	border: 1px solid #999;
206	border-radius: 5px;
207	background-color: #eff8ff;
208	display: table; /* To prevent <pre>s from taking the complete available width. */
209	/*
210	When it is officially supported, use the following CSS instead of display: table
211	to prevent big <pre>s from exceeding the browser window:
212	max-width: available;
213	width: min-content;
214	*/
215	}
216
217	div.codeBox pre.wrap {
218	white-space: pre-wrap;
219	}
220
221
222	table.defaultTable th {
223	background-color: #88b;
224	color: #fff;
225	}
226
227	table.detail-table th {
228	background-color: #039acc;
229	color: #fff;
230	}
231	table.detail-table td {
232	background-color: #DAF2FA;
233	}
234
235	table.defaultTable th, table.defaultTable td, table.detail-table th, table.detail-table td {
236	border: 1px solid #777;
237	padding: 5px;
238	text-align: left;
239	}
240
241
242	p.notice {
243	border: 1px solid rgb(255, 0, 0);
244	background-color: rgb(238, 238, 238);
245	color: rgb(0, 51, 102);
246	padding: 0.5em;
247	margin: 1em 2em 1em 1em;
248	}
249
250
251	/* Changelog-Styles */
252
253	ul.changelog {
254	padding-left: 1em;
255	list-style-type: none;
256	}
257
258	ul.changelog li{
259	padding-top: 5px;
260	padding-bottom: 5px;
261	}
262
263	ul.changelog img {
264	vertical-align: middle
265	}