You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/05/26 20:26:22 UTC
svn commit: r660264 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml
src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Author: vsiveton
Date: Mon May 26 11:26:20 2008
New Revision: 660264
URL: http://svn.apache.org/viewvc?rev=660264&view=rev
Log:
MJAVADOC-192: Bump to a new release of Doxia
o bump to doxia:1.0-alpha-11
o updated code
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=660264&r1=660263&r2=660264&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Mon May 26 11:26:20 2008
@@ -140,21 +140,6 @@
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>${doxia-sitetoolsVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- <!-- Using org.codehaus.plexus:plexus-utils instead of -->
- <exclusion>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- wagon -->
@@ -225,9 +210,8 @@
</dependencies>
<properties>
- <!-- TODO need to bump it -->
- <doxiaVersion>1.0-alpha-7</doxiaVersion>
- <doxia-sitetoolsVersion>1.0-alpha-7</doxia-sitetoolsVersion>
+ <doxiaVersion>1.0-alpha-11</doxiaVersion>
+ <doxia-sitetoolsVersion>1.0-alpha-11</doxia-sitetoolsVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=660264&r1=660263&r2=660264&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Mon May 26 11:26:20 2008
@@ -19,8 +19,12 @@
* under the License.
*/
-import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.doxia.siterenderer.RendererException;
+import java.io.File;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -29,12 +33,6 @@
import org.codehaus.doxia.sink.Sink;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
/**
* Generates documentation for the <code>Java code</code> in the project using the standard
* <a href="http://java.sun.com/j2se/javadoc/">Javadoc Tool</a>.
@@ -57,13 +55,6 @@
// ----------------------------------------------------------------------
/**
- * Generates the site report
- *
- * @component
- */
- private Renderer siteRenderer;
-
- /**
* Specifies the destination directory where javadoc saves the generated HTML files.
*
* @parameter expression="${project.reporting.outputDirectory}/apidocs"
@@ -219,19 +210,10 @@
{
try
{
- SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
-
- 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 );
+ RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
+ SiteRendererSink sink = new SiteRendererSink( context );
+ Locale locale = Locale.getDefault();
+ generate( sink, locale );
}
catch ( MavenReportException e )
{
@@ -242,7 +224,7 @@
/**
* Gets the resource bundle for the specified locale.
- *
+ *
* @param locale The locale of the currently generated report.
* @return The resource bundle for the requested locale.
*/