Author: ltheussl
Date: Wed Jul 29 18:33:52 2009
New Revision: 799004
URL: http://svn.apache.org/viewvc?rev=799004&view=rev
Log:
[MSITE-299] Add Doxia logging support.
Submitted by: Vincent Siveton
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=799004&r1=799003&r2=799004&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Wed Jul 29 18:33:52 2009
@@ -212,6 +212,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-logging-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-apt</artifactId>
<version>${doxiaVersion}</version>
<scope>runtime</scope>
@@ -264,7 +269,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-doxia-tools</artifactId>
- <version>1.0.2</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<!-- Wagon -->
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=799004&r1=799003&r2=799004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Wed Jul 29 18:33:52 2009
@@ -32,7 +32,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.reporting.MavenReport;
-import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.IOException;
@@ -380,7 +379,7 @@
String desc1 = i18n.getString( "site-plugin", locale,
"report.information.description1" );
String desc2 = i18n.getString( "site-plugin", locale,
"report.information.description2" );
DocumentRenderer renderer = new CategorySummaryDocumentRenderer(
renderingContext, title, desc1, desc2,
-
i18n, categoryReports );
+
i18n, categoryReports, getLog() );
if ( !documents.containsKey( renderer.getOutputName() ) )
{
@@ -400,7 +399,7 @@
String desc1 = i18n.getString( "site-plugin", locale,
"report.project.description1" );
String desc2 = i18n.getString( "site-plugin", locale,
"report.project.description2" );
DocumentRenderer renderer = new CategorySummaryDocumentRenderer(
renderingContext, title, desc1, desc2,
-
i18n, categoryReports );
+
i18n, categoryReports, getLog() );
if ( !documents.containsKey( renderer.getOutputName() ) )
{
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java?rev=799004&r1=799003&r2=799004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
Wed Jul 29 18:33:52 2009
@@ -26,6 +26,8 @@
import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+import org.apache.maven.doxia.tools.MojoLogWrapper;
+import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.i18n.I18N;
@@ -56,15 +58,24 @@
private List categoryReports;
+ private final Log log;
+
public CategorySummaryDocumentRenderer( RenderingContext renderingContext,
String title, String desc1, String desc2,
I18N i18n, List categoryReports )
{
+ this( renderingContext, title, desc1, desc2, i18n, categoryReports,
null );
+ }
+
+ public CategorySummaryDocumentRenderer( RenderingContext renderingContext,
String title, String desc1, String desc2,
+ I18N i18n, List categoryReports,
Log log )
+ {
this.renderingContext = renderingContext;
this.title = title;
this.desc1 = desc1;
this.desc2 = desc2;
this.i18n = i18n;
this.categoryReports = Collections.unmodifiableList( categoryReports );
+ this.log = log;
}
public void renderDocument( Writer writer, Renderer renderer,
SiteRenderingContext siteRenderingContext )
@@ -72,6 +83,11 @@
{
SiteRendererSink sink = new SiteRendererSink( renderingContext );
+ if ( log != null )
+ {
+ sink.enableLogging( new MojoLogWrapper( log ) );
+ }
+
sink.head();
sink.title();
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=799004&r1=799003&r2=799004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
Wed Jul 29 18:33:52 2009
@@ -27,6 +27,7 @@
import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+import org.apache.maven.doxia.tools.MojoLogWrapper;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenMultiPageReport;
@@ -148,6 +149,7 @@
MySinkFactory sf = new MySinkFactory( renderingContext );
SiteRendererSink sink = new SiteRendererSink( renderingContext );
+ sink.enableLogging( new MojoLogWrapper( log ) );
try
{
@@ -187,6 +189,7 @@
for ( Iterator it = sinks.iterator(); it.hasNext(); )
{
MySink mySink = (MySink) it.next();
+ mySink.enableLogging( new MojoLogWrapper( log ) );
log.debug( " Rendering " + mySink.getOutputName() );
