svn commit: r439579 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[vs...@apache.org]

Author: vsiveton
Date: Sat Sep  2 05:15:00 2006
New Revision: 439579

URL: http://svn.apache.org/viewvc?rev=439579&view=rev
Log:
MJAVADOC-82: 'sourcepath' should not be mandatory when using 'subpackages' configuration

o added sourcepath if subpackages is specified

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=439579&r1=439578&r2=439579&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sat Sep  2 05:15:00 2006
@@ -267,6 +267,7 @@
 
     /**
      * Specifies the package directory where javadoc will be executed. The packages are separated by '<code>:</code>'.
+     * See <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#subpackages">subpackages</a>.
      *
      * @parameter expression="${subpackages}"
      */
@@ -731,6 +732,12 @@
         addArgIfNotEmpty( arguments, "-source", quotedArgument( source ), MIN_JAVA_VERSION );
         addArgIf( arguments, verbose, "-verbose" );
         addArgIfNotEmpty( arguments, null, additionalparam );
+
+        if ( ( StringUtils.isEmpty( sourcepath ) ) && ( !StringUtils.isEmpty( subpackages ) ) )
+        {
+            sourcepath = StringUtils.join( sourcePaths.iterator(), File.pathSeparator );
+        }
+
         addArgIfNotEmpty( arguments, "-sourcepath", quotedPathArgument( getSourcePath( sourcePaths ) ) );
 
         if ( !StringUtils.isEmpty( sourcepath ) )