svn commit: r366447 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java

[brett]

Author: brett
Date: Fri Jan  6 00:00:13 2006
New Revision: 366447

URL: http://svn.apache.org/viewcvs?rev=366447&view=rev
Log:
[MSITE-65] Populate ${parentProject} at the right point

Modified:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=366447&r1=366446&r2=366447&view=diff
==============================================================================
--- 
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
 Fri Jan  6 00:00:13 2006
@@ -621,6 +621,16 @@
             props.put( "project.url", "NO_PROJECT_URL_SET" );
         }
 
+        MavenProject parentProject = project.getParent();
+        if ( parentProject != null && project.getUrl() != null && 
parentProject.getUrl() != null )
+        {
+            props.put( "parentProject", getProjectParentMenu( locale ) );
+        }
+        else
+        {
+            props.put( "parentProject", "" );
+        }
+
         siteDescriptorContent = StringUtils.interpolate( 
siteDescriptorContent, props );
 
         DecorationModel decoration;
@@ -637,18 +647,11 @@
             throw new MojoExecutionException( "Error reading site descriptor", 
e );
         }
 
-        MavenProject parentProject = project.getParent();
         if ( parentProject != null && project.getUrl() != null && 
parentProject.getUrl() != null )
         {
-            props.put( "parentProject", getProjectParentMenu( locale ) );
-
             DecorationModel parent = getDecorationModel( parentProject, 
locale, props );
 
             assembler.assembleModelInheritance( decoration, parent, 
project.getUrl(), parentProject.getUrl() );
-        }
-        else
-        {
-            props.put( "parentProject", "" );
         }
 
         return decoration;