brett 2004/05/26 05:38:27
Modified: javadoc plugin.jelly
javadoc/src/plugin-test maven.xml
javadoc/xdocs changes.xml
Log:
PR: MPJAVADOC-5
fix javadoc handling of all of maven.compile.src.set, including plugin test
Revision Changes Path
1.42 +6 -15 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- plugin.jelly 25 May 2004 22:18:22 -0000 1.41
+++ plugin.jelly 26 May 2004 12:38:27 -0000 1.42
@@ -72,9 +72,6 @@
</j:when>
<j:otherwise>
-
- <ant:property
name="maven.javadoc.compile.src.set" refid="maven.compile.src.set"/>
-
<!-- Create a patternset for source modifications -->
<patternset id="source.modifications">
<ant:include name="**/*.java"/>
@@ -93,7 +90,7 @@
</patternset>
<!-- Tokenize the set of directories -->
- <util:tokenize var="sources.dirs"
delim="${path.separator}">${maven.javadoc.compile.src.set}</util:tokenize>
+ <util:tokenize var="sources.dirs"
delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
<!-- Counter used to name filesets -->
<j:set var="src.set.counter" value="0"/>
@@ -116,7 +113,7 @@
<j:set var="src.set.counter" value="${src.set.counter + 1}"/>
</j:if>
- </j:forEach> <!-- dir in maven.javadoc.compile.src.set -->
+ </j:forEach> <!-- dir in maven.compile.src.set -->
</j:otherwise>
</j:choose>
@@ -203,10 +200,8 @@
useexternalfile="${maven.javadoc.useexternalfile}"
>
- <ant:property name="maven.javadoc.compile.src.set"
refid="maven.compile.src.set"/>
-
<!-- Tokenize the set of directories -->
- <util:tokenize var="sources.dirs"
delim="${path.separator}">${maven.javadoc.compile.src.set}</util:tokenize>
+ <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}">
@@ -215,7 +210,7 @@
<patternset refid="source.modifications"/>
</ant:fileset>
- </j:forEach>--> <!-- dir in maven.javadoc.compile.src.set -->
+ </j:forEach>--> <!-- dir in maven.compile.src.set -->
<j:if test="${context.getVariable('maven.javadoc.source') != null}">
<ant:setProperty name="source" value="${maven.javadoc.source}" />
@@ -346,12 +341,8 @@
automatically doc-files directories.
We must do it manually.
-->
+ <util:tokenize var="sources.dirs"
delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
<ant:copy todir="${maven.javadoc.destdir}">
-
- <util:tokenize var="sources.dirs" delim="${path.separator}">
- ${maven.javadoc.compile.src.set}
- </util:tokenize>
-
<j:forEach var="dir" items="${sources.dirs}">
<ant:fileset dir="${dir}">
<ant:include name="**/doc-files/**/*"/>
@@ -433,4 +424,4 @@
project="${pom}"/>
</goal>
-</project>
\ No newline at end of file
+</project>
1.8 +2 -7 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 26 May 2004 05:25:29 -0000 1.7
+++ maven.xml 26 May 2004 12:38:27 -0000 1.8
@@ -43,8 +43,7 @@
<goal name="test-javadoc-multi-src">
<delete dir="${maven.build.dir}" failonerror="false"/>
<ant:path id="test.src.set">
- <ant:fileset dir="${basedir}/src/main"/>
- <ant:fileset dir="${basedir}/src/opt"/>
+ <ant:pathelement path="${basedir}/src/opt"/>
</ant:path>
<maven:addPath id="maven.compile.src.set" refid="test.src.set"/>
<attainGoal name="maven-javadoc-plugin:report"/>
@@ -52,17 +51,13 @@
<!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
- <!--
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven3/doc-files/example.txt"/>
- -->
<!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are
generated -->
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
- <!--
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven3/Dummy5.html"/>
<assert:assertFileExists
file="${maven.javadoc.destdir}/org/apache/maven3/Dummy6.html"/>
- -->
</goal>
<goal name="test-javadoc-jar">
@@ -70,4 +65,4 @@
<attainGoal name="javadoc:jar"/>
<assert:assertFileExists
file="${maven.build.dir}/${maven.final.name}_javadoc.jar"/>
</goal>
-</project>
\ No newline at end of file
+</project>
1.31 +1 -0 maven-plugins/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/changes.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- changes.xml 18 May 2004 21:49:38 -0000 1.30
+++ changes.xml 26 May 2004 12:38:27 -0000 1.31
@@ -27,6 +27,7 @@
<body>
<release version="1.5.1-SNAPSHOT" date="In CVS">
<action dev="aheritier" type="fix" issue="MPJAVADOC-24">doc-files directories
contents are correctly copied.</action>
+ <action dev="brett" type="fix" issue="MPJAVADOC-5">Add support for multiple
source directories.</action>
</release>
<release version="1.5" date="2004-05-15">
<action dev="dion" type="fix">javadoc:jar changed to place the jar in
maven.build.dir</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
