aheritier 2004/08/21 16:03:40
Modified: javadoc plugin.jelly
javadoc/src/plugin-test/test05 maven.xml
Log:
fix MPJAVADOC-36. It is workaround, because I didn't find a clean solution
to mix the case where the package is defined and the one, where it is not.
Revision Changes Path
1.57 +42 -14 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- plugin.jelly 21 Aug 2004 18:42:04 -0000 1.56
+++ plugin.jelly 21 Aug 2004 23:03:40 -0000 1.57
@@ -300,26 +300,36 @@
</j:choose>
<ant:javadoc
- packagenames="${packageNamesValue}"
- destdir="${maven.javadoc.destdir}"
- author="${maven.javadoc.author}"
- public="${maven.javadoc.public}"
- package="${maven.javadoc.package}"
- private="${maven.javadoc.private}"
- version="${maven.javadoc.version}"
- use="${maven.javadoc.use}"
- windowtitle="${maven.javadoc.windowtitle}"
- doctitle="${maven.javadoc.windowtitle}"
- stylesheetfile="${maven.javadoc.stylesheet}"
- additionalparam="${maven.javadoc.additionalparam}"
- useexternalfile="${maven.javadoc.useexternalfile}"
- verbose="${maven.javadoc.debug}"
+ packagenames ="${packageNamesValue}"
+ destdir ="${maven.javadoc.destdir}"
+ author ="${maven.javadoc.author}"
+ public ="${maven.javadoc.public}"
+ package ="${maven.javadoc.package}"
+ private ="${maven.javadoc.private}"
+ version ="${maven.javadoc.version}"
+ use ="${maven.javadoc.use}"
+ windowtitle ="${maven.javadoc.windowtitle}"
+ doctitle ="${maven.javadoc.windowtitle}"
+ stylesheetfile ="${maven.javadoc.stylesheet}"
+ additionalparam ="${maven.javadoc.additionalparam}"
+ useexternalfile ="${maven.javadoc.useexternalfile}"
+ verbose ="${maven.javadoc.debug}"
>
<ant:sourcepath>
<ant:path refid="internal.javadoc.sources"/>
</ant:sourcepath>
+ <j:if test="${pom.package == null or pom.package.equals('')}">
+ <util:tokenize var="sources.dirs"
delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
+ <j:forEach var="dir" items="${sources.dirs}">
+ <ant:fileset dir="${dir}">
+ <ant:include name="*.java"/>
+ </ant:fileset>
+ </j:forEach>
+ </j:if>
+
+
<j:if test="${context.getVariable('maven.javadoc.source') != null}">
<ant:setProperty name="source" value="${maven.javadoc.source}" />
</j:if>
@@ -417,6 +427,24 @@
</j:forEach>
</ant:javadoc>
+
+ <j:if test="${pom.package == null or pom.package.equals('')}">
+ <!--
+ Because the javadoc doesn't copy
+ automatically doc-files directories if we don't
+ specify a package, we must do it manually.
+ -->
+ <ant:copy todir="${maven.javadoc.destdir}">
+
+ <util:tokenize var="sources.dirs"
delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
+
+ <j:forEach var="dir" items="${sources.dirs}">
+ <ant:fileset dir="${dir}">
+ <ant:include name="**/doc-files/**/*"/>
+ </ant:fileset>
+ </j:forEach>
+ </ant:copy>
+ </j:if>
<ant:record name="${internal.javadoc.working.dir}/report.txt" action="stop" />
1.2 +3 -5 maven-plugins/javadoc/src/plugin-test/test05/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/test05/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 29 Jul 2004 22:59:24 -0000 1.1
+++ maven.xml 21 Aug 2004 23:03:40 -0000 1.2
@@ -27,12 +27,10 @@
<attainGoal name="javadoc"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
<!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
- <!-- Doesn't work actually in this case :-( -->
- <!-- <assert:assertFileExists
file="${maven.javadoc.destdir}/test/doc-files/example.txt"/> -->
+ <assert:assertFileExists
file="${maven.javadoc.destdir}/test/doc-files/example.txt"/>
<!-- assert that javadoc for classes Dummy, Dummy2, Dummy3 are generated -->
- <!-- Doesn't work actually in this case :-( -->
- <!-- <assert:assertFileExists file="${maven.javadoc.destdir}/Dummy.html"/> -->
- <!-- <assert:assertFileExists file="${maven.javadoc.destdir}/Dummy2.html"/> -->
+ <assert:assertFileExists file="${maven.javadoc.destdir}/Dummy.html"/>
+ <assert:assertFileExists file="${maven.javadoc.destdir}/Dummy2.html"/>
<assert:assertFileExists file="${maven.javadoc.destdir}/test/Dummy3.html"/>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
