svn commit: r466893 - in /maven/doxia/trunk/doxia-decoration-model/src: main/java/org/apache/maven/doxia/site/decoration/inheritance/ test/resources/

[brett]

Author: brett
Date: Sun Oct 22 17:03:25 2006
New Revision: 466893

URL: http://svn.apache.org/viewvc?view=rev&rev=466893
Log:
enable inheritence of the <version/> element

Modified:
    
maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
    
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-child.xml
    
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-merged.xml

Modified: 
maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?view=diff&rev=466893&r1=466892&r2=466893
==============================================================================
--- 
maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 (original)
+++ 
maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 Sun Oct 22 17:03:25 2006
@@ -72,6 +72,11 @@
                 child.setPublishDate( parent.getPublishDate() );
             }
 
+            if ( child.getVersion() == null )
+            {
+                child.setVersion( parent.getVersion() );
+            }
+
             if ( child.getSkin() == null )
             {
                 child.setSkin( parent.getSkin() );

Modified: 
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-child.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-child.xml?view=diff&rev=466893&r1=466892&r2=466893
==============================================================================
--- 
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-child.xml
 (original)
+++ 
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-child.xml
 Sun Oct 22 17:03:25 2006
@@ -27,6 +27,7 @@
   </bannerRight>
 
   <publishDate format="fmt" position="top"/>
+  <version position="right" />
 
   <poweredBy>
     <logo name="Maven" href="http://maven.apache.org"; 
img="http://maven.apache.org/images/maven-feather.png"/>
@@ -55,4 +56,4 @@
   <custom>
     <junk>junk</junk>
   </custom>
-</project>
\ No newline at end of file
+</project>

Modified: 
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-merged.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-merged.xml?view=diff&rev=466893&r1=466892&r2=466893
==============================================================================
--- 
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-merged.xml
 (original)
+++ 
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-merged.xml
 Sun Oct 22 17:03:25 2006
@@ -27,6 +27,7 @@
   </bannerRight>
 
   <publishDate format="fmt" position="top"/>
+  <version position="right" />
 
   <poweredBy>
     <logo name="Maven" href="http://maven.apache.org"; 
img="../images/maven-feather.png"/>
@@ -51,4 +52,4 @@
   <custom>
     <junk>junk</junk>
   </custom>
-</project>
\ No newline at end of file
+</project>