You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/03/21 20:50:12 UTC
svn commit: r639776 - in
/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev: pom.xml
src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
Author: jdcasey
Date: Fri Mar 21 12:50:09 2008
New Revision: 639776
URL: http://svn.apache.org/viewvc?rev=639776&view=rev
Log:
[MPLUGIN-104] Fixing NoSuchMethodError in AbstractMavenReport...resulting from changed in the Renderer interface from doxia-site-renderer-1.0-alpha-7. Updating doxia deps to use -alpha-10 now.
Modified:
maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml
maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml?rev=639776&r1=639775&r2=639776&view=diff
==============================================================================
--- maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml (original)
+++ maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Fri Mar 21 12:50:09 2008
@@ -7,7 +7,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-reporting-impl</artifactId>
<name>Maven Reporting Implementation</name>
- <version>2.0.4</version>
+ <version>2.0.4.1-SNAPSHOT</version>
+
<developers>
<developer>
<id>vsiveton</id>
@@ -33,7 +34,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
- <version>1.0-alpha-7</version>
+ <version>1.0-alpha-10</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -41,11 +42,6 @@
<version>2.0.4</version>
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>2.0.4</version>
@@ -53,7 +49,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
- <version>1.0-alpha-7</version>
+ <version>1.0-alpha-10</version>
</dependency>
</dependencies>
</project>
Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=639776&r1=639775&r2=639776&view=diff
==============================================================================
--- maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java (original)
+++ maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java Fri Mar 21 12:50:09 2008
@@ -18,14 +18,13 @@
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.reporting.sink.SinkFactory;
import java.io.File;
-import java.io.IOException;
import java.util.Locale;
/**
@@ -61,22 +60,12 @@
String outputDirectory = getOutputDirectory();
SiteRendererSink sink =
- getSiteRenderer().createSink( new File( outputDirectory ), getOutputName() + ".html" );
+ SinkFactory.createSink( new File( outputDirectory ), getOutputName() + ".html" );
generate( sink, Locale.getDefault() );
// TODO: add back when skinning support is in the site renderer
// getSiteRenderer().copyResources( outputDirectory, "maven" );
- }
- catch ( RendererException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( locale ) + " report generation.",
- e );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( locale ) + " report generation.",
- e );
}
catch ( MavenReportException e )
{
Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java?rev=639776&r1=639775&r2=639776&view=diff
==============================================================================
--- maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java (original)
+++ maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java Fri Mar 21 12:50:09 2008
@@ -16,9 +16,11 @@
* limitations under the License.
*/
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
+import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import java.io.File;
import java.io.IOException;
@@ -46,6 +48,11 @@
public Sink getSink( String outputFileName )
throws RendererException, IOException
{
- return siteRenderer.createSink( new File( siteDirectory ), outputFileName );
+ return createSink( new File( siteDirectory ), outputFileName );
+ }
+
+ public static SiteRendererSink createSink( File basedir, String document )
+ {
+ return new SiteRendererSink( new RenderingContext( basedir, document ) );
}
}