Author: ltheussl
Date: Mon Jun 2 05:05:26 2008
New Revision: 662408
URL: http://svn.apache.org/viewvc?rev=662408&view=rev
Log:
Use doxia-beta-1
Modified:
maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml
maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
Modified: maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml?rev=662408&r1=662407&r2=662408&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml Mon Jun 2
05:05:26 2008
@@ -22,13 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugins</artifactId>
<version>10</version>
</parent>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7-SNAPSHOT</version>
+ <version>2.0-beta-8-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Site Plugin</name>
<description>
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>2.0.4</version>
+ <version>2.0.10-SNAPSHOT</version>
</dependency>
<!-- Doxia -->
@@ -197,6 +197,22 @@
<artifactId>doxia-sink-api</artifactId>
<version>${doxiaVersion}</version>
</dependency>
+ <!-- TODO: IT fails without those, why? -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-apt</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xdoc</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-fml</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
<!-- Doxia-sitetools -->
<dependency>
@@ -363,8 +379,8 @@
</profiles>
<properties>
- <doxiaVersion>1.0-alpha-11</doxiaVersion>
- <doxiaSitetoolsVersion>1.0-alpha-11</doxiaSitetoolsVersion>
+ <doxiaVersion>1.0-beta-1-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>1.0-beta-1-SNAPSHOT</doxiaSitetoolsVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>
Modified:
maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java?rev=662408&r1=662407&r2=662408&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
(original)
+++
maven/plugins/branches/maven-site-plugin-doxia-beta-1/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
Mon Jun 2 05:05:26 2008
@@ -20,6 +20,7 @@
*/
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.parser.Parser;
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[] {Parser.JUSTIFY_LEFT, Parser.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_();