You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/03/11 18:04:42 UTC
svn commit: r1080671 - in /maven/plugins/trunk/maven-site-plugin: ./
src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Author: dennisl
Date: Fri Mar 11 17:04:41 2011
New Revision: 1080671
URL: http://svn.apache.org/viewvc?rev=1080671&view=rev
Log:
o Merge r956299 from maven-site-plugin-3.x branch
Modified:
maven/plugins/trunk/maven-site-plugin/ (props changed)
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Propchange: maven/plugins/trunk/maven-site-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 11 17:04:41 2011
@@ -1 +1 @@
-/maven/plugins/branches/maven-site-plugin-3.x:940318,942876,956257,984961,992626,1003823
+/maven/plugins/branches/maven-site-plugin-3.x:940318,942876,956257,956299,984961,992626,1003823
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1080671&r1=1080670&r2=1080671&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Fri Mar 11 17:04:41 2011
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.sink.render.RenderingContext;
import org.apache.maven.doxia.site.decoration.DecorationModel;
@@ -249,8 +250,11 @@ public abstract class AbstractSiteRender
File skinFile;
try
{
- skinFile = siteTool.getSkinArtifactFromRepository( localRepository, repositories, decorationModel )
- .getFile();
+ Artifact skinArtifact =
+ siteTool.getSkinArtifactFromRepository( localRepository, repositories, decorationModel );
+ getLog().info( "Rendering site with " + skinArtifact.getId() + " skin." );
+
+ skinFile = skinArtifact.getFile();
}
catch ( SiteToolException e )
{