maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r366488 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Date Fri, 06 Jan 2006 12:25:10 GMT
Author: brett
Date: Fri Jan  6 04:24:59 2006
New Revision: 366488

URL: http://svn.apache.org/viewcvs?rev=366488&view=rev
Log:
[MSITE-62] fix timing of resolution

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=366488&r1=366487&r2=366488&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 04:24:59 2006
@@ -496,7 +496,11 @@
 
         populateModules( props, locale );
 
-        return getDecorationModel( project, locale, props );
+        DecorationModel decorationModel = getDecorationModel( project, locale, props );
+
+        assembler.resolvePaths( decorationModel, project.getUrl() );
+
+        return decorationModel;
     }
 
     private void populateModules( Map props, Locale locale )
@@ -646,8 +650,6 @@
         {
             throw new MojoExecutionException( "Error reading site descriptor", e );
         }
-
-        assembler.resolvePaths( decoration, project.getUrl() );
 
         if ( parentProject != null && project.getUrl() != null && parentProject.getUrl()
!= null )
         {



Mime
View raw message