MPXDOC-124 clean doesn't clean velocity.log.1

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116188 13f79535-47bb-0310-9956-ffa450edef68

xdoc/plugin.jelly

@@ -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>

xdoc/src/plugin-test/test02/maven.xml

@@ -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>

xdoc/xdocs/changes.xml

@@ -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>