Author: kpreisser
Date: Tue Oct 15 23:20:23 2013
New Revision: 1532586
URL: http://svn.apache.org/r1532586
Log:
Merged revision(s) 1532577 from tomcat/native/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55383
Improve markup and design of Tomcat Native documentation.
Added:
tomcat/native/branches/1.1.x/xdocs/images/asf-feather.png
- copied unchanged from r1532577,
tomcat/native/trunk/xdocs/images/asf-feather.png
tomcat/native/branches/1.1.x/xdocs/images/docs-stylesheet.css
- copied unchanged from r1532577,
tomcat/native/trunk/xdocs/images/docs-stylesheet.css
tomcat/native/branches/1.1.x/xdocs/images/style.css
- copied unchanged from r1532577,
tomcat/native/trunk/xdocs/images/style.css
tomcat/native/branches/1.1.x/xdocs/images/tomcat.png
- copied unchanged from r1532577,
tomcat/native/trunk/xdocs/images/tomcat.png
Removed:
tomcat/native/branches/1.1.x/xdocs/style.css
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/xdocs/index.xml
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml
tomcat/native/branches/1.1.x/xdocs/news/2008.xml
tomcat/native/branches/1.1.x/xdocs/news/2009.xml
tomcat/native/branches/1.1.x/xdocs/news/2010.xml
tomcat/native/branches/1.1.x/xdocs/news/2011.xml
tomcat/native/branches/1.1.x/xdocs/news/2012.xml
tomcat/native/branches/1.1.x/xdocs/news/2013.xml
tomcat/native/branches/1.1.x/xdocs/news/project.xml
tomcat/native/branches/1.1.x/xdocs/project.xml
tomcat/native/branches/1.1.x/xdocs/style.xsl
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
Merged /tomcat/native/trunk:r1532577
Modified: tomcat/native/branches/1.1.x/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/index.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/index.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -48,22 +48,20 @@
<p>
Features of the APR connector:
</p>
- <ul>
- <li>Non-blocking I/O for Keep-Alive requests (between requests)</li>
- <li>Uses OpenSSL for TLS/SSL capabilities (if supported by linked APR
library)</li>
- <li>FIPS 140-2 support for TLS/SSL (if supported by linked OpenSSL
library)</li>
- </ul>
+ <ul>
+ <li>Non-blocking I/O for Keep-Alive requests (between requests)</li>
+ <li>Uses OpenSSL for TLS/SSL capabilities (if supported by linked APR
library)</li>
+ <li>FIPS 140-2 support for TLS/SSL (if supported by linked OpenSSL
library)</li>
+ </ul>
-<p>
- Select one of the links from the navigation menu (to the left) to drill
- down to the more detailed documentation that is available. Each available
- manual is described in more detail below.
-</p>
+
+<p>Select one of the links from the navigation menu (to the left) to drill
+down to the more detailed documentation that is available. Each available
+manual is described in more detail below.</p>
</section>
<section name="Headlines">
-<br />
<ul>
<li><a href="news/2013.html#20131015.1">15 October 2013 - <b>TC-Native-1.1.29
released</b></a>
@@ -84,62 +82,61 @@
<subsection name="Requirements">
<p>
Build tc-native requires three components to be installed:
+ </p>
<ul>
<li>APR library</li>
<li>OpenSSL libraries</li>
<li>Java SE Development Kit (JDK)</li>
</ul>
+
+ <p>
+ In debian based Linux those dependencies could be installed by something
like:
</p>
+ <source>apt-get install libapr1.0-dev libssl-dev</source>
<p>
- In debian based Linux those dependencies could be installed by something
like:
- <pre>
- apt-get install libapr1.0-dev libssl-dev
- </pre>
- In rpm based Linux those dependencies could be installed by something
like:
- <pre>
- yum install apr-devel openssl-devel
- </pre>
+ In rpm based Linux those dependencies could be installed by something
like:
</p>
+ <source>yum install apr-devel openssl-devel</source>
</subsection>
<subsection name="UNIX">
<p>
On all the POSIX systems (Linux, Solaris, HP-UX, AIX etc...) a well-known
configure and make is used to build tc-native.<br/>
- In the jni/native runs:<br/>
- <pre>
- ./configure --help
- </pre>
- to read the description of all the parameters.<br/>
- <pre>
- ./configure --with-apr=$HOME/APR \
- --with-java-home=$JAVA_HOME \
- --with-ssl=$HOME/OPENSSL \
- --prefix=$CATALINA_HOME
- </pre>
+ In the jni/native runs:
+ </p>
+ <source>./configure --help</source>
+ <p>to read the description of all the parameters.</p>
+ <source
+>./configure --with-apr=$HOME/APR \
+ --with-java-home=$JAVA_HOME \
+ --with-ssl=$HOME/OPENSSL \
+ --prefix=$CATALINA_HOME</source>
+ <p>
to create the includes and makefiles to be able to build tc-native.<br/>
Where:<br/>
- $HOME/APR is something like /usr/bin/apr-1-config or the path where apr is
+ <code>$HOME/APR</code> is something like /usr/bin/apr-1-config or the path
where apr is
installed.<br/>
- $JAVA_HOME is something /home/jfclere/JAVA/jdk1.5.0_09 path to a JDK
+ <code>$JAVA_HOME</code> is something /home/jfclere/JAVA/jdk1.5.0_09 path
to a JDK
installation. Any JDK should work but it is advisable to use the same
JVM version the JVM you use with Tomcat.<br/>
- $HOME/OPENSSL is the path where OpenSSL is installed.<br/>
- $CATALINA_HOME is the path where the produced libraries will be installed.
Something like $HOME/apache-tomcat-6.0.16/<br/>
+ <code>$HOME/OPENSSL</code> is the path where OpenSSL is installed.<br/>
+ <code>$CATALINA_HOME</code> is the path where the produced libraries will
be
+ installed. Something like $HOME/apache-tomcat-6.0.16/<br/>
<br/>
The configure is able to guess most of OpenSSL standard installations.
So most of the time the following will be enough:
- <pre>
- ./configure --with-apr=/usr/bin/apr-1-config \
- --with-java-home=/home/jfclere/JAVA/jdk1.5.0_09/ \
- --with-ssl=yes \
- --prefix=$CATALINA_HOME
- </pre>
- <br/>
- To build the libraries and install them:<br/>
- <pre>
- make && make install
- </pre>
+ </p>
+ <source
+>./configure --with-apr=/usr/bin/apr-1-config \
+ --with-java-home=/home/jfclere/JAVA/jdk1.5.0_09/ \
+ --with-ssl=yes \
+ --prefix=$CATALINA_HOME</source>
+ <p>
+ To build the libraries and install them:
+ </p>
+ <source>make && make install</source>
+ <p>
The libraries will be found in $CATALINA_HOME/lib
</p>
</subsection>
@@ -176,30 +173,31 @@
to ensure that something like the following is present, and uncommented:
</p>
- <pre>
- <Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on" />
- </pre>
-
- Please see the Apache Tomcat documentation for configuration specifics.
+ <source wrapped="true"
+ ><![CDATA[<Listener
className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"
/>]]></source>
+ <p>
+ Please see the Apache Tomcat documentation for configuration specifics.
+ </p>
</subsection>
<subsection name="UNIX">
<p>
Edit $CATALINA_HOME/bin/setenv.sh (creating the file if necessary) and add
the path to the tc-native libraries to LD_LIBRARY_PATH. Something like:
- <pre>
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CATALINA_HOME/lib
- export LD_LIBRARY_PATH
- </pre>
+ </p>
+ <source>LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CATALINA_HOME/lib
+export LD_LIBRARY_PATH</source>
+ <p>
Start tomcat and check for the messages like this ones:
- <pre>
- Feb 8, 2008 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
- INFO: Loaded APR based Apache Tomcat Native library 1.x.y.
- Feb 8, 2008 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
- INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters
[false], random [true].
- Feb 8, 2008 12:27:41 PM org.apache.coyote.http11.Http11AprProtocol init
- INFO: Initializing Coyote HTTP/1.1 on http-8080
- </pre>
+ </p>
+ <source wrapped="true"
+>Feb 8, 2008 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
+INFO: Loaded APR based Apache Tomcat Native library 1.x.y.
+Feb 8, 2008 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
+INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false],
random [true].
+Feb 8, 2008 12:27:41 PM org.apache.coyote.http11.Http11AprProtocol init
+INFO: Initializing Coyote HTTP/1.1 on http-8080</source>
+ <p>
Refer to the tomcat documentation to configure the connectors
(See <a
href="http://tomcat.apache.org/tomcat-6.0-doc/apr.html";>Tomcat6.0.x</a>
and <a
href="http://tomcat.apache.org/tomcat-5.5-doc/apr.html";>Tomcat5.5.x</a>)
@@ -212,20 +210,19 @@
the path to the tc-native libraries, apr and OpenSSL to PATH. For example:
</p>
- <pre style="white-space:pre-wrap; word-wrap:break-word;">
- set
PATH=%PATH;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\native\Debug;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\apr\Debug;C:\OpenSSL\lib\VC
- </pre>
+ <source wrapped="true"
+ >set
PATH=%PATH;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\native\Debug;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\apr\Debug;C:\OpenSSL\lib\VC</source>
<p>
Start tomcat and check for the messages like this ones:
</p>
- <pre>
- Feb 8, 2008 2:48:17 PM org.apache.catalina.core.AprLifecycleListener init
- INFO: Loaded APR based Apache Tomcat Native library 1.x.y.
- Feb 8, 2008 2:48:17 PM org.apache.catalina.core.AprLifecycleListener init
- INFO: APR capabilities: IPv6 [false], sendfile [true], accept filters
[false], random [true].
- Feb 8, 2008 2:48:18 PM org.apache.coyote.http11.Http11AprProtocol init
- INFO: Initializing Coyote HTTP/1.1 on http-8080
- </pre>
+ <source wrapped="true"
+>Feb 8, 2008 2:48:17 PM org.apache.catalina.core.AprLifecycleListener init
+INFO: Loaded APR based Apache Tomcat Native library 1.x.y.
+Feb 8, 2008 2:48:17 PM org.apache.catalina.core.AprLifecycleListener init
+INFO: APR capabilities: IPv6 [false], sendfile [true], accept filters [false],
random [true].
+Feb 8, 2008 2:48:18 PM org.apache.coyote.http11.Http11AprProtocol init
+INFO: Initializing Coyote HTTP/1.1 on http-8080</source>
+
</subsection>
</section>
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Tue Oct 15
23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml Tue Oct 15
23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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
Modified: tomcat/native/branches/1.1.x/xdocs/news/2008.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2008.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/news/2008.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2008.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -30,38 +30,29 @@
<body>
<section name="2008 News & Status">
-<br />
-<a name="20081118.1">
-<h3>18 November - TC-Native-1.1.16 released</h3>
-</a>
+<subsection anchor="20081118.1" name="18 November - TC-Native-1.1.16 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.16. This is a stable release adding some bug fixes.
</p>
-
-<a name="20080911.1">
-<h3>11 September - TC-Native-1.1.15 released</h3>
-</a>
+</subsection>
+<subsection anchor="20080911.1" name="11 September - TC-Native-1.1.15
released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.15. This is a stable release adding some bug fixes.
</p>
-
-<a name="20080704.1">
-<h3>4 July - TC-Native-1.1.14 released</h3>
-</a>
+</subsection>
+<subsection anchor="20080704.1" name="4 July - TC-Native-1.1.14 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.14. This is a stable release adding some bug fixes.
</p>
-
-<a name="20080115.1">
-<h3>15 February - TC-Native-1.1.13 released</h3>
-</a>
+</subsection>
+<subsection anchor="20080115.1" name="15 February - TC-Native-1.1.13 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.13. This is a stable release adding few new features
and some bug fixes.
</p><p>
Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
</p>
-<hr size="1" noshade="noshade" />
+</subsection>
</section>
</body>
</document>
Modified: tomcat/native/branches/1.1.x/xdocs/news/2009.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2009.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/news/2009.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2009.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -30,16 +30,13 @@
<body>
<section name="2009 News & Status">
-<br />
-<a name="20091123.1">
-<h3>23 November - TC-Native-1.1.18 released</h3>
-</a>
+<subsection anchor="20091123.1" name="23 November - TC-Native-1.1.18 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.18. This is a stable release adding some bug fixes.
</p><p>
Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
</p>
-<hr size="1" noshade="noshade" />
+</subsection>
</section>
</body>
</document>
Modified: tomcat/native/branches/1.1.x/xdocs/news/2010.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2010.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/news/2010.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2010.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -30,23 +30,18 @@
<body>
<section name="2010 News & Status">
-<br />
-<a name="20100217.1">
-<h3>17 February - TC-Native-1.1.20 released</h3>
-</a>
+<subsection anchor="20100217.1" name="17 February - TC-Native-1.1.20 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.20. This is a stable release adding some bug fixes.
</p>
-<br />
-<a name="20100108.1">
-<h3>8 January - TC-Native-1.1.19 released</h3>
-</a>
+</subsection>
+<subsection anchor="20100108.1" name="8 January - TC-Native-1.1.19 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.19. This is a stable release adding some bug fixes.
</p><p>
Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
</p>
-<hr size="1" noshade="noshade" />
+</subsection>
</section>
</body>
</document>
Modified: tomcat/native/branches/1.1.x/xdocs/news/2011.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2011.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/news/2011.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2011.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -30,18 +30,14 @@
<body>
<section name="2011 News & Status">
-<br />
-<a name="20110808.1">
-<h3>08 August - TC-Native-1.1.22 released</h3>
-</a>
+<subsection anchor="20110808.1" name="08 August - TC-Native-1.1.22 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.22. This is a stable release adding some bug fixes.
</p>
-<br />
<p>
Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
</p>
-<hr size="1" noshade="noshade" />
+</subsection>
</section>
</body>
</document>
Modified: tomcat/native/branches/1.1.x/xdocs/news/2012.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2012.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/news/2012.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2012.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -30,32 +30,24 @@
<body>
<section name="2012 News & Status">
-<br />
-<a name="20120613.1">
-<h3>13 June - TC-Native-1.1.24 released</h3>
-</a>
+<subsection anchor="20120613.1" name="13 June - TC-Native-1.1.24 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.24. This is a feature-add release adding support for
per-socket Poller timeouts.
</p>
-<br />
<p>
Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
</p>
-<hr size="1" noshade="noshade" />
-<br />
-<a name="20120302.1">
-<h3>02 March - TC-Native-1.1.23 released</h3>
-</a>
+</subsection>
+<subsection anchor="20120302.1" name="02 March - TC-Native-1.1.23 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.23. This is a stable release adding some bug fixes and
experimental support for OCSP and PKCS12 certificates.
</p>
-<br />
<p>
Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
</p>
-<hr size="1" noshade="noshade" />
+</subsection>
</section>
</body>
</document>
Modified: tomcat/native/branches/1.1.x/xdocs/news/2013.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2013.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/news/2013.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2013.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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
@@ -30,37 +30,27 @@
<body>
<section name="2013 News & Status">
-<br />
-<a name="20131015.1">
-<h3>15 October - TC-Native-1.1.29 released</h3>
-</a>
+<subsection anchor="20131015.1" name="15 October - TC-Native-1.1.29 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.29. This is a bug fixing release.
</p>
-<br />
-<a name="20130916.1">
-<h3>16 September - TC-Native-1.1.28 released</h3>
-</a>
+</subsection>
+<subsection anchor="20130916.1" name="16 September - TC-Native-1.1.28
released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.28. This is a bug fixing release.
</p>
-<br />
<p>
Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
</p>
-<hr size="1" noshade="noshade" />
-<br />
-<a name="20130212.1">
-<h3>12 February - TC-Native-1.1.27 released</h3>
-</a>
+</subsection>
+<subsection anchor="20130212.1" name="12 February - TC-Native-1.1.27 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Native 1.1.27. This is a bug fixing release.
</p>
-<br />
<p>
Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
</p>
-<hr size="1" noshade="noshade" />
+</subsection>
</section>
</body>
</document>
Modified: tomcat/native/branches/1.1.x/xdocs/news/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/project.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/news/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/project.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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
Modified: tomcat/native/branches/1.1.x/xdocs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/project.xml?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/project.xml Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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
Modified: tomcat/native/branches/1.1.x/xdocs/style.xsl
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/style.xsl?rev=1532586&r1=1532585&r2=1532586&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/style.xsl (original)
+++ tomcat/native/branches/1.1.x/xdocs/style.xsl Tue Oct 15 23:20:23 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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
@@ -20,181 +20,131 @@
<!-- $Id: style.xsl 572120 2007-09-02 19:32:11Z markt $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- version="1.0">
+ version="3.0">
<!-- Output method -->
<xsl:output method="html"
- encoding="iso-8859-1"
- indent="no"/>
+ html-version="5.0"
+ encoding="UTF-8"
+ indent="no"
+ doctype-system="about:legacy-compat"/>
<!-- Defined parameters (overrideable) -->
<xsl:param name="home-name" select="'Apache Tomcat'"/>
<xsl:param name="home-href" select="'http://tomcat.apache.org/'"/>
- <xsl:param name="home-logo" select="'/images/tomcat.gif'"/>
- <xsl:param name="printer-logo" select="'/images/printer.gif'"/>
+ <xsl:param name="home-logo" select="'/images/tomcat.png'"/>
+ <xsl:param name="home-stylesheet"
select="'/images/docs-stylesheet.css'"/>
+ <xsl:param name="apache-logo" select="'/images/asf-feather.png'"/>
<xsl:param name="relative-path" select="'.'"/>
- <xsl:param name="void-image" select="'/images/void.gif'"/>
- <xsl:param name="project-menu" select="'menu'"/>
- <xsl:param name="standalone" select="''"/>
<xsl:param name="buglink"
select="'http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
<!-- 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'"/>
+
<!-- Process an entire document into an HTML page -->
<xsl:template match="document">
- <html>
- <head>
- <title><xsl:value-of select="project/title"/> - <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" value="{$name}"/>
- <meta name="email" value="{$email}"/>
- </xsl:for-each>
- <link href="{$relative-path}/style.css" type="text/css" rel="stylesheet"/>
- </head>
-
- <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
- alink="{$body-link}" vlink="{$body-link}">
-
- <table border="0" width="100%" cellspacing="4">
-
- <xsl:comment>PAGE HEADER</xsl:comment>
- <tr><td colspan="2">
-
- <xsl:comment>TOMCAT LOGO</xsl:comment>
- <xsl:variable name="alt">
- <xsl:value-of select="$home-name"/>
- </xsl:variable>
- <xsl:variable name="href">
- <xsl:value-of select="$home-href"/>
- </xsl:variable>
- <xsl:variable name="src">
- <xsl:value-of select="$relative-path"/><xsl:value-of
select="$home-logo"/>
- </xsl:variable>
- <a href="{$href}">
- <img src="{$src}" align="left" alt="{$alt}" border="0"/>
- </a>
+<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"/>
+ <link href="{$relative-path}/images/style.css" rel="stylesheet"
type="text/css"/>
+ <title><xsl:value-of select="project/title"/> - <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}"/>
+ </xsl:for-each>
+ </head>
+
+ <body>
+ <div id="wrapper">
+ <!-- Header -->
+ <header><div 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="project/logo/@href"/>
+ <xsl:value-of select="$relative-path"/><xsl:value-of
select="$home-logo"/>
</xsl:variable>
-
- <xsl:comment>APACHE LOGO</xsl:comment>
- <a href="http://www.apache.org/";>
- <img src="http://www.apache.org/images/asf-logo.gif";
- align="right" alt="Apache Logo" border="0"/>
- </a>
-
+ <div class="logo noPrint">
+ <a href="{project/@href}"><img alt="Tomcat Home" src="{$src}"/></a>
+ </div>
</xsl:if>
- </td></tr>
-
- <xsl:comment>HEADER SEPARATOR</xsl:comment>
- <tr>
- <td colspan="2">
- <hr noshade="noshade" size="1"/>
- </td>
- </tr>
-
- <tr>
+ <div style="height: 1px;"/>
+ <xsl:variable name="src">
+ <xsl:value-of select="$relative-path"/><xsl:value-of
select="$apache-logo"/>
+ </xsl:variable>
+ <div class="asfLogo noPrint">
+ <a href="http://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>
+ <div style="height: 1px;"/>
+ <div style="clear: left;"/>
+ </div>
+ </div>
+ </div></header>
- <!-- Don't generate a menu if styling printer friendly docs -->
- <xsl:if test="$project-menu = 'menu'">
- <xsl:comment>LEFT SIDE NAVIGATION</xsl:comment>
- <td width="20%" valign="top" nowrap="true">
+ <div id="middle">
+ <div>
+ <div id="mainLeft" class="noprint">
+ <div>
+ <!-- Navigation -->
+ <nav>
<xsl:apply-templates select="project/body/menu"/>
- </td>
- </xsl:if>
-
- <xsl:comment>RIGHT SIDE MAIN BODY</xsl:comment>
- <td width="80%" valign="top" align="left">
- <table border="0" width="100%" cellspacing="4">
- <tr>
- <td align="left" valign="top">
- <h1><xsl:value-of select="project/title"/></h1>
- <h2><xsl:value-of select="properties/title"/></h2>
- </td>
- <td align="right" valign="top" nowrap="true">
- <!-- Add the printer friendly link for docs with a menu -->
- <xsl:if test="$project-menu = 'menu'">
- <xsl:variable name="src">
- <xsl:value-of select="$relative-path"/><xsl:value-of
select="$printer-logo"/>
- </xsl:variable>
- <xsl:variable name="url">
- <xsl:value-of select="/document/@url"/>
- </xsl:variable>
- <small>
- <a href="printer/{$url}">
- <img src="{$src}" border="0" alt="Printer Friendly
Version"/>
- <br />print-friendly<br />version
- </a>
- </small>
- </xsl:if>
- <xsl:if test="$project-menu != 'menu'">
- <xsl:variable name="void">
- <xsl:value-of select="$relative-path"/><xsl:value-of
select="$void-image"/>
- </xsl:variable>
- <img src="{$void}" width="1" height="1" vspace="0"
hspace="0" border="0"/>
- </xsl:if>
- </td>
- </tr>
- </table>
- <xsl:apply-templates select="body/section"/>
- </td>
+ </nav>
+ </div>
+ </div>
+ <div id="mainRight">
+ <div id="content">
+ <!-- Main Part -->
+ <h2><xsl:value-of select="properties/title"/></h2>
+ <xsl:apply-templates select="body/section"/>
- </tr>
- <xsl:comment>FOOTER SEPARATOR</xsl:comment>
- <tr>
- <td colspan="2">
- <hr noshade="noshade" size="1"/>
- </td>
- </tr>
+ </div>
+ </div>
+ </div>
+ </div>
- <xsl:comment>PAGE FOOTER</xsl:comment>
- <tr><td colspan="2">
- <div align="center"><font color="{$body-link}" size="-1"><em>
- Copyright © 2008-2013, Apache Software Foundation
- </em></font></div>
- </td></tr>
+ <!-- Footer -->
+ <footer><div id="footer">
+ Copyright © 2008-2013, The Apache Software Foundation
+ </div></footer>
+</div>
+</body>
+</html>
- </table>
- </body>
- </html>
</xsl:template>
<!-- Process a menu for the navigation bar -->
<xsl:template match="menu">
- <p><strong><xsl:value-of select="@name"/></strong></p>
+ <div>
+ <h2><strong><xsl:value-of select="@name"/></strong></h2>
<ul>
<xsl:apply-templates select="item"/>
</ul>
+ </div>
</xsl:template>
@@ -209,85 +159,112 @@
<!-- Process a documentation section -->
<xsl:template match="section">
+ <xsl:variable name="name2">
+ <xsl:choose>
+ <xsl:when test="@anchor">
+ <xsl:value-of select="@anchor" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<xsl:variable name="name">
- <xsl:value-of select="@name"/>
+ <xsl:value-of select="translate($name2, ' #', '__')"/>
</xsl:variable>
- <table border="0" cellspacing="0" cellpadding="2" width="100%">
- <!-- Section heading -->
- <tr><td bgcolor="{$banner-bg}">
- <font color="{$banner-fg}" face="arial,helvetica.sanserif">
- <a name="{$name}">
- <strong><xsl:value-of select="@name"/></strong></a></font>
- </td></tr>
- <!-- Section body -->
- <tr><td><blockquote>
- <xsl:apply-templates/>
- </blockquote></td></tr>
- </table>
+
+
+ <!-- Section heading -->
+ <h3 id="{$name}">
+ <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> </xsl:text> <!-- Ensure a space follows after
</span> -->
+ </xsl:if>
+ <xsl:value-of select="@name"/>
+ </h3>
+ <!-- Section body -->
+ <div class="text">
+ <xsl:apply-templates/>
+ </div>
+
</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:when>
+ <xsl:otherwise>
+ <xsl:if test="
+ count(//*[(local-name()='section' or local-name()='subsection')
and @name=current()/@name]) > 1
+ ">
+ <xsl:value-of select="concat(ancestor::section/@name, '/')"/>
+ </xsl:if>
+ <xsl:value-of select="@name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<xsl:variable name="name">
- <xsl:value-of select="@name"/>
+ <xsl:value-of select="translate($name2, ' #', '__')"/>
</xsl:variable>
- <table border="0" cellspacing="0" cellpadding="2" width="100%">
+
+
+ <div class="subsection">
<!-- Subsection heading -->
- <tr><td bgcolor="{$sub-banner-bg}">
- <font color="{$sub-banner-fg}" face="arial,helvetica.sanserif">
- <a name="{$name}">
- <strong><xsl:value-of select="@name"/></strong></a></font>
- </td></tr>
+ <!-- TODO: When a <subsection> is nested in another <subsection>,
+ the output should be <h5>, not <h4>. Same with <h6>. -->
+ <h4 id="{$name}">
+ <xsl:value-of select="@name"/>
+ </h4>
<!-- Subsection body -->
- <tr><td><blockquote>
+ <div class="text">
<xsl:apply-templates/>
- </blockquote></td></tr>
- </table>
+ </div>
+ </div>
+
</xsl:template>
<!-- Process a source code example -->
<xsl:template match="source">
- <xsl:variable name="void">
- <xsl:value-of select="$relative-path"/><xsl:value-of
select="$void-image"/>
- </xsl:variable>
- <div class="example"><pre>
- <xsl:value-of select="."/>
- </pre>
- </div>
+ <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>
</xsl:template>
<!-- Process an attributes list with nested attribute elements -->
<xsl:template match="attributes">
- <table border="1" cellpadding="5">
+ <table class="defaultTable">
<tr>
- <th width="20%" bgcolor="{$attributes-color}">
- <xsl:choose>
- <xsl:when test="@name != ''">
- <font color="#ffffff"><xsl:value-of select="@name"/></font>
- </xsl:when>
- <xsl:otherwise>
- <font color="#ffffff">Attribute</font>
- </xsl:otherwise>
- </xsl:choose>
+ <th style="width: 15%;">
+ Attribute
</th>
- <th width="80%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Description</font>
+ <th style="width: 85%;">
+ Description
</th>
</tr>
<xsl:for-each select="attribute">
<tr>
- <td align="left" valign="center">
+ <td>
<xsl:if test="@required = 'true'">
- <strong><code><xsl:value-of select="@name"/></code></strong>
+ <strong><code class="attributeName"><xsl:value-of
select="@name"/></code></strong>
</xsl:if>
<xsl:if test="@required != 'true'">
- <code><xsl:value-of select="@name"/></code>
+ <code class="attributeName"><xsl:value-of select="@name"/></code>
</xsl:if>
</td>
- <td align="left" valign="center">
+ <td>
<xsl:apply-templates/>
</td>
</tr>
@@ -295,281 +272,63 @@
</table>
</xsl:template>
- <!-- Process a directives list with nested directive elements -->
- <xsl:template match="directives">
- <table border="1" cellpadding="5">
- <tr>
- <th width="15%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Directive</font>
- </th>
- <th width="10%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Default</font>
- </th>
- <th width="75%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Description</font>
- </th>
- </tr>
- <xsl:for-each select="directive">
- <tr>
- <td align="left" valign="center">
- <xsl:if test="@required = 'true'">
- <strong><code><xsl:value-of select="@name"/></code></strong>
- </xsl:if>
- <xsl:if test="@required != 'true'">
- <code><xsl:value-of select="@name"/></code>
- </xsl:if>
- </td>
- <xsl:choose>
- <xsl:when test="@default != ''">
- <td align="center" valign="center">
- <code><xsl:value-of select="@default"/></code>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td align="center" valign="center">
- <code>-</code>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- <td align="left" valign="center">
- <xsl:apply-templates/>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </xsl:template>
- <!-- Process an advanced directives list with nested directive elements -->
- <xsl:template match="advanceddirectives">
- <table border="1" cellpadding="5">
- <tr>
- <th width="10%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Directive</font>
- </th>
- <th width="10%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Worker Type</font>
- </th>
- <th width="8%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Default</font>
- </th>
- <th width="72%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Description</font>
- </th>
- </tr>
- <xsl:for-each select="directive">
- <tr>
- <td align="left" valign="center">
- <xsl:if test="@required = 'true'">
- <strong><code><xsl:value-of select="@name"/></code></strong>
- </xsl:if>
- <xsl:if test="@required != 'true'">
- <code><xsl:value-of select="@name"/></code>
- </xsl:if>
- </td>
- <xsl:choose>
- <xsl:when test="@workers != ''">
- <td align="left" valign="center">
- <code><xsl:value-of select="@workers"/></code>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td align="left" valign="center">
- <code>?</code>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="@default != ''">
- <td align="center" valign="center">
- <code><xsl:value-of select="@default"/></code>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td align="center" valign="center">
- <code>-</code>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- <td align="left" valign="center">
- <xsl:apply-templates/>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </xsl:template>
-
- <!-- Process a deprecations list with nested directive elements -->
- <xsl:template match="deprecations">
- <table border="1" cellpadding="5">
- <tr>
- <th width="15%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Directive</font>
- </th>
- <th width="15%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Successor</font>
- </th>
- <th width="10%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Default</font>
- </th>
- <th width="60%" bgcolor="{$attributes-color}">
- <font color="#ffffff">Description</font>
- </th>
- </tr>
- <xsl:for-each select="directive">
- <tr>
- <td align="left" valign="center">
- <code><xsl:value-of select="@name"/></code>
- </td>
- <xsl:choose>
- <xsl:when test="@successor != ''">
- <td align="center" valign="center">
- <code><xsl:value-of select="@successor"/></code>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td align="center" valign="center">
- <code>-</code>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="@default != ''">
- <td align="center" valign="center">
- <code><xsl:value-of select="@default"/></code>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td align="center" valign="center">
- <code>-</code>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- <td align="left" valign="center">
- <xsl:apply-templates/>
- </td>
- </tr>
- </xsl:for-each>
- </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>
-
<!-- Warning -->
<xsl:template match="warn">
<p>
- <font color="#ff0000">
+ <span style="color: #ff0000;">
<xsl:apply-templates/>
- </font>
+ </span>
</p>
</xsl:template>
<!-- Changelog related tags -->
<xsl:template match="changelog">
- <table border="0" cellpadding="2" cellspacing="2">
+ <ul class="changelog">
<xsl:apply-templates/>
- </table>
+ </ul>
</xsl:template>
<xsl:template match="changelog/add">
- <tr>
- <xsl:variable name="src"><xsl:value-of
select="$relative-path"/>/images/add.gif</xsl:variable>
- <td valign="top"><img alt="add" class="icon" src="{$src}"/></td>
- <td><xsl:apply-templates/></td>
- </tr>
+ <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>
</xsl:template>
<xsl:template match="changelog/update">
- <tr>
- <xsl:variable name="src"><xsl:value-of
select="$relative-path"/>/images/update.gif</xsl:variable>
- <td valign="top"><img alt="update" class="icon" src="{$src}"/></td>
- <td><xsl:apply-templates/></td>
- </tr>
+ <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>
</xsl:template>
<xsl:template match="changelog/design">
- <tr>
- <xsl:variable name="src"><xsl:value-of
select="$relative-path"/>/images/design.gif</xsl:variable>
- <td valign="top"><img alt="design" class="icon" src="{$src}"/></td>
- <td><xsl:apply-templates/></td>
- </tr>
+ <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>
</xsl:template>
<xsl:template match="changelog/docs">
- <tr>
- <xsl:variable name="src"><xsl:value-of
select="$relative-path"/>/images/docs.gif</xsl:variable>
- <td valign="top"><img alt="docs" class="icon" src="{$src}"/></td>
- <td><xsl:apply-templates/></td>
- </tr>
+ <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>
</xsl:template>
<xsl:template match="changelog/fix">
- <tr>
- <xsl:variable name="src"><xsl:value-of
select="$relative-path"/>/images/fix.gif</xsl:variable>
- <td valign="top"><img alt="fix" class="icon" src="{$src}"/></td>
- <td><xsl:apply-templates/></td>
- </tr>
+ <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>
</xsl:template>
<xsl:template match="changelog/scode">
- <tr>
- <xsl:variable name="src"><xsl:value-of
select="$relative-path"/>/images/code.gif</xsl:variable>
- <td valign="top"><img alt="code" class="icon" src="{$src}"/></td>
- <td><xsl:apply-templates/></td>
- </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: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>
</xsl:template>
<!-- Link to a bug report -->
@@ -579,9 +338,6 @@
</xsl:template>
- <xsl:template match="code">
- <b class="code"><xsl:apply-templates select="text()"/></b>
- </xsl:template>
<xsl:template match="todo">
<p class="todo">
@@ -592,113 +348,8 @@
</xsl:if>
</p>
</xsl:template>
-
- <!-- Screens -->
-
- <xsl:template match="screen">
- <p class="screen">
- <div align="left">
- <table width="80%" border="1" cellspacing="0" cellpadding="2"
bgcolor="#000000">
- <tr>
- <td bgcolor="#000000" align="left">
- <xsl:apply-templates
select="note|wait|type|typedos|type5250|typenext|read"/>
- </td>
- </tr>
- </table>
- </div>
- </p>
- </xsl:template>
-
- <xsl:template match="note">
- <div class="screen">
- <xsl:value-of select="text()"/>
- </div>
- </xsl:template>
-
- <xsl:template match="wait">
- <div class="screen">[...]</div>
- </xsl:template>
-
- <xsl:template match="type">
- <code>
- <nobr>
- <em class="screen">
- <xsl:text>[user@host] ~</xsl:text>
- <xsl:if test="string-length(@dir) > 0">
- <xsl:text>/</xsl:text>
- <xsl:value-of select="@dir"/>
- </xsl:if>
- <xsl:text> $ </xsl:text>
- </em>
- <xsl:if test="string-length(text()) > 0">
- <b class="screen"><xsl:value-of select="text()"/></b>
- </xsl:if>
- </nobr>
- </code>
- <br/>
- </xsl:template>
- <xsl:template match="typedos">
- <code>
- <nobr>
- <em class="screen">
- <xsl:text>c:\</xsl:text>
- <xsl:if test="string-length(@dir) > 0">
- <xsl:text>/</xsl:text>
- <xsl:value-of select="@dir"/>
- </xsl:if>
- <xsl:text>></xsl:text>
- </em>
- <xsl:if test="string-length(text()) > 0">
- <b class="screen"><xsl:value-of select="text()"/></b>
- </xsl:if>
- </nobr>
- </code>
- <br/>
- </xsl:template>
-
- <xsl:template match="type5250">
- <code>
- <nobr>
- <em class="screen">
- <xsl:text>===></xsl:text>
- </em>
- <xsl:if test="string-length(text()) > 0">
- <b class="screen"><xsl:value-of select="text()"/></b>
- </xsl:if>
- </nobr>
- </code>
- <br/>
- </xsl:template>
- <xsl:template match="typenext">
- <code>
- <nobr>
- <em class="screen">
- <xsl:text> </xsl:text>
- </em>
- <xsl:if test="string-length(text()) > 0">
- <b class="screen"><xsl:value-of select="text()"/></b>
- </xsl:if>
- </nobr>
- </code>
- <br/>
- </xsl:template>
-
- <xsl:template match="read">
- <code class="screen">
- <nobr>
- <xsl:apply-templates select="text()|enter"/>
- </nobr>
- </code>
- <br/>
- </xsl:template>
-
- <xsl:template match="enter">
- <b class="screen"><xsl:value-of select="text()"/></b>
- </xsl:template>
-
-
<!-- Process everything else by just passing it through -->
<xsl:template match="*|@*">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
![http://www.apache.org/images/asf-logo.gif"](http://www.apache.org/images/asf-logo.gif"){kind=link}