svn commit: r800987 - in /maven/plugins/branches/maven-site-plugin-3.x: pom.xml src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java src/main/java/org/apache/maven/plugins/site/SiteMojo.java

[olamy]

Author: olamy
Date: Tue Aug  4 21:30:24 2009
New Revision: 800987

URL: http://svn.apache.org/viewvc?rev=800987&view=rev
Log:
cleanup code use maven-project-info-reports-plugin 2.2-SNAPSHOT

Modified:
    maven/plugins/branches/maven-site-plugin-3.x/pom.xml
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java

Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=800987&r1=800986&r2=800987&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Tue Aug  4 21:30:24 
2009
@@ -328,6 +328,15 @@
     </pluginManagement>  
   </build>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.2-SNAPSHOT</version>          
+      </plugin>
+    </plugins>
+  </reporting>
   <profiles>
     <profile>
       <id>run-its</id>
@@ -411,11 +420,6 @@
             <artifactId>maven-project-info-reports-plugin</artifactId>
             <version>2.2-SNAPSHOT</version>          
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.6.1-SNAPSHOT</version>          
-          </plugin>          
         </plugins>
       </reporting>
     </profile>

Modified: 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=800987&r1=800986&r2=800987&view=diff
==============================================================================
--- 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 Tue Aug  4 21:30:24 2009
@@ -341,7 +341,7 @@
     }
     
     private MavenReport getConfiguredMavenReport( MojoExecution mojoExecution, 
ClassRealm pluginRealm )
-        throws PluginConfigurationException, PluginManagerException
+        throws PluginConfigurationException, PluginManagerException, 
MojoExecutionException, MojoFailureException
     {
         Mojo mojo =
             (Mojo) pluginManager.getConfiguredMojo( Mojo.class, mavenSession, 
project, mojoExecution, pluginRealm );
@@ -350,20 +350,26 @@
         {
             return (MavenReport) mojo;
         }
-        getLog().error( "mojo " + mojo.getClass() + " cannot be a MavenReport 
it will skipped" );
+        getLog().info( "mojo " + mojo.getClass() + " cannot be a MavenReport 
so nothing will be executed " );
         return null;
     }
 
+    /**
+     * @param pluginDescriptor
+     * @return
+     * @throws PluginManagerException
+     */
     private ClassRealm getMojoReportRealm( PluginDescriptor pluginDescriptor )
         throws PluginManagerException
     {
         ClassRealm sitePluginRealm = (ClassRealm) 
Thread.currentThread().getContextClassLoader();
         List<String> imported = new ArrayList<String>();
-        // exclude minimum !
+
         imported.add( "org.apache.maven.reporting.MavenReport" );
         imported.add( "org.codehaus.doxia.sink.Sink" );
         imported.add( "org.apache.maven.doxia.sink.Sink" );
         imported.add( "org.apache.maven.doxia.sink.SinkEventAttributes" );
+        
         return pluginManager.getPluginRealm( mavenSession, pluginDescriptor, 
sitePluginRealm, imported );
     }
 

Modified: 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=800987&r1=800986&r2=800987&view=diff
==============================================================================
--- 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
 (original)
+++ 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
 Tue Aug  4 21:30:24 2009
@@ -65,7 +65,6 @@
      */
     private boolean generateReports;
 
-    protected PluginManager pluginManager;
 
     /**
      * Generate the project site
@@ -78,7 +77,7 @@
         throws MojoExecutionException, MojoFailureException
     {
 
-       Map<MavenReport, ClassRealm> filteredReports;
+        Map<MavenReport, ClassRealm> filteredReports;
         if ( generateReports )
         {
             filteredReports = filterReports( getReports() );