Author: hboutemy
Date: Mon Jan 26 20:35:33 2009
New Revision: 737827
URL: http://svn.apache.org/viewvc?rev=737827&view=rev
Log:
updated models to match latest Modello version
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo
maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo?rev=737827&r1=737826&r2=737827&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/modello/book.mdo Mon Jan 26
20:35:33 2009
@@ -19,7 +19,7 @@
-->
<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.0.0
http://modello.codehaus.org/xsd/modello-1.0.0.xsd";
- xsd.namespace="http://maven.apache.org/BOOK/1.0.0";
xsd.target-namespace="http://maven.apache.org/BOOK/1.0.0";>
+ xml.namespace="http://maven.apache.org/BOOK/${version}";>
<id>book</id>
<name>BookModel</name>
<description>
@@ -130,11 +130,11 @@
</association>
<identifier>true</identifier>
</field>
- <field xml.associationTagName="logo">
+ <field>
<name>poweredBy</name>
<description>Powered by logos.</description>
<version>1.0.0</version>
- <association>
+ <association xml.tagName="logo">
<type>Logo</type>
<multiplicity>*</multiplicity>
</association>
@@ -335,32 +335,32 @@
<type>DOM</type>
<identifier>true</identifier>
</field>
- <field xml.associationTagName="item">
+ <field>
<name>links</name>
<description>A list of links to display in the
navigation.</description>
<version>1.0.0</version>
- <association>
+ <association xml.tagName="item">
<type>LinkItem</type>
<multiplicity>*</multiplicity>
</association>
<identifier>true</identifier>
</field>
- <field xml.associationTagName="item">
+ <field>
<name>breadcrumbs</name>
<description>A list of breadcrumbs to display in the
navigation.</description>
<version>1.0.0</version>
- <association>
+ <association xml.tagName="item">
<type>LinkItem</type>
<multiplicity>*</multiplicity>
<identifier>true</identifier>
</association>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>menus</name>
<description>Menus to include in the navigation.</description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>Menu</type>
<multiplicity>*</multiplicity>
</association>
@@ -430,11 +430,11 @@
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>items</name>
<description>Menu item.</description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>MenuItem</type>
<multiplicity>*</multiplicity>
</association>
@@ -470,11 +470,11 @@
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>items</name>
<description>Menu item.</description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>MenuItem</type>
<multiplicity>*</multiplicity>
</association>
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=737827&r1=737826&r2=737827&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 Mon Jan 26
20:35:33 2009
@@ -19,7 +19,7 @@
under the License.
-->
-<model>
+<model xml.namespace="http://maven.apache.org/DOCUMENT/${version}";>
<id>document</id>
<name>Document</name>
<description><![CDATA[
@@ -124,14 +124,14 @@
<multiplicity>*</multiplicity>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<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>
+ <association xml.itemsStyle="flat">
<type>DocumentAuthor</type>
<multiplicity>*</multiplicity>
</association>
@@ -156,14 +156,14 @@
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<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>
+ <association xml.itemsStyle="flat">
<type>String</type>
<multiplicity>*</multiplicity>
</association>
@@ -767,13 +767,13 @@
<type>Date</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>authors</name>
<version>1.0.0</version>
<description><![CDATA[
The authors that appear on the cover page.
]]></description>
- <association>
+ <association xml.itemsStyle="flat">
<type>DocumentAuthor</type>
<multiplicity>*</multiplicity>
</association>
@@ -846,13 +846,13 @@
<type>int</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>items</name>
<description><![CDATA[
TOC item.
]]></description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>DocumentTOCItem</type>
<multiplicity>*</multiplicity>
</association>
@@ -895,13 +895,13 @@
<type>boolean</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>items</name>
<description><![CDATA[
A table of content item containing sub-items.
]]></description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>DocumentTOCItem</type>
<multiplicity>*</multiplicity>
</association>
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo?rev=737827&r1=737826&r2=737827&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo
Mon Jan 26 20:35:33 2009
@@ -60,13 +60,13 @@
<defaultValue>true</defaultValue>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>parts</name>
<description><![CDATA[
List of FAQ part.
]]></description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>Part</type>
<multiplicity>*</multiplicity>
</association>
@@ -99,13 +99,13 @@
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>faqs</name>
<description><![CDATA[
A list of FAQ.
]]></description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>Faq</type>
<multiplicity>*</multiplicity>
</association>
