You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2009/08/01 08:09:25 UTC
svn commit: r799808 -
/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Author: ltheussl
Date: Sat Aug 1 06:09:24 2009
New Revision: 799808
URL: http://svn.apache.org/viewvc?rev=799808&view=rev
Log:
[MSHARED-116] If module has no site.xml then the decoration model is set equal to the parent instead of inheriting from it
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Modified: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=799808&r1=799807&r2=799808&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Sat Aug 1 06:09:24 2009
@@ -1242,15 +1242,14 @@
if ( decoration == null )
{
- decoration = parent;
- }
- else
- {
- assembler.assembleModelInheritance( project.getName(), decoration, parent, project.getUrl(),
- parentProject.getUrl() == null ? project.getUrl() : parentProject
- .getUrl() );
+ // we have no site descriptor: merge the parent into an empty one
+ decoration = new DecorationModel();
}
+
+ assembler.assembleModelInheritance( project.getName(), decoration, parent, project.getUrl(),
+ parentProject.getUrl() == null ? project.getUrl() : parentProject.getUrl() );
}
+
if ( decoration != null && decoration.getSkin() != null )
{
getLogger().debug( "Skin used: " + decoration.getSkin() );