dion 2003/10/28 14:27:03
Modified: src/plugins-build/xdoc plugin.jelly
Log:
Start using tag instead of ${pom.getPluginContext(....)}
Revision Changes Path
1.52 +13 -17 maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- plugin.jelly 26 Sep 2003 15:53:41 -0000 1.51
+++ plugin.jelly 28 Oct 2003 22:27:03 -0000 1.52
@@ -4,6 +4,7 @@
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:log="jelly:log"
+ xmlns:maven="jelly:maven"
xmlns:pom="pom"
xmlns:util="jelly:util"
xmlns:x="jelly:xml"
@@ -17,9 +18,7 @@
<define:tag name="deregisterReport">
<!-- @name : Report to deregister, must be same as name used to register -->
- <j:set
- var="reports"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+ <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports"
/>
<j:set var="removeRpt" value="null"/>
<j:forEach var="rpt" items="${reports}">
@@ -39,9 +38,7 @@
@description text description of report
@link the nav-bar link for this report
-->
- <j:set
- var="reports"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+ <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports"
/>
<!-- check if the given name is in the list already -->
<j:set var="add" value="true"/>
@@ -280,8 +277,7 @@
<util:file var="docsSrcFile" name="${maven.docs.src}"/>
<!-- parse the project nav. Someone jellier than me can remove the temp file
requirement -->
- <j:set var="reports"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+ <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports"
/>
<util:file var="tempnav" name="${maven.build.dir}/project-nav.xml"/>
@@ -364,9 +360,7 @@
<!-- All the templates use $project for now. -->
<j:set var="project" value="${pom}"/>
- <j:set
- var="reports"
- value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+ <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports" />
<!-- Does the user want the maven-generated docs on their site? -->
<j:set
@@ -640,11 +634,15 @@
</goal>
- <!-- This is required as the linkchecker runs as a final pass over the generated
- document tree -->
+ <!--
+ ! This is required as the linkchecker runs as a final pass over the generated
+ ! document tree.
+ ! FIXME: Why isn't this in linkcheck?
+ !-->
<goal name="xdoc:performJSL"
description="Allows the LinkCheck plugin to xdoc a single directory">
- <j:set var="maven.xdoc.src"
value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.xdoc.src')}"/>
+
+ <maven:pluginVar var="maven.xdoc.src" plugin="maven-linkcheck-plugin"
property="maven.xdoc.src" />
<doc:performJSL
srcdir="${maven.xdoc.src}"
destdir="${maven.docs.dest}"/>
@@ -652,9 +650,7 @@
<goal name="xdoc:dump-report-settings">
<echo>Dumping report settings</echo>
- <j:set
- var="reports"
- value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+ <maven:pluginVar var="reports" plugin="maven-xdoc-plugin" property="reports" />
<j:forEach var="report" items="${reports}">
<echo>Report: ${report}</echo>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
