Author: vsiveton
Date: Tue Jun 2 21:58:41 2009
New Revision: 781185
URL: http://svn.apache.org/viewvc?rev=781185&view=rev
Log:
o added new string fields for date
o updated code
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=781185&r1=781184&r2=781185&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 Tue Jun 2
21:58:41 2009
@@ -234,6 +234,16 @@
<identifier>true</identifier>
</field>
<field>
+ <name>creationdate</name>
+ <version>1.0.1+</version>
+ <description><![CDATA[
+ The date as String when the document was created initially.
+ @since 1.1.1
+ ]]></description>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field>
<name>date</name>
<version>1.0.0+</version>
<description><![CDATA[
@@ -243,6 +253,16 @@
<identifier>true</identifier>
</field>
<field>
+ <name>modifydate</name>
+ <version>1.0.1+</version>
+ <description><![CDATA[
+ The date as String when the document was last modified.
+ @since 1.1.1
+ ]]></description>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field>
<name>printDate</name>
<version>1.0.0+</version>
<description><![CDATA[
@@ -252,6 +272,16 @@
<identifier>true</identifier>
</field>
<field>
+ <name>printdate</name>
+ <version>1.0.1+</version>
+ <description><![CDATA[
+ The date as String when the document was last printed.
+ @since 1.1.1
+ ]]></description>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field>
<name>template</name>
<version>1.0.0+</version>
<description><![CDATA[
@@ -655,6 +685,16 @@
<type>Date</type>
<identifier>true</identifier>
</field>
+ <field xml.attribute="true">
+ <name>modifydate</name>
+ <version>1.0.1+</version>
+ <description><![CDATA[
+ The date as String when the template was last modified.
+ @since 1.1.1
+ ]]></description>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
</fields>
</class>
@@ -905,10 +945,10 @@
<identifier>true</identifier>
</field>
<field>
- <name>date</name>
+ <name>coverdate</name>
<description><![CDATA[
The date to appear on the cover.
- @since 1.1.1.
+ @since 1.1.1
]]></description>
<version>1.0.1+</version>
<type>String</type>
@@ -932,7 +972,7 @@
<description><![CDATA[
A shortcut for the unique author that appears on the cover page.
For more authors, you could use the <authors/> tag.
- @since 1.1.1.
+ @since 1.1.1
]]></description>
<version>1.0.1+</version>
<type>String</type>
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=781185&r1=781184&r2=781185&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
Tue Jun 2 21:58:41 2009
@@ -136,7 +136,7 @@
cover.setCompanyLogo( "companyLogo" );
cover.setCompanyName( "companyName" );
cover.setCoverDate( new Date( 0L ) );
- cover.setDate( "coverDate" );
+ cover.setCoverdate( "coverDate" );
cover.setCoverSubTitle( "coverSubTitle" );
cover.setCoverTitle( "coverTitle" );
cover.setCoverType( "coverType" );
@@ -157,7 +157,7 @@
assertEquals( "companyLogo", cover.getCompanyLogo() );
assertEquals( "companyName", cover.getCompanyName() );
assertEquals( 0L, cover.getCoverDate().getTime() );
- assertEquals( "coverDate", cover.getDate() );
+ assertEquals( "coverDate", cover.getCoverdate() );
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=781185&r1=781184&r2=781185&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
Tue Jun 2 21:58:41 2009
@@ -951,10 +951,10 @@
subtitle = cover.getCoverSubTitle();
version = cover.getCoverVersion();
type = cover.getCoverType();
- date = cover.getDate();
+ date = cover.getCoverdate();
if ( date == null && cover.getCoverDate() != null )
{
- date = ISO_8601_FORMAT.format( cover.getCoverDate() );
+ date = ISO_8601_FORMAT.format( cover.getCoverdate() );
}
//author = cover.getAuthor();
//projName = cover.getProjectName();
