1 --- maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig 2009-01-31 12:28:40.393331000 -0500
2 +++ maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java 2009-01-31 18:17:01.921601000 -0500
4 import org.apache.maven.plugin.MojoFailureException;
5 import org.apache.maven.reporting.MavenReport;
6 import org.apache.maven.reporting.MavenReportException;
7 +import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
8 import org.codehaus.doxia.sink.Sink;
9 import org.codehaus.plexus.util.StringUtils;
15 - SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
17 + RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
18 + SiteRendererSink sink = new SiteRendererSink( context );
19 generate( sink, Locale.getDefault() );
21 - catch ( RendererException e )
23 - throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
24 - + " report generation:" + e.getMessage(), e );
26 - catch ( IOException e )
27 + catch ( MavenReportException e )
29 throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
30 + " report generation:" + e.getMessage(), e );
32 - catch ( MavenReportException e )
33 + catch ( RuntimeException e )
35 - throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
36 - + " report generation:" + e.getMessage(), e );
37 + getLog().error( e.getMessage(), e );