You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by vs...@apache.org on 2007/07/07 13:52:45 UTC

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

Author: vsiveton
Date: Sat Jul  7 04:52:44 2007
New Revision: 554182

URL: http://svn.apache.org/viewvc?view=rev&rev=554182
Log:
MJAVADOC-129: javadocDirectory config parameter is ignored and default doesn't work either.

o auto add the javadocDirectory in the sourcepath and pruned it

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?view=diff&rev=554182&r1=554181&r2=554182
==============================================================================
--- 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 Jul  7 04:52:44 2007
@@ -1516,7 +1516,9 @@
         }
         else
         {
-            sourcePaths = Arrays.asList( sourcepath.split( "[;]" ) );
+            sourcePaths = new ArrayList( Arrays.asList( sourcepath.split( "[;]" ) ) );
+            sourcePaths.add( getJavadocDirectory().getAbsolutePath() );
+            sourcePaths = pruneSourceDirs( sourcePaths );
         }
 
         return sourcePaths;