aheritier 2004/05/19 16:20:34
Modified: javadoc plugin.jelly
javadoc/src/plugin-test project.xml
javadoc/src/plugin-test/src/main/org/apache/maven
package.html
Added: javadoc/src/plugin-test/src/main/org/apache/maven
Dummy2.java
javadoc/src/plugin-test/src/main/org/apache/maven2
Dummy3.java Dummy4.java package.html
javadoc/src/plugin-test/src/main/org/apache/maven2/doc-files
example.txt
Log:
MPJAVADOC-24 fix with tests
Revision Changes Path
1.37 +13 -3 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plugin.jelly 18 May 2004 20:55:51 -0000 1.36
+++ plugin.jelly 19 May 2004 23:20:33 -0000 1.37
@@ -159,7 +159,6 @@
<ant:record name="${maven.build.dir}/javadoc/report.txt" action="start" />
<ant:javadoc
- packagenames="${pom.package}.*"
destdir="${maven.javadoc.destdir}"
author="${maven.javadoc.author}"
public="${maven.javadoc.public}"
@@ -172,8 +171,7 @@
bottom="${copyright}"
stylesheetfile="${maven.javadoc.stylesheet}"
additionalparam="${maven.javadoc.additionalparam}"
- useexternalfile="${maven.javadoc.useexternalfile}"
- sourcepath="${pom.build.sourceDirectory}">
+ useexternalfile="${maven.javadoc.useexternalfile}">
<!-- sourceSet is set by the javadoc:check-needed function -->
<ant:fileset refid="sourceSet" />
@@ -299,6 +297,18 @@
section="Javadoc Report"
inputText="${inputText}"
output="${genDocs}/javadoc.xml"/>
+
+ <!--
+ Because we use in the javadoc task a fileset and not a packageset
+ (to allow sourceModifications) the javadoc doesn't copy
+ automatically doc-files directories.
+ We must do it manually.
+ -->
+ <ant:copy todir="${maven.javadoc.destdir}">
+ <ant:fileset dir="${pom.build.sourceDirectory}">
+ <ant:include name="**/doc-files/**/*"/>
+ </ant:fileset>
+ </ant:copy>
</j:if>
</goal>
1.2 +8 -0 maven-plugins/javadoc/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 7 May 2004 02:09:29 -0000 1.1
+++ project.xml 19 May 2004 23:20:33 -0000 1.2
@@ -54,5 +54,13 @@
<build>
<sourceDirectory>src/main</sourceDirectory>
+ <sourceModifications>
+ <sourceModification>
+ <className>org.apache.maven.Dummy</className>
+ <excludes>
+ <exclude>**/Dummy4.*</exclude>
+ </excludes>
+ </sourceModification>
+ </sourceModifications>
</build>
</project>
1.2 +1 -1
maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 18 May 2004 20:55:51 -0000 1.1
+++ package.html 19 May 2004 23:20:33 -0000 1.2
@@ -1,4 +1,4 @@
<html>
<head></head>
-<body>Package documentation.<br/> <a href="doc-files/example.txt">Example</a></body>
+<body>Package documentation.<br/> <a href="doc-files/example.txt">example.txt in
doc-files directory.</a></body>
</html>
1.1
maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven/Dummy2.java
Index: Dummy2.java
===================================================================
package org.apache.maven;
public class Dummy2
{
public String badChecky = "error";
}
1.1
maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy3.java
Index: Dummy3.java
===================================================================
package org.apache.maven2;
public class Dummy3
{
public String badChecky = "error";
}
1.1
maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven2/Dummy4.java
Index: Dummy4.java
===================================================================
package org.apache.maven2;
public class Dummy4
{
public String badChecky = "error";
}
1.1
maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven2/package.html
Index: package.html
===================================================================
<html>
<head></head>
<body>Package documentation.<br/> <a href="doc-files/example.txt">example.txt in
doc-files directory.</a></body>
</html>
1.1
maven-plugins/javadoc/src/plugin-test/src/main/org/apache/maven2/doc-files/example.txt
Index: example.txt
===================================================================
This an example
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
