Author: dennisl
Date: Thu Apr  5 21:25:03 2012
New Revision: 1310075

URL: http://svn.apache.org/viewvc?rev=1310075&view=rev
Log:
[DOXIASITETOOLS-65] footer declared in the site.xml is not inherited in 
multi-module sites

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=1310075&r1=1310074&r2=1310075&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 Thu Apr  5 21:25:03 2012
@@ -216,6 +216,11 @@ public class DefaultDecorationModelInher
                                                       true ) );
 
             cBody.setMenus( mergeMenus( cBody.getMenus(), pBody.getMenus(), 
urlContainer ) );
+
+            if ( cBody.getFooter() == null && pBody.getFooter() != null )
+            {
+                cBody.setFooter( pBody.getFooter() );
+            }
         }
     }
 


Reply via email to