brett 2004/07/13 05:20:03
Modified: javadoc plugin.jelly project.xml
javadoc/xdocs changes.xml
Log:
fix bug when package specified, but no sources in it
Revision Changes Path
1.51 +9 -3 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- plugin.jelly 9 Jul 2004 18:50:48 -0000 1.50
+++ plugin.jelly 13 Jul 2004 12:20:03 -0000 1.51
@@ -148,9 +148,15 @@
<!-- If we have not already find sources -->
<j:if test="${internal.javadoc.needed != true}">
<!-- We construct the fileset -->
-
+ <j:set var="includes" value="**/*.java" />
+ <util:replace var="packageDir" newChar="/" oldChar="."
value="${pom.package}" />
+ <j:if test="${!empty(packageDir)}">
+ <j:set var="includes" value="${packageDir}/**/*.java" />
+ </j:if>
<ant:fileScanner var="sources">
- <ant:fileset dir="${dir}" include="**/*.java"/>
+ <ant:fileset dir="${dir}">
+ <ant:include name="${includes}" />
+ </ant:fileset>
</ant:fileScanner>
<j:set var="internal.javadoc.needed" scope="parent"
@@ -507,4 +513,4 @@
<goal name="javadoc:generate" prereqs="maven-javadoc-plugin:report"/>
<goal name="javadoc" prereqs="maven-javadoc-plugin:report"/>
-</project>
\ No newline at end of file
+</project>
1.41 +1 -1 maven-plugins/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/project.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- project.xml 9 Jul 2004 21:34:10 -0000 1.40
+++ project.xml 13 Jul 2004 12:20:03 -0000 1.41
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-javadoc-plugin</id>
<name>Maven Javadoc Plug-in</name>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.6.1-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Produce Javadocs and report</shortDescription>
<url>http://maven.apache.org/reference/plugins/javadoc/</url>
1.42 +3 -0 maven-plugins/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/changes.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- changes.xml 9 Jul 2004 21:34:10 -0000 1.41
+++ changes.xml 13 Jul 2004 12:20:03 -0000 1.42
@@ -25,6 +25,9 @@
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.6.1-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix">Correct check needed function for when package
is given but there are not java files in it.</action>
+ </release>
<release version="1.6" date="2004-07-09">
<action dev="aheritier" type="fix" issue="MPJAVADOC-33">Javadoc plugin
ignores the package specified in the pom.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-32" due-to="Guillaume
Nodet">The maven-javadoc-plugin:register failed in javadoc plugin
1.5.1-SNAPSHOT.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
