Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix MPJAVADOC-36. It is workaround, because I didn't find a clean solution

Browse Source 
to mix the case where the package is defined and the one, where it is not.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115990 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2004-08-21 23:03:40 +00:00
parent 6a0d52e0ea
commit eedbf04734
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
javadoc/plugin.jelly
View File

@ -300,26 +300,36 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
</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>
@ -418,6 +428,24 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}]
</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" />
<j:set var="genDocs" value="${maven.gen.docs}" />

8
javadoc/src/plugin-test/test05/maven.xml
View File

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