You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2009/07/17 08:42:01 UTC
svn commit: r794985 - in /maven/plugins/trunk/maven-site-plugin: ./
src/it/MSITE-265/ src/main/java/org/apache/maven/plugins/site/
Author: ltheussl
Date: Fri Jul 17 06:42:00 2009
New Revision: 794985
URL: http://svn.apache.org/viewvc?rev=794985&view=rev
Log:
[MSITE-298] Update to Doxia 1.1.1. Merge changes from branch. Fix IT.
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=794985&r1=794984&r2=794985&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Jul 17 06:42:00 2009
@@ -141,7 +141,7 @@
</contributors>
<prerequisites>
- <maven>2.0.6</maven>
+ <maven>2.1.0</maven>
</prerequisites>
<scm>
@@ -155,8 +155,8 @@
</issueManagement>
<properties>
- <doxiaVersion>1.0</doxiaVersion>
- <doxiaSitetoolsVersion>1.0</doxiaSitetoolsVersion>
+ <doxiaVersion>1.1.1</doxiaVersion>
+ <doxiaSitetoolsVersion>1.1.1</doxiaSitetoolsVersion>
<mavenVersion>2.0.6</mavenVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
</properties>
@@ -210,6 +210,24 @@
<artifactId>doxia-sink-api</artifactId>
<version>${doxiaVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-apt</artifactId>
+ <version>${doxiaVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xdoc</artifactId>
+ <version>${doxiaVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-fml</artifactId>
+ <version>${doxiaVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- Doxia-sitetools -->
<dependency>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh?rev=794985&r1=794984&r2=794985&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh Fri Jul 17 06:42:00 2009
@@ -77,7 +77,7 @@
System.err.println( "download.html doesn't contain 'charset=UTF-8' directive" );
return false;
}
- if ( downloadContent.indexOf( " \u20AC (euro)" ) < 0)
+ if ( downloadContent.indexOf( "demo character: € (euro)" ) < 0)
{
System.err.println( "download.html doesn't contain euro symbol" );
return false;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=794985&r1=794984&r2=794985&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Fri Jul 17 06:42:00 2009
@@ -21,7 +21,7 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.sink.render.RenderingContext;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
import org.apache.maven.doxia.siterenderer.DocumentRenderer;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java?rev=794985&r1=794984&r2=794985&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java Fri Jul 17 06:42:00 2009
@@ -19,7 +19,8 @@
* 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.sink.render.RenderingContext;
import org.apache.maven.doxia.siterenderer.DocumentRenderer;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
@@ -104,6 +105,8 @@
sink.table();
+ sink.tableRows( new int[] {Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT}, false );
+
String name = i18n.getString( "site-plugin", locale, "report.category.column.document" );
String description = i18n.getString( "site-plugin", locale, "report.category.column.description" );
@@ -142,6 +145,8 @@
}
}
+ sink.tableRows_();
+
sink.table_();
sink.section2_();
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=794985&r1=794984&r2=794985&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java Fri Jul 17 06:42:00 2009
@@ -19,9 +19,9 @@
* 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.sink.SinkFactory;
+import org.apache.maven.doxia.sink.render.RenderingContext;
import org.apache.maven.doxia.siterenderer.DocumentRenderer;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
@@ -34,6 +34,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.OutputStream;
import java.io.Writer;
import java.io.File;
import java.io.FileWriter;
@@ -65,7 +66,8 @@
this.log = log;
}
- private static class MySink extends SiteRendererSink
+ private static class MySink
+ extends SiteRendererSink
{
private File outputDir;
@@ -90,7 +92,8 @@
}
- private static class MySinkFactory implements SinkFactory
+ private static class MySinkFactory
+ implements SinkFactory
{
private RenderingContext context;
@@ -108,13 +111,33 @@
return sink;
}
+ public Sink createSink( File arg0, String arg1, String arg2 )
+ throws IOException
+ {
+ // Not used
+ return null;
+ }
+
+ public Sink createSink( OutputStream arg0 )
+ throws IOException
+ {
+ // Not used
+ return null;
+ }
+
+ public Sink createSink( OutputStream arg0, String arg1 )
+ throws IOException
+ {
+ // Not used
+ return null;
+ }
+
public List sinks()
{
return sinks;
}
}
-
public void renderDocument( Writer writer, Renderer renderer, SiteRenderingContext siteRenderingContext )
throws RendererException, FileNotFoundException
{
@@ -148,6 +171,10 @@
{
throw new RendererException( "Error rendering Maven report: " + e.getMessage(), e );
}
+ finally
+ {
+ sink.close();
+ }
if ( !report.isExternalReport() )
{
@@ -161,11 +188,18 @@
{
MySink mySink = (MySink) it.next();
- log.debug( " Rendering " + mySink.getOutputName() );
+ log.debug( " Rendering " + mySink.getOutputName() );
Writer out = new FileWriter( new File( mySink.getOutputDir(), mySink.getOutputName() ) );
- renderer.generateDocument( out, mySink, siteRenderingContext );
+ try
+ {
+ renderer.generateDocument( out, mySink, siteRenderingContext );
+ }
+ finally
+ {
+ mySink.close();
+ }
}
}
catch ( IOException e )