Index: src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
===================================================================
--- src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	(revision 927422)
+++ src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	(working copy)
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.maven.doxia.sink.render.RenderingContext;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -217,27 +218,25 @@
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-        try
-        {
-            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
+         try
+         {
+             RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
+             SiteRendererSink sink = new SiteRendererSink( context );
+             Locale locale = Locale.getDefault();
+             generate( sink, locale );
+         }
+         catch ( MavenReportException e )
+         {
 
-            generate( sink, Locale.getDefault() );
-        }
-        catch ( RendererException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
-        }
-        catch ( MavenReportException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
-        }
+             getLog().error( "An error has occurred in " + getName( Locale.ENGLISH )
+                     + " report generation:" + e.getMessage(), e );
+         }
+         catch ( RuntimeException e )
+         {
+
+             getLog().error( e.getMessage(), e );
+         }
+
     }
 
     /**
@@ -250,4 +249,12 @@
     {
         return ResourceBundle.getBundle( "javadoc-report", locale, getClass().getClassLoader() );
     }
+
+	public void generate(org.apache.maven.doxia.sink.Sink sink, Locale locale)
+			throws MavenReportException {
+	outputDirectory = getReportOutputDirectory();
+		
+	executeReport( locale ); 
+		
+	}
 }