Index: D:/Java/maven-2.0/maven-components/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
===================================================================
--- D:/Java/maven-2.0/maven-components/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java	(revision 331098)
+++ D:/Java/maven-2.0/maven-components/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java	(working copy)
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.Site;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -81,7 +83,7 @@
      * @required
      */
     private File siteDirectory;
-
+    
     /**
      * Alternative directory for xdoc source, useful for m1 to m2 migration
      *
@@ -179,6 +181,15 @@
     private MavenProject project;
 
     /**
+     * The reactor projects.
+     *
+     * @parameter expression="${reactorProjects}"
+     * @required
+     * @readonly
+     */
+    private List reactorProjects;
+
+    /**
      * @parameter expression="${reports}"
      * @required
      * @readonly
@@ -195,6 +206,7 @@
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
+
         if ( templateDirectory == null )
         {
             siteRenderer.setTemplateClassLoader( SiteMojo.class.getClassLoader() );
@@ -351,6 +363,9 @@
                     generateIndexPage( siteDescriptor, locale, outputDirectory );
                 }
 
+                // TODO: Be good to generate a module's summary page thats referenced off the
+                // Modules menu item.                
+                
                 // Log if a user override a report file
                 for ( Iterator it = generatedReportsFileName.iterator(); it.hasNext(); )
                 {
@@ -387,36 +402,6 @@
                     copyDirectory( resourcesDirectory, outputDirectory );
                 }
 
-                // Copy the generated site in parent site if needed to provide module links
-                if ( addModules )
-                {
-                    MavenProject parentProject = project.getParent();
-                    if ( parentProject != null )
-                    {
-                        // TODO Handle user plugin configuration
-/* TODO: Not working, and would be better working as a top-level aggregation rather than pushing from the subprojects...
-                        File basedir = parentProject.getBasedir();
-                        if ( basedir != null )
-                        {
-                            String path = parentProject.getBuild().getDirectory() + "/site/" + project.getArtifactId();
-                            File parentSiteDir = new File( basedir, path );
-
-                            if ( !parentSiteDir.exists() )
-                            {
-                                parentSiteDir.mkdirs();
-                            }
-
-                            File siteDir = new File( outputDirectory );
-                            FileUtils.copyDirectoryStructure( siteDir, parentSiteDir );
-                        }
-                        else
-                        {
-                            getLog().info( "Not using parent as it was not located on the filesystem" );
-                        }
-*/
-                    }
-                }
-
                 if ( generatedSiteDirectory.exists() )
                 {
                     siteRenderer.render( generatedSiteDirectory, outputDirectory, siteDescriptor, template, attributes,
@@ -618,56 +603,137 @@
      *
      * @param locale the locale wanted
      * @return a XML menu for modules
+     * @throws MojoExecutionException 
      */
-/*    private String getModulesMenu( Locale locale )
+    private String getModulesMenu( Locale locale ) throws MojoExecutionException
     {
+    	
         StringBuffer buffer = new StringBuffer();
+
         buffer.append( "<menu name=\"" );
         buffer.append( i18n.getString( "site-plugin", locale, "report.menu.projectmodules" ) );
         buffer.append( "\">\n" );
 
-        List modules = project.getModules();
-        if ( project.getModules() != null )
+        
+        if ( reactorProjects != null && reactorProjects.size() > 1 )
         {
-            for ( Iterator it = modules.iterator(); it.hasNext(); )
+
+        	Iterator reactorItr = reactorProjects.iterator();
+            	
+        	while ( reactorItr.hasNext() )
             {
-                String module = (String) it.next();
+        		
+        		MavenProject reactorProject = (MavenProject) reactorItr.next();
 
-                buffer.append( "    <item name=\"" );
-                buffer.append( module );
-                buffer.append( "\" href=\"" );
-                buffer.append( module );
-                buffer.append( "/index.html\"/>\n" );
-            }
-        }
+        		// dont't use modules as they address file system locations and we need projects
+        		//
+        		// Note, we could try and parse the module's pom based upon its directory location 
+        		// which would remove our reliance on reactorProjects but its more complicated. 
+        		// The side effect of using reactorProjects is that to generate module links 
+        		// you must do a recursive build (no mvn -N)
+        		
+        		if ( reactorProject != null &&
+        			 reactorProject.getParent() != null &&
+        			 project.getArtifactId().equals( reactorProject.getParent().getArtifactId() ))
+        		{
+        			
+        	        DistributionManagement reactorDM = reactorProject.getDistributionManagement();
 
+        	        
+        	        if ( reactorDM == null )
+        	        {        	        	
+        	        	getLog().warn( "Project: " + reactorProject.getArtifactId() + " has no distribution management");
+        	        }
+        	        else
+        	        {
+
+        	        	Site reactorSite = reactorDM.getSite();
+
+        	        	if ( reactorSite == null )
+        	        	{
+            	        	getLog().warn( "Project: " + reactorProject.getArtifactId() + " has no distribution management");
+        	        	}
+        	        	else
+        	        	{
+        	        		
+        	        		String reactorUrl = reactorSite.getUrl();        	        		
+        	        		
+        	        		if ( reactorUrl != null )
+        	        		{        	        			
+        	        			buffer.append( "    <item name=\"" );
+        	        			buffer.append( reactorProject.getName() );
+        	        			buffer.append( "\" href=\"" );
+        	        			buffer.append( reactorUrl );
+        	        			buffer.append( "/index.html\"/>\n" );
+        	        		}
+        	        	}
+        	        }
+        		}
+        	}
+        }    	
+
         buffer.append( "</menu>\n" );
 
         return buffer.toString();
     }
-*/
+
     /**
      * Generate a menu for the parent project
      *
      * @param locale the locale wanted
      * @return a XML menu for the parent project
      */
-/*    private String getProjectParentMenu( Locale locale )
+    private String getProjectParentMenu( Locale locale )
     {
         StringBuffer buffer = new StringBuffer();
-        buffer.append( "<menu name=\"" );
-        buffer.append( i18n.getString( "site-plugin", locale, "report.menu.parentproject" ) );
-        buffer.append( "\">\n" );
+        
+        MavenProject parent = project.getParent();
+        
+        DistributionManagement parentDM = parent.getDistributionManagement();
+        
+        if ( parentDM == null )
+        {        	
+        	getLog().warn( "Project: " + parent.getArtifactId() + " has no distribution management");
+        }
+        else
+        {
 
-        buffer.append( "    <item name=\"" );
-        buffer.append( project.getParent().getArtifactId() );
-        buffer.append( "\" href=\"../index.html\"/>\n" );
+        	Site parentSite = parentDM.getSite();
 
-        buffer.append( "</menu>\n" );
+        	if ( parentSite == null )
+        	{
+	        	getLog().warn( "Project: " + parent.getArtifactId() + " has no distribution management");
+        	}
+        	else
+        	{
+        		
+        		String parentUrl = parentSite.getUrl();
+        		        		
+        		if ( parentUrl != null )
+        		{
+        			
+        			parentUrl += "/index.html";
+        
+        	        buffer.append( "<menu name=\"" );
+        	        buffer.append( i18n.getString( "site-plugin", locale, "report.menu.parentproject" ) );
+        	        buffer.append( "\">\n" );
+        	        
+        			buffer.append( "    <item name=\"" );
+        			buffer.append( parent.getName() );
+        			buffer.append( "\" href=\"" );
+        			buffer.append( parentUrl );
+        			buffer.append( "\"/>\n" );
 
+        			buffer.append( "</menu>\n" );
+        
+        		}
+        	}
+        	
+        }
+
         return buffer.toString();
     }
-*/
+
     /**
      * @param reports a list of reports
      * @param locale the current locale
@@ -717,17 +783,14 @@
 
         if ( project.getParent() != null )
         {
-            /* See the Not working section*/
-            //props.put( "parentProject", getProjectParentMenu( locale ) );
+        	props.put( "parentProject", getProjectParentMenu( locale ) );
         }
 
-        if ( addModules )
+        // we require child modules and reactors to process module menu
+        
+        if ( ( addModules && reactorProjects.size() > 1 && project.getModules().size() > 0 ) )
         {
-            if ( project.getModules() != null && project.getModules().size() > 0 )
-            {
-                /* See the Not working section*/
-                //props.put( "modules", getModulesMenu( locale ) );
-            }
+        	props.put( "modules", getModulesMenu( locale ) );
         }
 
         // TODO: interpolate ${project.*} in general
@@ -755,7 +818,8 @@
         return siteDescriptorContent;
     }
 
-    /**
+
+	/**
      * Generate an index page.
      *
      * @param siteDescriptor