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

Thu, 22 Dec 2005 21:43:28 -0800 

Author: brett
Date: Thu Dec 22 21:42:55 2005
New Revision: 358720

URL: http://svn.apache.org/viewcvs?rev=358720&view=rev
Log:
PR: MSITE-48
add skin to model

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/main/mdo/decoration.mdo
    
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
    maven/doxia/trunk/doxia-decoration-model/src/test/resources/merged.xml
    maven/doxia/trunk/doxia-decoration-model/src/test/resources/parent.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/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=358720&r1=358719&r2=358720&view=diff
==============================================================================
--- 
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
 Thu Dec 22 21:42:55 2005
@@ -67,6 +67,11 @@
                 child.setPublishDate( parent.getPublishDate() );
             }
 
+            if ( child.getSkin() == null )
+            {
+                child.setSkin( parent.getSkin() );
+            }
+
             child.setPoweredBy(
                 mergePoweredByLists( child.getPoweredBy(), 
parent.getPoweredBy(), prefix, parentBaseUrl ) );
 

Modified: maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=358720&r1=358719&r2=358720&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo 
(original)
+++ maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo Thu 
Dec 22 21:42:55 2005
@@ -60,6 +60,15 @@
           <identifier>true</identifier>
         </field>
         <field>
+          <name>skin</name>
+          <description>The artifact containing the skin for the 
site</description>
+          <version>1.0.0</version>
+          <association>
+            <type>Artifact</type>
+          </association>
+          <identifier>true</identifier>
+        </field>
+        <field>
           <name>body</name>
           <description>The main site content decoration.</description>
           <version>1.0.0</version>
@@ -267,6 +276,36 @@
             <type>MenuItem</type>
             <multiplicity>*</multiplicity>
           </association>
+          <identifier>true</identifier>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>Artifact</name>
+      <description>An artifact declaration</description>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>groupId</name>
+          <description>The group ID</description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <required>true</required>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>artifactId</name>
+          <description>The artifact ID</description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <required>true</required>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>version</name>
+          <description>The version</description>
+          <version>1.0.0</version>
+          <type>String</type>
           <identifier>true</identifier>
         </field>
       </fields>

Modified: 
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-child.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-child.xml?rev=358720&r1=358719&r2=358720&view=diff
==============================================================================
--- 
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
 Thu Dec 22 21:42:55 2005
@@ -32,6 +32,11 @@
     <logo name="Maven" href="http://maven.apache.org"; 
img="http://maven.apache.org/images/maven-feather.png"/>
   </poweredBy>
 
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-default-skin</artifactId>
+  </skin>
+
   <body>
     <links>
       <item name="Bouncy Castle" href="http://www.bouncycastle.org"/>

Modified: 
maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-merged.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/test/resources/fully-populated-merged.xml?rev=358720&r1=358719&r2=358720&view=diff
==============================================================================
--- 
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
 Thu Dec 22 21:42:55 2005
@@ -32,6 +32,11 @@
     <logo name="Maven" href="http://maven.apache.org"; 
img="../images/maven-feather.png"/>
   </poweredBy>
 
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-default-skin</artifactId>
+  </skin>
+
   <body>
     <links>
       <item name="Bouncy Castle" href="http://www.bouncycastle.org"/>

Modified: maven/doxia/trunk/doxia-decoration-model/src/test/resources/merged.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/test/resources/merged.xml?rev=358720&r1=358719&r2=358720&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-decoration-model/src/test/resources/merged.xml 
(original)
+++ maven/doxia/trunk/doxia-decoration-model/src/test/resources/merged.xml Thu 
Dec 22 21:42:55 2005
@@ -28,6 +28,10 @@
   <poweredBy>
     <logo name="Maven" href="http://maven.apache.org"; 
img="../images/maven-feather.png"/>
   </poweredBy>
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-default-skin</artifactId>
+  </skin>
   <body>
     <breadcrumbs>
       <item name="Apache" href="http://www.apache.org/"/>

Modified: maven/doxia/trunk/doxia-decoration-model/src/test/resources/parent.xml
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/test/resources/parent.xml?rev=358720&r1=358719&r2=358720&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-decoration-model/src/test/resources/parent.xml 
(original)
+++ maven/doxia/trunk/doxia-decoration-model/src/test/resources/parent.xml Thu 
Dec 22 21:42:55 2005
@@ -28,6 +28,10 @@
   <poweredBy>
     <logo name="Maven" href="http://maven.apache.org"; 
img="images/maven-feather.png"/>
   </poweredBy>
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-default-skin</artifactId>
+  </skin>
   <body>
     <breadcrumbs>
       <item name="Apache" href="http://www.apache.org/"/>

Reply via email to