You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by lt...@apache.org on 2007/11/15 19:59:51 UTC

svn commit: r595393 - in /maven/doxia: doxia-sitetools/trunk/doxia-doc-renderer/ doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/ doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/do...

Author: ltheussl
Date: Thu Nov 15 10:59:51 2007
New Revision: 595393

URL: http://svn.apache.org/viewvc?rev=595393&view=rev
Log:
[DOXIA-159, DOXIASITETOOLS-4] Move DocumentModel from docrenderer into doxia-core, make it more general.

Added:
    maven/doxia/doxia/trunk/doxia-core/src/main/mdo/
    maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo
      - copied, changed from r595060, maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/mdo/document.mdo
Removed:
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/mdo/
Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocumentRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
    maven/doxia/doxia/trunk/doxia-core/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml?rev=595393&r1=595392&r2=595393&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml Thu Nov 15 10:59:51 2007
@@ -29,29 +29,7 @@
   <artifactId>doxia-doc-renderer</artifactId>
   <name>Doxia Document Renderer Component</name>
   <description>The Document Renderer handles the rendering of documents, in formats like PDF and RTF.</description>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-17</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <version>1.0.0</version>
-          <model>src/main/mdo/document.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
   <developers>
     <developer>
       <id>vsiveton</id>

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java?rev=595393&r1=595392&r2=595393&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java Thu Nov 15 10:59:51 2007
@@ -29,8 +29,8 @@
 import java.util.Map;
 
 import org.apache.maven.doxia.Doxia;
-import org.apache.maven.doxia.docrenderer.document.DocumentModel;
-import org.apache.maven.doxia.docrenderer.document.io.xpp3.DocumentXpp3Reader;
+import org.apache.maven.doxia.document.DocumentModel;
+import org.apache.maven.doxia.document.io.xpp3.DocumentXpp3Reader;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.manager.ParserNotFoundException;

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocumentRenderer.java?rev=595393&r1=595392&r2=595393&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocumentRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocumentRenderer.java Thu Nov 15 10:59:51 2007
@@ -23,7 +23,7 @@
 import java.io.IOException;
 import java.util.Collection;
 
