]>
Commit | Line | Data |
---|---|---|
ad51ea80 | 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 | |
bd00ca76 | 3 | @@ -26,6 +26,7 @@ |
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; | |
10 | ||
11 | @@ -219,24 +220,18 @@ | |
12 | { | |
13 | try | |
14 | { | |
15 | - SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" ); | |
16 | - | |
17 | + RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" ); | |
18 | + SiteRendererSink sink = new SiteRendererSink( context ); | |
19 | generate( sink, Locale.getDefault() ); | |
20 | } | |
21 | - catch ( RendererException e ) | |
22 | - { | |
23 | - throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) | |
24 | - + " report generation:" + e.getMessage(), e ); | |
25 | - } | |
26 | - catch ( IOException e ) | |
27 | + catch ( MavenReportException e ) | |
28 | { | |
29 | throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) | |
30 | + " report generation:" + e.getMessage(), e ); | |
31 | } | |
32 | - catch ( MavenReportException e ) | |
33 | + catch ( RuntimeException e ) | |
34 | { | |
35 | - throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) | |
36 | - + " report generation:" + e.getMessage(), e ); | |
37 | + getLog().error( e.getMessage(), e ); | |
38 | } | |
39 | } | |
40 |