You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/02/16 19:26:46 UTC
svn commit: r378329 - in /maven/maven-1/plugins/trunk/xdoc: plugin.jelly
xdocs/changes.xml
Author: ltheussl
Date: Thu Feb 16 10:26:44 2006
New Revision: 378329
URL: http://svn.apache.org/viewcvs?rev=378329&view=rev
Log:
Rolling back my fix for MPXDOC-181: it breaks projects that declare a pre- or post-goal on any of the modified goals
Modified:
maven/maven-1/plugins/trunk/xdoc/plugin.jelly
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/plugin.jelly?rev=378329&r1=378328&r2=378329&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.jelly Thu Feb 16 10:26:44 2006
@@ -564,7 +564,7 @@
<!-- ================================================================== -->
<goal name="xdoc"
- prereqs="xdoc:init, xdoc:generate-from-pom-noinit, xdoc:transform-noinit"
+ prereqs="xdoc:generate-from-pom, xdoc:transform"
description="Generate html project documentation xdoc sources"/>
<goal name="xdoc:init"
@@ -662,12 +662,8 @@
<goal
name="xdoc:generate-from-pom"
- 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">
+ prereqs="xdoc:init, xdoc:i18n-validation, xdoc:register-reports"
+ description="Generates xdocs for site based on project descriptor">
<echo>Generating xdocs from POM ... </echo>
@@ -884,12 +880,9 @@
<!-- 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, xdoc:copy-resources-noinit"
- description="copy static resources for use in xdocs generated html"/>
-
- <goal name="xdoc:copy-resources-noinit">
+ prereqs="xdoc:init"
+ description="copy static resources for use in xdocs generated html">
<util:tokenize var="allLocales" delim=", " trim="true">${maven.xdoc.locale.default}, ${maven.xdoc.locale.supported}</util:tokenize>
@@ -1004,11 +997,8 @@
<!-- 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, xdoc:copy-user-resources-noinit"
- description="Copy user provided resources to docs destination"/>
-
-
- <goal name="xdoc:copy-user-resources-noinit">
+ prereqs="xdoc:init"
+ description="Copy user provided resources to docs destination">
<j:if test="${maven.docs.src.available}">
<log:info>
@@ -1113,15 +1103,13 @@
<!-- ================================================================== -->
<goal name="xdoc:transform"
- prereqs="xdoc:init, xdoc:transform-noinit"
- description="Generate html project documentation xdoc sources"/>
-
- <goal name="xdoc:transform-noinit">
+ prereqs="xdoc:init"
+ description="Generate html project documentation xdoc sources">
<!-- use JSL in Jelly to build the documentation -->
- <attainGoal name="xdoc:copy-resources-noinit"/>
- <attainGoal name="xdoc:copy-user-resources-noinit"/>
- <attainGoal name="xdoc:jelly-transform-noinit"/>
+ <attainGoal name="xdoc:copy-resources"/>
+ <attainGoal name="xdoc:copy-user-resources"/>
+ <attainGoal name="xdoc:jelly-transform"/>
<xdoc:unGrabClassLoader/>
</goal>
@@ -1168,11 +1156,8 @@
</goal>
<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">
+ prereqs="xdoc:init, xdoc:jelly-init, xdoc:register-reports"
+ description="transform xdocs using jelly/jsl rather than dvsl">
<j:set var="destdir" value="${maven.docs.dest}"/>
<j:set var="outputencoding" value="${maven.docs.outputencoding}"/>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=378329&r1=378328&r2=378329&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Thu Feb 16 10:26:44 2006
@@ -28,7 +28,6 @@
<body>
<release version="1.10-SNAPSHOT" date="in SVN">
<action dev="ltheussl" type="add">Include instructions for ClearCase, Starteam and Perforce access in the scm-usage page.</action>
- <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>