svn commit: r775273 - in /maven/doxia/doxia/trunk: doxia-core/src/main/mdo/ doxia-core/src/test/java/org/apache/maven/doxia/document/ doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/

[ltheussl]

Author: ltheussl
Date: Fri May 15 18:22:27 2009
New Revision: 775273

URL: http://svn.apache.org/viewvc?rev=775273&view=rev
Log:
restore binary compatibility with document model in doxia 1.1

Modified:
    maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo
    
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java

Modified: maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo?rev=775273&r1=775272&r2=775273&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo Fri May 15 
18:22:27 2009
@@ -761,19 +761,43 @@
           <name>coverDate</name>
           <description><![CDATA[
             The date to appear on the cover.
-            @since 1.1.1.
+            Only used if date is not given.
           ]]></description>
           <version>1.0.0+</version>
+          <type>Date</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>date</name>
+          <description><![CDATA[
+            The date to appear on the cover.
+            @since 1.1.1.
+          ]]></description>
+          <version>1.0.1+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
         <field>
+          <name>authors</name>
+          <description><![CDATA[
+            The authors that appear on the cover page.
+            Only used if author is not given.
+          ]]></description>
+          <version>1.0.0+</version>
+          <association xml.itemsStyle="wrapped" xml.tagName="author">
+            <type>DocumentAuthor</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <identifier>true</identifier>
+        </field>
+        <field>
           <name>author</name>
           <description><![CDATA[
-            The author that appears on the cover page.
+            A shortcut for the unique author that appears on the cover page.
+            For more authors, you could use the &lt;authors/&gt; tag.
             @since 1.1.1.
           ]]></description>
-          <version>1.0.0+</version>
+          <version>1.0.1+</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java?rev=775273&r1=775272&r2=775273&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
 Fri May 15 18:22:27 2009
@@ -129,10 +129,12 @@
     private DocumentCover getDocumentCover()
     {
         DocumentCover cover = new DocumentCover();
+        cover.addAuthor( getAuthor( 1 ) );
         cover.setAuthor( "Author" );
         cover.setCompanyLogo( "companyLogo" );
         cover.setCompanyName( "companyName" );
-        cover.setCoverDate( "coverDate" );
+        cover.setCoverDate( new Date( 0L ) );
+        cover.setDate( "coverDate" );
         cover.setCoverSubTitle( "coverSubTitle" );
         cover.setCoverTitle( "coverTitle" );
         cover.setCoverType( "coverType" );
@@ -145,10 +147,15 @@
 
     private void verifyDocumentCover( DocumentCover cover )
     {
+        List authors = cover.getAuthors();
+        assertEquals( 1, authors.size() );
+        verifyAuthor( (DocumentAuthor) authors.get( 0 ), 1 );
+
         assertEquals( "Author", cover.getAuthor() );
         assertEquals( "companyLogo", cover.getCompanyLogo() );
         assertEquals( "companyName", cover.getCompanyName() );
-        assertEquals( "coverDate", cover.getCoverDate() );
+        assertEquals( 0L, cover.getCoverDate().getTime() );
+        assertEquals( "coverDate", cover.getDate() );
         assertEquals( "coverSubTitle", cover.getCoverSubTitle() );
         assertEquals( "coverTitle", cover.getCoverTitle() );
         assertEquals( "coverType", cover.getCoverType() );

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=775273&r1=775272&r2=775273&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
 Fri May 15 18:22:27 2009
@@ -886,7 +886,7 @@
             subtitle = cover.getCoverSubTitle();
             version = cover.getCoverVersion();
             type = cover.getCoverType();
-            date = cover.getCoverDate();
+            date = cover.getDate();
             //author = cover.getAuthor();
             //projName = cover.getProjectName();
             projLogo = cover.getProjectLogo();