You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/12/15 13:47:51 UTC
svn commit: r487534 - in /maven/plugins/trunk/maven-site-plugin: pom.xml
src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Author: jvanzyl
Date: Fri Dec 15 04:47:50 2006
New Revision: 487534
URL: http://svn.apache.org/viewvc?view=rev&rev=487534
Log:
o updating reference to the parent POM
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?view=diff&rev=487534&r1=487533&r2=487534
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Dec 15 04:47:50 2006
@@ -20,7 +20,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>4-SNAPSHOT</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-site-plugin</artifactId>
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?view=diff&rev=487534&r1=487533&r2=487534
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Fri Dec 15 04:47:50 2006
@@ -860,16 +860,25 @@
RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
interpolator.addValueSource( new EnvarBasedValueSource() );
+
interpolator.addValueSource( new ObjectBasedValueSource( aProject ) );
+
interpolator.addValueSource( new MapBasedValueSource( aProject.getProperties() ) );
siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
props.put( "inputEncoding", inputEncoding );
+
props.put( "outputEncoding", outputEncoding );
// Legacy for the old ${parentProject} syntax
props.put( "parentProject", "<menu ref=\"parent\"/>" );
+
+ // Legacy for the old ${modules} syntax
+ props.put( "modules", "<menu ref=\"modules\"/>" );
+
+ // Legacy for the old ${reports} syntax
+ props.put( "reports", "<menu ref=\"reports\"/>" );
return StringUtils.interpolate( siteDescriptorContent, props );
}