Author: jvanzyl
Date: Sun Mar 18 11:20:19 2007
New Revision: 519657
URL: http://svn.apache.org/viewvc?view=rev&rev=519657
Log:
o putting the project into the rendering context
Removed:
maven/plugins/trunk/maven-site-plugin/compatibility-notes.txt
Modified:
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/SiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt
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?view=diff&rev=519657&r1=519656&r2=519657
==============================================================================
---
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
Sun Mar 18 11:20:19 2007
@@ -451,6 +451,9 @@
attributes.put( "outputEncoding", outputEncoding );
}
+ // Put any of the properties in directly into the Velocity context
+ attributes.putAll( project.getProperties() );
+
DecorationModel decorationModel = getDecorationModel( locale );
if ( template != null )
{
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?view=diff&rev=519657&r1=519656&r2=519657
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Sun Mar 18 11:20:19 2007
@@ -32,6 +32,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.HashMap;
/**
* Generates the project site.
@@ -60,6 +61,7 @@
*/
private boolean generateReports;
+
/**
* Generate the project site
* <p/>
@@ -105,7 +107,8 @@
}
}
- private void renderLocale( Locale locale, List reports )
+ private void renderLocale( Locale locale,
+ List reports )
throws IOException, RendererException, MojoFailureException,
MojoExecutionException
{
SiteRenderingContext context = createSiteRenderingContext( locale );
Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt?view=diff&rev=519657&r1=519656&r2=519657
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt Sun Mar 18
11:20:19 2007
@@ -1,5 +1,5 @@
------
- Introduction
+ Introduction to $project.name
------
Maria Odea Ching
------
