dion 2004/05/06 19:22:12
Modified: javadoc/src/plugin-test maven.xml
javadoc plugin.jelly
Log:
Fix javadoc:jar so that it uses build dir
Submitted by: Raphael Philipe Mendes da Silva
Add test to ensure javadoc:jar works
Revision Changes Path
1.2 +8 -1 maven-plugins/javadoc/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 7 May 2004 02:09:29 -0000 1.1
+++ maven.xml 7 May 2004 02:22:12 -0000 1.2
@@ -19,11 +19,18 @@
xmlns:j="jelly:core"
xmlns:assert="assert">
- <goal name="testPlugin" prereqs="test-javadoc">
+ <goal name="testPlugin" prereqs="test-javadoc,test-javadoc-jar">
</goal>
<goal name="test-javadoc">
+ <delete dir="${maven.build.dir}/docs/apidocs" failonerror="false"/>
<attainGoal name="maven-javadoc-plugin:report"/>
<assert:assertFileExists file="${maven.build.dir}/docs/apidocs/index.html"/>
+ </goal>
+
+ <goal name="test-javadoc-jar">
+ <delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar"
failonerror="false"/>
+ <attainGoal name="javadoc:jar"/>
+ <assert:assertFileExists
file="${maven.build.dir}/${maven.final.name}_javadoc.jar"/>
</goal>
</project>
1.34 +1 -1 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plugin.jelly 27 Apr 2004 01:24:45 -0000 1.33
+++ plugin.jelly 7 May 2004 02:22:12 -0000 1.34
@@ -306,7 +306,7 @@
<!--==================================================================-->
<goal name="javadoc:jar" prereqs="javadoc">
<j:set var="maven.javadoc.final.name"
- value="${maven.war.build.dir}/${maven.final.name}_javadoc.jar" />
+ value="${maven.build.dir}/${maven.final.name}_javadoc.jar" />
<ant:jar
destfile="${maven.javadoc.final.name}"
basedir="${maven.javadoc.destdir}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
