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

[br...@apache.org]

Author: brett
Date: Thu Dec 22 20:40:48 2005
New Revision: 358700

URL: http://svn.apache.org/viewcvs?rev=358700&view=rev
Log:
PR: MSITE-44
resolve paths in the decoration model relative to different base URLs and add unit tests for inheritence

Modified:
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
    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/AbstractSiteMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=358700&r1=358699&r2=358700&view=diff
==============================================================================
--- 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 Thu Dec 22 20:40:48 2005
@@ -73,7 +73,7 @@
      */
     protected File getSiteDescriptorFile( File basedir, Locale locale )
     {
-        // TODO: get proper siteDirectory
+        // TODO: get proper siteDirectory from site configuration of the project this relates to
 
         File siteDescriptor = new File( basedir, "src/site/site_" + locale.getLanguage() + ".xml" );
 

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=358700&r1=358699&r2=358700&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 Thu Dec 22 20:40:48 2005
@@ -553,13 +553,14 @@
             throw new MojoExecutionException( "Error reading site descriptor", e );
         }
 
-        if ( project.getParent() != null )
+        MavenProject parentProject = project.getParent();
+        if ( parentProject != null )
         {
             props.put( "parentProject", getProjectParentMenu( locale ) );
 
-            DecorationModel parent = getDecorationModel( project.getParent(), locale, props );
+            DecorationModel parent = getDecorationModel( parentProject, locale, props );
 
-            assembler.assembleModelInheritance( decoration, parent );
+            assembler.assembleModelInheritance( decoration, parent, project.getUrl(), parentProject.getUrl() );
         }
 
         return decoration;