You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2002/12/01 16:52:36 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/xdoc site.jelly site.jsl
dion 2002/12/01 07:52:36
Modified: src/plugins-build/xdoc site.jelly site.jsl
Log:
Nav seems to work
Jelly bugs are still abounding
Can't get node copying with priority right
Revision Changes Path
1.7 +2 -2 jakarta-turbine-maven/src/plugins-build/xdoc/site.jelly
Index: site.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/site.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- site.jelly 21 Nov 2002 05:59:52 -0000 1.6
+++ site.jelly 1 Dec 2002 15:52:36 -0000 1.7
@@ -9,7 +9,7 @@
xmlns:m="jelly:jeez"
xmlns:util="jelly:util"
xmlns:x="jelly:xml"
- xmlns:jslXdoc="jslXDoc"
+ xmlns:jslXdoc="jslXdoc"
xmlns="dummy">
<m:goal name="xdoc:jelly-init" description="Set up jelly xdoc requirements">
@@ -113,7 +113,7 @@
<x:set var="nav" select="$navXML/project" />
<!-- parse the doc and pass it to the stylesheet -->
<x:parse var="doc" xml="${file.toURL()}" />
- <j:file name="${outFile}" prettyPrint="true" outputMode="html">
+ <j:file name="${outFile}" prettyPrint="true">
<j:include uri="./site.jsl" />
</j:file>
1.2 +38 -19 jakarta-turbine-maven/src/plugins-build/xdoc/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/site.jsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- site.jsl 21 Nov 2002 00:21:07 -0000 1.1
+++ site.jsl 1 Dec 2002 15:52:36 -0000 1.2
@@ -8,7 +8,7 @@
xmlns:m="jelly:jeez"
xmlns:util="jelly:util"
xmlns:x="jelly:xml"
- xmlns:jslXdoc="jslXDoc"
+ xmlns:jslXdoc="jslXdoc"
xmlns="dummy">
<jsl:template match="document" trim="no">
@@ -111,8 +111,8 @@
<td>
<!-- render links -->
<x:if select="$nav/body/links">
- <!-- FIXME: need to test/implement
- <jsl:applyTemplates select="$nav/body/links" />-->
+ <!-- FIXME: need to test/implement -->
+ <jsl:applyTemplates select="$nav/body/links" />
</x:if>
<x:if select="not($nav/body/links)">
<!-- FIXME -->
@@ -216,13 +216,13 @@
<div id="bodycol">
<!-- Insert MAIN body here -->
<div class="app">
- <!--
- <jsl:applyTemplates select="body/section" />
- <jsl:applyTemplates select="body/glossary" />
- <jsl:applyTemplates select="body/release" />
- <jsl:applyTemplates select="body/changelog" />
- <jsl:applyTemplates select="body/taskList" />
- -->
+<m:echo>Processing sections <x:expr select="body/section/@name"/></m:echo>
+<!-- FIXME really shouldn't use $doc, but jelly loses it's context again -->
+ <jsl:applyTemplates select="$doc/document/body/section" />
+ <jsl:applyTemplates select="$doc/document/body/glossary" />
+ <jsl:applyTemplates select="$doc/document/body/release" />
+ <jsl:applyTemplates select="$doc/document/body/changelog" />
+ <jsl:applyTemplates select="$doc/document/body/taskList" />
</div>
</div>
</td>
@@ -269,16 +269,16 @@
<jsl:template match="menu" trim="no">
<div>
<strong><x:expr select="@name"/></strong>
-<!-- <jsl:applyTemplates select="item" /> -->
+ <jsl:applyTemplates select="item" />
</div>
</jsl:template>
<jsl:template match="item">
<div>
<j:set var="_name"><x:expr select="@name" /></j:set>
- <j:set var="_link"><x:expr select="@link" /></j:set>
+ <j:set var="_link"><x:expr select="@href" /></j:set>
<small><jslXdoc:itemLink name="${_name}" link="${_link}" /></small>
-<!-- <jsl:applyTemplates select="item" /> -->
+ <jsl:applyTemplates select="item" />
</div>
</jsl:template>
@@ -293,9 +293,9 @@
<x:forEach var="link" select="item">
<j:if test="${linkCount != 1}">|</j:if>
<j:set var="_name"><x:expr select="@name" /></j:set>
- <j:set var="_link"><x:expr select="@link" /></j:set>
+ <j:set var="_link"><x:expr select="@href" /></j:set>
<jslXdoc:itemLink name="${_name}" link="${_link}" />
- <j:set var="linkCount" value="1+${linkCount}"/>
+ <j:set var="linkCount" value="${1+linkCount}"/>
</x:forEach>
</div>
</jsl:template>
@@ -303,11 +303,12 @@
<!-- process a documentation section -->
<jsl:template match="section">
<div class="h3">
- <x:if select="@name">
- <j:set var="_sectionName"><x:expr select="@name"/></j:set>
+ <!-- FIXME: x:if select="@name" doesn't work here -->
+ <j:set var="_sectionName"><x:expr select="@name"/></j:set>
+ <j:if test="${!empty(_sectionName)}">
<h3><a name="${_sectionName}">${_sectionName}</a></h3>
- </x:if>
- <jsl:applyTemplates select="*"/>
+ </j:if>
+ <jsl:applyTemplates />
</div>
</jsl:template>
@@ -332,6 +333,24 @@
<table cellpadding="3" cellspacing="2" border="1" width="100%">
<jsl:applyTemplates select="*"/>
</table>
+ </jsl:template>
+
+ <jsl:template match="tr">
+ <jslXdoc:printRow />
+ <j:set var="count" value="${1+count}"/>
+ <jsl:applyTemplates select="*"/>
+ <!-- FIXME what the hell does this do? -->
+ <x:element name="/tr" />
+ </jsl:template>
+
+ <jsl:template match="p">
+ <p>
+ <jsl:applyTemplates select="."/>
+ </p>
+ </jsl:template>
+
+ <jsl:template match="@*|text()">
+ <x:expr select="*" />
</jsl:template>
</jsl:stylesheet>