svn commit: r439622 - /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 10:40:26 2006
New Revision: 439622

URL: http://svn.apache.org/viewvc?rev=439622&view=rev
Log:
o Used project.getExecutionProject() instead of executionProject to better handle  compileSourceRoot in the site goal

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=439622&r1=439621&r2=439622&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 10:40:26 2006
@@ -106,14 +106,6 @@
     protected MavenProject project;
 
     /**
-     * The currently executed project.
-     *
-     * @parameter expression="${executedProject}"
-     * @readonly
-     */
-    protected MavenProject executedProject;
-
-    /**
      * Set an additional parameter(s) on the command line.  This value should include quotes as necessary for parameters
      * that include spaces.
      *
@@ -974,9 +966,9 @@
         {
             sourcePaths = new ArrayList( project.getCompileSourceRoots() );
 
-            if ( executedProject != null )
+            if ( project.getExecutionProject() != null )
             {
-                sourcePaths.addAll( executedProject.getCompileSourceRoots() );
+                sourcePaths.addAll( project.getExecutionProject().getCompileSourceRoots() );
             }
 
             if ( aggregate && project.isExecutionRoot() )