epugh 2004/10/26 02:02:52
Modified: xdoc/xdocs changes.xml
xdoc/src/plugin-test/test02 maven.xml
xdoc plugin.jelly
Log:
MPXDOC-124 clean doesn't clean velocity.log.1
Revision Changes Path
1.67 +1 -0 maven-plugins/xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/xdocs/changes.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- changes.xml 25 Oct 2004 22:45:53 -0000 1.66
+++ changes.xml 26 Oct 2004 09:02:52 -0000 1.67
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.9-SNAPSHOT" date="in CVS">
+ <action dev="epugh" type="add" issue="MPXDOC-124" due-to="Shinobu
Kawai">Maven xdoc plugin clean up generated velocity log as part of calling
clean.</action>
<action dev="aheritier" type="add" issue="MPXDOC-123">New property
(maven.xdoc.xml.copy) to copy only and not transform some xml files provided in the
${maven.docs.src} directory.</action>
<action dev="brett" type="update">Make compatible with Maven 1.1</action>
<action dev="aheritier" type="fix" issue="MPXDOC-117" due-to="Dennis
Lundberg">Show version if maven.xdoc.date=right</action>
1.3 +2 -0 maven-plugins/xdoc/src/plugin-test/test02/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-test/test02/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 25 Oct 2004 22:45:53 -0000 1.2
+++ maven.xml 26 Oct 2004 09:02:52 -0000 1.3
@@ -25,10 +25,12 @@
<assert:assertEquals expected="0" value="${countLogo.intValue().toString()}"
msg="Logo not found."/>
<x:set var="countUrl"
select="count($linkcheckDoc/linkcheck/file/result[contains(child::target,'project-info.html')][contains(child::status,'NOT
FOUND')])"/>
<assert:assertEquals expected="0" value="${countUrl.intValue().toString()}"
msg="Url not found."/>
+ <assert:assertFileExists file="velocity.log"/>
<!-- Test -->
<assert:assertFileExists file="${maven.docs.dest}/xml_copy_only.xml"/>
<assert:assertFileNotFound file="${maven.docs.dest}/xml_copy_only.html"/>
<assert:assertFileExists file="${maven.docs.dest}/myfile.export.xml"/>
<assert:assertFileNotFound file="${maven.docs.dest}/myfile.export.html"/>
</goal>
+
</project>
1.63 +11 -0 maven-plugins/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/plugin.jelly,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- plugin.jelly 25 Oct 2004 22:45:53 -0000 1.62
+++ plugin.jelly 26 Oct 2004 09:02:52 -0000 1.63
@@ -27,6 +27,7 @@
xmlns:util="jelly:util"
xmlns:x="jelly:xml"
xmlns:velocity="jelly:velocity"
+ xmlns:ant="jelly:ant"
xmlns:doc="doc">
<j:new var="reports" className="java.util.ArrayList"/>
@@ -806,5 +807,15 @@
<echo>Report: ${report}</echo>
</j:forEach>
</goal>
+
+ <goal name="xdoc:clean"
+ description="Remove all extra xdoc artifacts">
+ <ant:delete file="${basedir}/velocity.log" quiet="true" failonerror="false"/>
+ <ant:delete file="${basedir}/velocity.log.1" quiet="true" failonerror="false"/>
+ </goal>
+
+ <preGoal name="clean:clean">
+ <attainGoal name="xdoc:clean" />
+ </preGoal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
