Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPXDOC-181

Browse Source 
xdoc:init is called 6 times
Introduced new -noinit goals for all goals that are called internally
while keeping the same behavior of goals that existed before.
This is not very pretty, but I guess xdoc:init is a special case.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@377797 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-02-14 18:29:34 +00:00
parent 318cc613df
commit 2e3901818a
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
xdoc/plugin.jelly
View File

@ -564,7 +564,7 @@
<!-- ================================================================== -->
<goal name="xdoc"
prereqs="xdoc:generate-from-pom, xdoc:transform"
prereqs="xdoc:init, xdoc:generate-from-pom-noinit, xdoc:transform-noinit"
description="Generate html project documentation xdoc sources"/>
<goal name="xdoc:init"
@ -662,8 +662,12 @@
<goal
name="xdoc:generate-from-pom"
prereqs="xdoc:init, xdoc:i18n-validation, xdoc:register-reports"
description="Generates xdocs for site based on project descriptor">
prereqs="xdoc:init, xdoc:generate-from-pom-noinit"
description="Generates xdocs for site based on project descriptor"/>
<goal
name="xdoc:generate-from-pom-noinit"
prereqs="xdoc:i18n-validation, xdoc:register-reports">
<echo>Generating xdocs from POM ... </echo>
@ -877,9 +881,12 @@
<!-- C O P Y R E S O U R C E S -->
<!-- ================================================================== -->
<!-- copy resources needed for xdocs -->
<goal name="xdoc:copy-resources"
prereqs="xdoc:init"
description="copy static resources for use in xdocs generated html">
prereqs="xdoc:init, xdoc:copy-resources-noinit"
description="copy static resources for use in xdocs generated html"/>
<goal name="xdoc:copy-resources-noinit">
<util:tokenize var="allLocales" delim=", " trim="true">${maven.xdoc.locale.default}, ${maven.xdoc.locale.supported}</util:tokenize>
@ -994,8 +1001,11 @@
<!-- copy user resources -->
<!-- Note: this should also prereq xdoc:copy-user-bundles, but that doesn't do anything yet -->
<goal name="xdoc:copy-user-resources"
prereqs="xdoc:init"
description="Copy user provided resources to docs destination">
prereqs="xdoc:init, xdoc:copy-user-resources-noinit"
description="Copy user provided resources to docs destination"/>
<goal name="xdoc:copy-user-resources-noinit">
<j:if test="${maven.docs.src.available}">
<log:info>
@ -1098,15 +1108,17 @@
<!-- ================================================================== -->
<!-- D V S L D O C U M E N T A T I O N -->
<!-- ================================================================== -->
<goal name="xdoc:transform"
prereqs="xdoc:init"
description="Generate html project documentation xdoc sources">
prereqs="xdoc:init, xdoc:transform-noinit"
description="Generate html project documentation xdoc sources"/>
<goal name="xdoc:transform-noinit">
<!-- use JSL in Jelly to build the documentation -->
<attainGoal name="xdoc:copy-resources"/>
<attainGoal name="xdoc:copy-user-resources"/>
<attainGoal name="xdoc:jelly-transform"/>
<attainGoal name="xdoc:copy-resources-noinit"/>
<attainGoal name="xdoc:copy-user-resources-noinit"/>
<attainGoal name="xdoc:jelly-transform-noinit"/>
<xdoc:unGrabClassLoader/>
</goal>
@ -1152,9 +1164,12 @@
</j:if>
</goal>
<goal name="xdoc:jelly-transform"
prereqs="xdoc:init, xdoc:jelly-init, xdoc:register-reports"
description="transform xdocs using jelly/jsl rather than dvsl">
<goal name="xdoc:jelly-transform"
prereqs="xdoc:init, xdoc:jelly-transform-noinit"
description="transform xdocs using jelly/jsl rather than dvsl"/>
<goal name="xdoc:jelly-transform-noinit"
prereqs="xdoc:jelly-init, xdoc:register-reports">
<j:set var="destdir" value="${maven.docs.dest}"/>
<j:set var="outputencoding" value="${maven.docs.outputencoding}"/>

1
xdoc/xdocs/changes.xml
View File

@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10-SNAPSHOT" date="in SVN">
<action dev="ltheussl" type="fix" issue="MPXDOC-181"><code>xdoc:init</code> was called six times during one <code>xdoc</code> run.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-191">Include dependencies' scope in dependencies page.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-190">Include the new theme <code>maven-stylus.css</code>.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-189">Document the use of pom settings by the xdoc plugin.</action>