Author: hboutemy
Date: Sun Feb 20 21:11:48 2011
New Revision: 1072731
URL: http://svn.apache.org/viewvc?rev=1072731&view=rev
Log:
o removed obsolete reports filtering since the canGenerate() method is directly
checked when building report list
o improved javadoc
Modified:
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/DefaultMavenReportExecutor.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
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=1072731&r1=1072730&r2=1072731&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
Sun Feb 20 21:11:48 2011
@@ -164,7 +164,7 @@ public abstract class AbstractSiteRender
protected File generatedSiteDirectory;
/**
- * The Maven project.
+ * The current Maven project.
*
* @parameter expression="${project}"
* @required
@@ -173,6 +173,8 @@ public abstract class AbstractSiteRender
protected MavenProject project;
/**
+ * The current Maven session.
+ *
* @parameter expression="${session}"
* @required
* @readonly
@@ -180,12 +182,16 @@ public abstract class AbstractSiteRender
protected MavenSession mavenSession;
/**
+ * The Plexus container.
+ *
* @component
* @readonly
*/
protected PlexusContainer plexusContainer;
/**
+ * The report executor.
+ *
* @component
* @readonly
*/
@@ -198,38 +204,14 @@ public abstract class AbstractSiteRender
{
return Collections.emptyList();
}
+
MavenReportExecutorRequest mavenReportExecutorRequest = new
MavenReportExecutorRequest();
mavenReportExecutorRequest.setLocalRepository( localRepository );
mavenReportExecutorRequest.setMavenSession( mavenSession );
mavenReportExecutorRequest.setProject( project );
mavenReportExecutorRequest.setReportPlugins( reportPlugins );
- return mavenReportExecutor.buildMavenReports(
mavenReportExecutorRequest );
- }
- protected List<MavenReportExecution> filterReports(
List<MavenReportExecution> reports )
- {
- List<MavenReportExecution> filteredReports = new
ArrayList<MavenReportExecution>();
- for ( MavenReportExecution mavenReportExecution : reports )
- {
- // noinspection ErrorNotRethrown,UnusedCatchParameter
- MavenReport report = mavenReportExecution.getMavenReport();
- try
- {
- filteredReports.add( mavenReportExecution );
- }
- catch ( AbstractMethodError e )
- {
- // the canGenerateReport() has been added just before the 2.0
release and will cause all the reporting
- // plugins with an earlier version to fail (most of the
org.codehaus mojo now fails)
- // be nice with them, output a warning and don't let them
break anything
-
- getLog().warn(
- "Error loading report " +
report.getClass().getName()
- + " - AbstractMethodError:
canGenerateReport()" );
- filteredReports.add( mavenReportExecution );
- }
- }
- return filteredReports;
+ return mavenReportExecutor.buildMavenReports(
mavenReportExecutorRequest );
}
protected SiteRenderingContext createSiteRenderingContext( Locale locale )
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=1072731&r1=1072730&r2=1072731&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Sun Feb 20 21:11:48 2011
@@ -135,7 +135,7 @@ public class DefaultMavenReportExecutor
return Collections.emptyList();
}
getLog().debug( "DefaultMavenReportExecutor.buildMavenReports()" );
-
+
RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
repositoryRequest.setLocalRepository(
mavenReportExecutorRequest.getLocalRepository() );
repositoryRequest.setRemoteRepositories(
mavenReportExecutorRequest.getProject().getPluginArtifactRepositories() );
@@ -143,7 +143,8 @@ public class DefaultMavenReportExecutor
MavenSession session = mavenReportExecutorRequest.getMavenSession();
List<String> reportPluginKeys = new ArrayList<String>();
List<MavenReportExecution> reports = new
ArrayList<MavenReportExecution>();
-
+
+ String pluginKey = "";
try
{
for ( ReportPlugin reportPlugin :
mavenReportExecutorRequest.getReportPlugins() )
@@ -152,7 +153,7 @@ public class DefaultMavenReportExecutor
plugin.setGroupId( reportPlugin.getGroupId() );
plugin.setArtifactId( reportPlugin.getArtifactId() );
- String pluginKey = reportPlugin.getGroupId() + ":" +
reportPlugin.getArtifactId();
+ pluginKey = reportPlugin.getGroupId() + ":" +
reportPlugin.getArtifactId();
if ( reportPluginKeys.contains( pluginKey ) )
{
logger.info( "plugin " + pluginKey + " will be executed
more than one time" );
@@ -284,7 +285,7 @@ public class DefaultMavenReportExecutor
}
catch ( Exception e )
{
- throw new MojoExecutionException( "failed to get Reports ", e );
+ throw new MojoExecutionException( "failed to get report for " +
pluginKey, e );
}
}
@@ -299,8 +300,8 @@ public class DefaultMavenReportExecutor
}
catch ( AbstractMethodError e )
{
- // the canGenerateReport() has been added just before the 2.0
release and will cause all the reporting
- // plugins with an earlier version to fail (most of the
org.codehaus mojo now fails)
+ // the canGenerateReport() has been added just before Maven 2.0
release and will cause all the reporting
+ // plugins with an earlier version to fail (most of the
org.codehaus mojo fail as of october 2005)
// be nice with them, output a warning and don't let them break
anything
getLog().warn(
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=1072731&r1=1072730&r2=1072731&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
Sun Feb 20 21:11:48 2011
@@ -99,14 +99,14 @@ public class SiteMojo
getLog().debug( "executing Site Mojo" );
}
- List<MavenReportExecution> filteredReports;
+ List<MavenReportExecution> reports;
if ( generateReports )
{
- filteredReports = filterReports( getReports() );
+ reports = getReports();
}
else
{
- filteredReports = Collections.emptyList();
+ reports = Collections.emptyList();
}
try
@@ -119,7 +119,7 @@ public class SiteMojo
for ( Locale locale : localesList )
{
- renderLocale( locale, filteredReports );
+ renderLocale( locale, reports );
}
}
catch ( RendererException e )
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java?rev=1072731&r1=1072730&r2=1072731&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
Sun Feb 20 21:11:48 2011
@@ -156,7 +156,7 @@ public class SiteRunMojo
mavenReportExecution.getMavenReport().setReportOutputDirectory(
tempWebappDirectory );
}
- List<MavenReportExecution> filteredReports = filterReports(
getReports() );
+ List<MavenReportExecution> reports = getReports();
List<Locale> localesList = siteTool.getAvailableLocales( locales );
webapp.setAttribute( DoxiaFilter.LOCALES_LIST_KEY, localesList );
@@ -175,7 +175,7 @@ public class SiteRunMojo
i18nContext.setInputEncoding( getInputEncoding() );
i18nContext.setOutputEncoding( getOutputEncoding() );
- Map<String, DocumentRenderer> i18nDocuments = locateDocuments(
i18nContext, filteredReports, locale );
+ Map<String, DocumentRenderer> i18nDocuments = locateDocuments(
i18nContext, reports, locale );
DoxiaBean doxiaBean;
if ( defaultLocale.equals( locale ) )
{
