Author: olamy
Date: Tue Dec 15 00:06:50 2009
New Revision: 890574
URL: http://svn.apache.org/viewvc?rev=890574&view=rev
Log:
merge -r 890093:890094 from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
- copied unchanged from r890094,
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin.properties
maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_de.properties
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 15 00:06:50 2009
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,886844,886847
+/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,886844,886847,890094
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=890574&r1=890573&r2=890574&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Tue Dec 15 00:06:50
2009
@@ -242,7 +242,6 @@
<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>
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=890574&r1=890573&r2=890574&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Tue Dec 15 00:06:50 2009
@@ -63,6 +63,13 @@
*/
private boolean generateReports;
+ /**
+ * Generate a sitemap. The result will be a "sitemap.html" file at the
site root.
+ *
+ * @parameter expression="${generateSitemap}" default-value="false"
+ * @since 2.1
+ */
+ private boolean generateSitemap;
/**
* {...@inheritdoc}
@@ -137,6 +144,14 @@
siteRenderer.render( documents.values(), context, outputDir );
+ if ( generateSitemap )
+ {
+ getLog().info( "Generating Sitemap." );
+
+ new SiteMap( getOutputEncoding(), i18n )
+ .generate( context.getDecoration(),
generatedSiteDirectory, locale );
+ }
+
// Generated docs must be done afterwards as they are often generated
by reports
context.getSiteDirectories().clear();
context.addSiteDirectory( generatedSiteDirectory );
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin.properties?rev=890574&r1=890573&r2=890574&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin.properties
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin.properties
Tue Dec 15 00:06:50 2009
@@ -24,3 +24,7 @@
report.project.description1 = This document provides an overview of the
various reports that are automatically generated by
report.project.description2 = . Each report is briefly described below.
report.project.title = Generated Reports
+
+site.sitemap.title = Sitemap
+site.sitemap.section.title = Sitemap
+site.sitemap.description = This page lists all entries of the
navigation menu in expanded form.
\ No newline at end of file
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_de.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_de.properties?rev=890574&r1=890573&r2=890574&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_de.properties
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_de.properties
Tue Dec 15 00:06:50 2009
@@ -24,3 +24,7 @@
report.project.description1 = Kurzbeschreibung der verschiedenen
Berichte, die automatisch von
report.project.description2 = erstellt wurden.
report.project.title = von Maven erzeugte Berichte
+
+site.sitemap.title = Navigations\u00fcbersicht
+site.sitemap.section.title = Navigations\u00fcbersicht
+site.sitemap.description = Diese Seite listed alle Eintr\u00E4ge
des Navigations-Menus in expandierter Form.
