vmassol 2003/01/03 11:28:52
Modified: documentation build.xml
documentation/docs/skins/jakarta.apache.org/stylesheets
document2html.xsl
Added: documentation/docs/xdocs navigation.xml
Removed: documentation/docs/xdocs book.xml
Log:
- Funnily I made the same change than Chris, at the same moment, but I was in a
train and couldn't commit! We both externalized book.xml information in build.xml. I
merged both of our changes
- Renamed book.xml in navigation.xml (more representative of what it is and
preparation to the next step which is to have several navigation files)
- Slighly modified the navigation.xml DTD
Revision Changes Path
1.1 jakarta-cactus/documentation/docs/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0"?>
<navigation>
<menu label="Doc Tracks">
<item label="WhatIs Track" source="tracks/whatis.xml">
<item label="What is Cactus ?" source="index.xml"/>
</item>
<item label="Status Track" source="tracks/status.xml"/>
<item label="WritingTests Track" source="tracks/writingtests.xml"/>
<item label="RunningTests Track" source="tracks/runningtests.xml"/>
<item label="Participating Track" source="tracks/participating.xml"/>
</menu>
<menu label="About">
<item label="What is Cactus ?" source="index.xml"/>
<item label="News" source="news.xml"/>
<item label="Changes" source="changes.xml"/>
<item label="Features/Status" source="features.xml"/>
<item label="Goals" source="goals.xml"/>
<item label="Roadmap/Todo" source="todo.xml"/>
<item label="Contributors" source="contributors.xml"/>
<item label="Contributing" source="contributing.xml"/>
<item label="Cactus Users" source="users.xml"/>
<item label="Tested on ..." source="testedon.xml"/>
<item label="License" source="license.xml"/>
</menu>
<menu label="Downloads">
<item label="Downloads" source="downloads.xml"/>
</menu>
<menu label="Documentation">
<item label="How it works ?" source="how_it_works.xml"/>
<item type="hidden" source="how_it_works_uml.xml"/>
<item label="Getting Started" source="getting_started.xml"/>
<item label="Mock vs Container" source="mockobjects.xml"/>
<item label="Javadocs" source="javadoc.xml"/>
<item type="hidden" source="javadoc_12.xml"/>
<item type="hidden" source="javadoc_13.xml"/>
<item label="FAQ" source="faq.xml"/>
<item label="Eclipse plugin" source="eclipse_plugin.xml"/>
</menu>
<menu label="Howto Guides">
<item label="Classpath Howto" source="howto_classpath.xml"/>
<item label="Config Howto" source="howto_config.xml"/>
<item label="Migration Howto" source="howto_migration.xml"/>
<!-- TestCase tutorials -->
<item label="TestCase Howto" source="howto_testcase.xml"/>
<item type="hidden" source="howto_testcase_servlet.xml"/>
<item type="hidden" source="howto_testcase_jsp.xml"/>
<item type="hidden" source="howto_testcase_filter.xml"/>
<item label="Jsp Howto" source="howto_jsp.xml"/>
<item label="Runner Howto" source="howto_runner.xml"/>
<item label="Security Howto" source="howto_security.xml"/>
<!-- Ant tutorial -->
<item label="Ant Howto" source="howto_ant.xml"/>
<item type="hidden" source="howto_ant_cactus.xml"/>
<item type="hidden" source="howto_ant_install.xml"/>
<item type="hidden" source="howto_ant_primer.xml"/>
<item label="HttpUnit Howto" source="howto_httpunit.xml"/>
<item label="Sample Howto" source="howto_sample.xml"/>
<!-- EJB tutorial -->
<item label="EJB Howto" source="howto_ejb.xml"/>
<item type="hidden" source="howto_ejb_j2eeri.xml"/>
<!-- IDE tutorials -->
<item label="IDE Howto" source="howto_ide.xml"/>
<item type="hidden" source="howto_ide_vajava_wte.xml"/>
<item type="hidden" source="howto_ide_vajava_tomcat.xml"/>
<item type="hidden" source="howto_ide_jbuilder4.xml"/>
<item type="hidden" source="howto_ide_jbuilder5.xml"/>
<item label="Tomcat Howto" source="howto_tomcat.xml"/>
<item label="JUnitEE Howto" source="howto_junitee.xml"/>
</menu>
<menu label="Support">
<item type="external" label="Bug database"
href="http://jakarta.apache.org/site/bugs.html"/>
<item label="Mailing list" source="mailinglist.xml"/>
</menu>
<menu label="Misc.">
<item label="Why the name ?" source="cactusname.xml"/>
<item label="Logo Challenge" source="logos.xml"/>
<item label="Resources" source="resources.xml"/>
<item label="Test Coverage" source="coverage.xml"/>
<item type="hidden" source="coverage_12.xml"/>
<item type="hidden" source="coverage_13.xml"/>
<item type="hidden" source="coverage_empty.xml"/>
<item type="external" label="Stats"
href="http://jakarta.apache.org/cactus/stats/index.html"/>
<item type="hidden" source="webalizer.xml"/>
</menu>
<menu label="Developers">
<item type="external" label="CVS"
href="http://jakarta.apache.org/site/cvsindex.html"/>
<item label="Coding Conventions" source="coding_conventions.xml"/>
<item label="Build results" source="build_result.xml"/>
<item label="Release Checklist" source="release_checklist.xml"/>
<item label="Build from sources" source="howto_build.xml"/>
</menu>
<menu label="Translations">
<item type="external" label="Korean"
href="http://jakarta.apache-korea.org/cactus/index.html"/>
<item type="external" label="Japanese"
href="http://www.ingrid.org/jajakarta/cactus/"/>
</menu>
</navigation>
1.21 +23 -26 jakarta-cactus/documentation/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 3 Jan 2003 16:45:20 -0000 1.20
+++ build.xml 3 Jan 2003 19:28:51 -0000 1.21
@@ -134,7 +134,6 @@
<!-- Filters -->
<filter token="version" value="${project.version}"/>
- <filter token="otherversion" value="${project.other.version}"/>
<filter token="year" value="${year}"/>
<filter token="today" value="${TODAY}"/>
@@ -165,7 +164,7 @@
elapsed="15" executable="${cvs.executable}">
<fileset dir="${doc.xdoc.dir}">
- <exclude name="book.xml"/>
+ <exclude name="navigation.xml"/>
<exclude name="todo.xml"/>
<exclude name="changes.xml"/>
<exclude name="**/cvslog.xml"/>
@@ -200,35 +199,33 @@
filtering="on"/>
<!-- Generate the docs -->
- <style basedir="${target.xdoc.dir}" destdir="${target.doc.dir}"
+ <style basedir="${target.xdoc.dir}" destdir="${target.doc.dir}"
style="${doc.skin.dir}/jakarta.apache.org/stylesheets/document2html.xsl">
- <include name="*.xml"/>
- <exclude name="book.xml"/>
-
- <!--Location of the book.xml file relative to where the stylesheet
- is located. Note: this path MUST be relative as it is used as a
- realtive URI from within the stylesheet -->
- <param name="bookfile"
- expression="../../../../../${target.xdoc.dir}/book.xml"/>
-
- <!-- Location of the cvslog.xml file relative to where the
- stylesheet is located. Note: this path MUST be relative as it
- is used as a realtive URI from within the stylesheet -->
- <param name="cvslogfile"
- expression="../../../../../${target.xdoc.dir}/cvslog/cvslog.xml"/>
-
- <param name="project.version"
- expression="${project.version}"/>
- <param name="project.other.version"
- expression="${project.other.version}"/>
- <param name="last.updated.date"
- expression="${TODAY}"/>
+ <include name="*.xml"/>
+ <exclude name="navigation.xml"/>
+ <param name="software" expression="Cactus"/>
+ <param name="title" expression="Cactus Documentation"/>
+ <param name="copyright" expression="${year} The Apache
Software Foundation"/>
+ <param name="project.version" expression="${project.version}"/>
+ <param name="project.other.version"
expression="${project.other.version}"/>
+ <param name="last.updated.date" expression="${TODAY}"/>
+
+ <!--Location of the navigation.xml file relative to where the
+ stylesheet is located. Note: this path MUST be relative as it
+ is used as a relative URI from within the stylesheet -->
+ <param name="navfile"
expression="../../../../../${target.xdoc.dir}/navigation.xml"/>
+
+ <!-- Location of the cvslog.xml file relative to where the
+ stylesheet is located. Note: this path MUST be relative
as it
+ is used as a realtive URI from within the stylesheet -->
+ <param name="cvslogfile"
expression="../../../../../${target.xdoc.dir}/cvslog/cvslog.xml"/>
+
</style>
- </target>
-
+ </target>
+
<!--
========================================================================
Generate the documentation (without the generated clover reports that
1.10 +23 -16
jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl
Index: document2html.xsl
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- document2html.xsl 3 Jan 2003 16:45:20 -0000 1.9
+++ document2html.xsl 3 Jan 2003 19:28:52 -0000 1.10
@@ -6,18 +6,25 @@
<!-- ====================================================================== -->
<!-- TODOS:
- - remove all color references and expose them as variables
- - remove stylesheet images (add, update, fix, remove) from
- xdocs/images
+ - remove all color references and expose them as variables. Second
+ step is to use CSS
- handle xdocs located in sub-directories (issue is with the
- relative path to the images)
+ relative path to the images). Solution: add "url" attribute to
+ the <document> tag.
+ - add an XSL param that is the absolute path
+ from this stylesheet to the xdoc root. This is to compute the
+ location of per-directory navigation.xml files
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <!-- Location of the book.xml file, which describes the web site meta
+ <xsl:param name="software" select="''"/>
+ <xsl:param name="title" select="''"/>
+ <xsl:param name="copyright" select="''"/>
+
+ <!-- Location of the navigation.xml file, which describes the web site meta
data such as the menu items, etc -->
- <xsl:param name="bookfile" select="''"/>
+ <xsl:param name="navfile" select="''"/>
<!-- Location of the cvslog.xml file which contains the CVS changelog
items for the last 15 days web site changes -->
@@ -46,10 +53,10 @@
<xsl:variable name="banner-bg" select="'#023264'"/>
<xsl:variable name="banner-fg" select="'#ffffff'"/>
- <!-- Read the menu definitions. It is located in a file named book.xml
- placed at the same level as the xdoc files. The path we specify is
- relative to where this stylesheet is located -->
- <xsl:variable name="book" select="document($bookfile)/book"/>
+ <!-- Read the menu definitions. They are located in a file named
+ navigation.xml placed at the same level as the xdoc files.
+ The path we specify is relative to where this stylesheet is located -->
+ <xsl:variable name="navigation" select="document($navfile)/navigation"/>
<!-- ==================================================================== -->
<!-- Document section -->
@@ -155,7 +162,7 @@
<br/>
<font face="arial,helvetica,sanserif">
- <xsl:apply-templates select="$book"/>
+ <xsl:apply-templates select="$navigation"/>
</font>
</td>
@@ -183,7 +190,7 @@
<td align="center">
<font face="arial,helvetica,sanserif" size="-1" color="{$body-link}">
<i>
- Copyright © <xsl:value-of select="$book/@copyright"/>.
+ Copyright © <xsl:value-of select="$copyright"/>.
All Rights Reserved.
</i>
</font>
@@ -209,7 +216,7 @@
<!-- Menu elements: "menu/menu-item/separator" elements -->
<!-- ==================================================================== -->
- <xsl:template match="menu-item">
+ <xsl:template match="menu/item">
<xsl:choose>
<xsl:when test="@type='external'">
@@ -590,7 +597,7 @@
<xsl:with-param name="width">98%</xsl:with-param>
<xsl:with-param name="font-size">+0</xsl:with-param>
<xsl:with-param name="name">
- <xsl:value-of select="$book/@software"/><xsl:text> </xsl:text>
+ <xsl:value-of select="$software"/><xsl:text> </xsl:text>
<xsl:value-of select="@version"/>
<xsl:if test="@date">
<xsl:text> (released on </xsl:text>
@@ -782,7 +789,7 @@
<xsl:value-of select="/document/properties/title"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="$book/@title"/>
+ <xsl:value-of select="$title"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