-import org.apache.maven.doxia.docrenderer.document.DocumentModel;
+import org.apache.maven.doxia.document.DocumentModel;
 
 /**
  * Base interface for rendering documents from a set of input files.

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java?rev=595393&r1=595392&r2=595393&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java Thu Nov 15 10:59:51 2007
@@ -44,9 +44,9 @@
 import org.apache.maven.doxia.Doxia;
 import org.apache.maven.doxia.docrenderer.DocRenderer;
 import org.apache.maven.doxia.docrenderer.DocumentRendererException;
-import org.apache.maven.doxia.docrenderer.document.DocumentModel;
-import org.apache.maven.doxia.docrenderer.document.DocumentTOCItem;
-import org.apache.maven.doxia.docrenderer.document.io.xpp3.DocumentXpp3Reader;
+import org.apache.maven.doxia.document.DocumentModel;
+import org.apache.maven.doxia.document.DocumentTOCItem;
+import org.apache.maven.doxia.document.io.xpp3.DocumentXpp3Reader;
 import org.apache.maven.doxia.module.itext.ITextSink;
 import org.apache.maven.doxia.module.itext.ITextUtil;
 import org.apache.maven.doxia.parser.ParseException;

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java?rev=595393&r1=595392&r2=595393&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java Thu Nov 15 10:59:51 2007
@@ -29,8 +29,8 @@
 import javax.xml.transform.TransformerException;
 
 import org.apache.maven.doxia.docrenderer.DocumentRendererException;
-import org.apache.maven.doxia.docrenderer.document.DocumentModel;
-import org.apache.maven.doxia.docrenderer.document.DocumentTOCItem;
+import org.apache.maven.doxia.document.DocumentModel;
+import org.apache.maven.doxia.document.DocumentTOCItem;
 import org.apache.maven.doxia.docrenderer.pdf.AbstractPdfRenderer;
 import org.apache.maven.doxia.module.site.SiteModule;
 import org.apache.maven.doxia.module.fo.FoAggregateSink;

Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java?rev=595393&r1=595392&r2=595393&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java Thu Nov 15 10:59:51 2007
@@ -43,7 +43,7 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.maven.doxia.docrenderer.DocumentRendererException;
-import org.apache.maven.doxia.docrenderer.document.DocumentModel;
+import org.apache.maven.doxia.document.DocumentModel;
 import org.apache.maven.doxia.docrenderer.pdf.AbstractPdfRenderer;
 import org.apache.maven.doxia.module.itext.ITextSink;
 import org.apache.maven.doxia.module.itext.ITextUtil;

Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/pom.xml?rev=595393&r1=595392&r2=595393&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-core/pom.xml Thu Nov 15 10:59:51 2007
@@ -38,18 +38,44 @@
           <source>1.4</source>
           <target>1.4</target>
         </configuration>
-     </plugin>
-     <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-jar-plugin</artifactId>
-       <executions>
-         <execution>
-           <goals>
-             <goal>test-jar</goal>
-           </goals>
-         </execution>
-       </executions>
-     </plugin>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-17</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>java</goal>
+              <goal>xpp3-reader</goal>
+              <goal>xpp3-writer</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>docs</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>xdoc</goal>
+              <goal>xsd</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <version>1.0.0</version>
+          <model>src/main/mdo/document.mdo</model>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

Copied: maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo (from r595060, maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/mdo/document.mdo)
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo?p2=maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo&p1=maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/mdo/document.mdo&r1=595060&r2=595393&rev=595393&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/mdo/document.mdo (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo Thu Nov 15 10:59:51 2007
@@ -1,5 +1,24 @@
 <?xml version="1.0"?>
 
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <model>
   <id>document</id>
   <name>Document</name>
@@ -13,10 +32,12 @@
   <defaults>
     <default>
       <key>package</key>
-      <value>org.apache.maven.doxia.docrenderer.document</value>
+      <value>org.apache.maven.doxia.document</value>
     </default>
   </defaults>
+
   <classes>
+
     <class rootElement="true" xml.tagName="document">
       <name>DocumentModel</name>
       <description>Describes the overall document model.</description>
@@ -53,30 +74,67 @@
           </association>
           <identifier>true</identifier>
         </field>
+        <field>
+          <name>cover</name>
+          <description><![CDATA[
+            The meta data to construct a cover page for the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <association>
+            <type>DocumentCover</type>
+          </association>
+          <identifier>true</identifier>
+        </field>
       </fields>
     </class>
 
     <class>
       <name>DocumentMeta</name>
-      <description>Element that contains some meta information about the document.</description>
+      <description><![CDATA[
+        <p>
+          Metadata is general information about a document.
+        </p>
+
+        <p>
+          The metadata elements used here were mostly inspired by the
+          <a href="http://docs.oasis-open.org/office/v1.1/">Open Document Format Specification v. 1.1</a>,
+          which in turn borrows heavily upon the metadata standards developed by the
+          <a href="http://www.dublincore.org">Dublin Core Metadata Initiative</a>.
+        </p>
+      ]]></description>
       <version>1.0.0</version>
       <fields>
         <field>
           <name>title</name>
           <version>1.0.0</version>
           <description><![CDATA[
-            Title of the document.
+            The title of the document.
           ]]></description>
           <type>String</type>
           <identifier>true</identifier>
         </field>
         <field>
+          <!-- TODO: remove -->
           <name>author</name>
           <version>1.0.0</version>
           <description><![CDATA[
             The author of the document.
           ]]></description>
           <type>String</type>
+          <multiplicity>*</multiplicity>
+          <identifier>true</identifier>
+        </field>
+        <field xml.listStyle="flat">
+          <name>authors</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The authors of the document. The names of the entities that
+            are primarily responsible for the content of the document.
+          ]]></description>
+          <association>
+            <type>DocumentAuthor</type>
+            <multiplicity>*</multiplicity>
+          </association>
           <identifier>true</identifier>
         </field>
         <field>
@@ -89,14 +147,28 @@
           <identifier>true</identifier>
         </field>
         <field>
+          <!-- TODO: remove -->
           <name>keywords</name>
           <version>1.0.0</version>
           <description><![CDATA[
-            The keywords for the document.
+            Keywords for the document.
           ]]></description>
           <type>String</type>
           <identifier>true</identifier>
         </field>
+        <field xml.listStyle="flat">
+          <name>keyWords</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            A keyword pertaining to the document. The metadata can contain any
+            number of keyword elements, each element specifying one keyword.
+          ]]></description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <identifier>true</identifier>
+        </field>
         <field>
           <name>pageSize</name>
           <version>1.0.0</version>
@@ -107,6 +179,642 @@
           <type>String</type>
           <identifier>true</identifier>
         </field>
+        <field>
+          <name>generator</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+             A string that identifies the application or tool that was
+             used to create or last modify the document.
+          ]]></description>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>description</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+             A brief description of the document.
+          ]]></description>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>initialCreator</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The name of the person who created the document initially.
+          ]]></description>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>creator</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The name of the person who last modified the document.
+          ]]></description>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>printedBy</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The name of the person who last printed the document.
+          ]]></description>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>creationDate</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The date and time when the document was created initially.
+          ]]></description>
+          <type>Date</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>date</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The date and time when the document was last modified.
+          ]]></description>
+          <type>Date</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>printDate</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The date and time when the document was last printed.
+          ]]></description>
+          <type>Date</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>template</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            A template that was used to create the document.
+          ]]></description>
+          <association>
+            <type>DocumentTemplate</type>
+          </association>
+          <identifier>true</identifier>
+        </field>
+        <!--
+        <field>
+          <name>autoReload</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The auto-reload element specifies whether a document is reloaded
+            or replaced by another document after a certain period of time
+            has elapsed.
+          ]]></description>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        -->
+        <field>
+          <name>hyperlinkBehaviour</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The hyperlink-behaviour element specifies the default behavior
+            for hyperlinks in the document.
+          ]]></description>
+          <association>
+            <type>DocumentHyperlinkBehaviour</type>
+          </association>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>language</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The default language of the document. The language is represented by
+            a two or three letter Language Code taken from the ISO 639 standard,
+            optionally followed by a hyphen (-) and a two-letter Country Code
+            taken from the ISO 3166 standard.
+          ]]></description>
+          <type>String</type>
+          <defaultValue>en-US</defaultValue>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>editingCycles</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The number of editing cycles the document has been through.
+          ]]></description>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>editingDuration</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The total time spent editing the document.
+          ]]></description>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>documentStatistic</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The statistics of the document, for example, the page count,
+            word count, etc.
+          ]]></description>
+          <association>
+            <type>DocumentStatistic</type>
+          </association>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>confidential</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            whether the content of the document is in some sense confidential.
+          ]]></description>
+          <type>boolean</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>draft</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            whether the content of the document is in some sense preliminary.
+          ]]></description>
+          <type>boolean</type>
+          <identifier>true</identifier>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <name>DocumentAuthor</name>
+      <description>An author the document.</description>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>firstName</name>
+          <description><![CDATA[
+             The first name of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>lastName</name>
+          <description><![CDATA[
+            The last name of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>initials</name>
+          <description><![CDATA[
+             The initials of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>title</name>
+          <description><![CDATA[
+             The title of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>position</name>
+          <description><![CDATA[
+             The position of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>email</name>
+          <description><![CDATA[
+            The email address of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>phoneNumber</name>
+          <description><![CDATA[
+            The telephone number of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>faxNumber</name>
+          <description><![CDATA[
+            The fax number of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>companyName</name>
+          <description><![CDATA[
+            The name of the company that employs the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>street</name>
+          <description><![CDATA[
+             The street name of the address of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>city</name>
+          <description><![CDATA[
+            The city name of the address of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>postalCode</name>
+          <description><![CDATA[
+            The postal code of the address of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>country</name>
+          <description><![CDATA[
+            The country of the address of the author.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>state</name>
+          <description><![CDATA[
+            The state or province of the address of the author, if applicable.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <name>DocumentTemplate</name>
+      <description>A template that was used to create the document.</description>
+      <version>1.0.0</version>
+      <fields>
+        <field xml.attribute="true">
+          <name>href</name>
+          <description><![CDATA[
+            The location of the document template.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>title</name>
+          <description><![CDATA[
+            The name of the document template.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>date</name>
+          <description><![CDATA[
+            The date and time when the template was last modified, prior
+            to being used to create the current document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>Date</type>
+          <identifier>true</identifier>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <name>DocumentHyperlinkBehaviour</name>
+      <description>Specifies the default behavior for hyperlinks in the document.</description>
+      <version>1.0.0</version>
+      <fields>
+        <field xml.attribute="true">
+          <name>targetFrame</name>
+          <description><![CDATA[
+            <p>
+              Specifies the name of the default target frame in which to display
+              a document referenced by a hyperlink.
+            </p>
+
+            <p>
+              This attribute can have one of the following values:
+            </p>
+
+            <dl>
+              <dd>_self</dd>
+              <dt>
+                The referenced document replaces the content
+                of the current frame.
+              </dt>
+
+              <dd>_blank</dd>
+              <dt>
+                The referenced document is displayed in a new frame.
+              </dt>
+
+              <dd>_parent</dd>
+              <dt>
+                The referenced document is displayed in the parent frame
+                of the current frame.
+              </dt>
+
+              <dd>_top</dd>
+              <dt>
+                The referenced document is displayed in the topmost frame,
+                that is the frame that contains the current frame as a child
+                or descendent but is not contained within another frame.
+              </dt>
+
+              <dd>A frame name</dd>
+              <dt>
+                The referenced document is displayed in the named frame.
+                If the named frame does not exist, a new frame with that
+                name is created.
+              </dt>
+            </dl>
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <defaultValue>_self</defaultValue>
+          <identifier>true</identifier>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <name>DocumentStatistic</name>
+      <description>Statistical attributes of the document.</description>
+      <version>1.0.0</version>
+      <fields>
+        <field xml.attribute="true">
+          <name>pageCount</name>
+          <description><![CDATA[
+            The number of pages in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>tableCount</name>
+          <description><![CDATA[
+            The number of tabels in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>drawCount</name>
+          <description><![CDATA[
+            The number of drawings in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>imageCount</name>
+          <description><![CDATA[
+            The number of images in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>objectCount</name>
+          <description><![CDATA[
+            The number of objects in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>oleObjectCount</name>
+          <description><![CDATA[
+            The number of ole-objects in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>paragraphCount</name>
+          <description><![CDATA[
+            The number of paragraphs in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>wordCount</name>
+          <description><![CDATA[
+            The number of words in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>characterCount</name>
+          <description><![CDATA[
+            The number of characters in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>rowCount</name>
+          <description><![CDATA[
+            The number of rows in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>frameCount</name>
+          <description><![CDATA[
+            The number of frames in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>sentenceCount</name>
+          <description><![CDATA[
+            The number of sentences in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>syllableCount</name>
+          <description><![CDATA[
+            The number of syllables in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.attribute="true">
+          <name>nonWhitespaceCharacterCount</name>
+          <description><![CDATA[
+            The number of non-whitespace-characters in the document.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>long</type>
+          <identifier>true</identifier>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <name>DocumentCover</name>
+      <description>Contains meta-data information for the document cover page.</description>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>coverTitle</name>
+          <description><![CDATA[
+            The title to appear on the cover.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>coverSubTitle</name>
+          <description><![CDATA[
+            a sub-title to appear on the cover.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>coverVersion</name>
+          <description><![CDATA[
+            The version of the project that appears on the cover page.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>coverType</name>
+          <description><![CDATA[
+            The type of the document. This might be used on the cover page to
+            specify the type of information contained in the document
+            (eg 'User Guide', 'Manual', etc.).
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>coverDate</name>
+          <description><![CDATA[
+            The date to appear on the cover.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>Date</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.listStyle="flat">
+          <name>authors</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            The authors that appear on the cover page.
+          ]]></description>
+          <association>
+            <type>DocumentAuthor</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>projectName</name>
+          <description><![CDATA[
+            The name of the project.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>projectLogo</name>
+          <description><![CDATA[
+            The location of an image file that represents the project logo.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>companyName</name>
+          <description><![CDATA[
+            The name of the entity that is responsible for the content of the
+            document, or a copyright holder.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>companyLogo</name>
+          <description><![CDATA[
+            The location of an image file that represents the company logo.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
       </fields>
     </class>
 
@@ -118,12 +826,25 @@
         <field xml.attribute="true">
           <name>name</name>
           <description><![CDATA[
-            The name to use for the menu.
+            The name to use for the Table of Contents.
           ]]></description>
           <version>1.0.0</version>
           <type>String</type>
           <identifier>true</identifier>
         </field>
+        <field xml.attribute="true">
+          <name>depth</name>
+          <description><![CDATA[
+            Specifies up to which level toc items are included by default.
+            Defaults to 0 which means all entries are included. A depth of 1
+            means only top-level elements, 2 includes one level of sub-items, etc.
+            This may be overridden for individual entries by using the collapse
+            attribute of the corresponding toc item.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>int</type>
+          <identifier>true</identifier>
+        </field>
         <field xml.listStyle="flat">
           <name>items</name>
           <description><![CDATA[
@@ -162,8 +883,33 @@
           <type>String</type>
           <identifier>true</identifier>
         </field>
+        <field xml.attribute="true">
+          <name>collapse</name>
+          <description><![CDATA[
+           Whether to show any child elements of a TOCItem, overriding
+           the depth given in DocumentTOC. By default, all children
+           are expanded up to the depth given in DocumentTOC.
+          ]]></description>
+          <version>1.0.0</version>
+          <type>boolean</type>
+          <identifier>true</identifier>
+        </field>
+        <field xml.listStyle="flat">
+          <name>items</name>
+          <description><![CDATA[
+           A table of content item containing sub-items.
+          ]]></description>
+          <version>1.0.0</version>
+          <association>
+            <type>DocumentTOCItem</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <identifier>true</identifier>
+        </field>
       </fields>
     </class>
+
   </classes>
+
 </model>