Author: hboutemy
Date: Fri Feb 20 23:45:04 2009
New Revision: 746417
URL: http://svn.apache.org/viewvc?rev=746417&view=rev
Log:
improved models while upgrading Modello to 1.0
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/mdo/decoration.mdo
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/mdo/decoration.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=746417&r1=746416&r2=746417&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/mdo/decoration.mdo
(original)
+++
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/mdo/decoration.mdo
Fri Feb 20 23:45:04 2009
@@ -20,7 +20,8 @@
-->
<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/DECORATION/1.0.0";
xsd.target-namespace="http://maven.apache.org/DECORATION/1.0.0";>
+ xml.namespace="http://maven.apache.org/DECORATION/${version}";
+ xml.schemaLocation="http://maven.apache.org/xsd/decoration-${version}.xsd";>
<id>decoration</id>
<name>Decoration</name>
<description><![CDATA[
@@ -76,7 +77,7 @@
</association>
<identifier>true</identifier>
</field>
- <field>
+ <field xdoc.separator="blank">
<name>publishDate</name>
<description><![CDATA[
Modify the date published display properties.
@@ -98,19 +99,19 @@
</association>
<identifier>true</identifier>
</field>
- <field xml.associationTagName="logo">
+ <field>
<name>poweredBy</name>
<description><![CDATA[
Powered by logos list.
]]></description>
<version>1.0.0</version>
- <association>
+ <association xml.tagName="logo">
<type>Logo</type>
<multiplicity>*</multiplicity>
</association>
<identifier>true</identifier>
</field>
- <field>
+ <field xdoc.separator="blank">
<name>skin</name>
<description><![CDATA[
The artifact containing the skin for the site.
@@ -121,7 +122,7 @@
</association>
<identifier>true</identifier>
</field>
- <field>
+ <field xdoc.separator="blank">
<name>body</name>
<description><![CDATA[
The main site content decoration.
@@ -329,37 +330,37 @@
<type>DOM</type>
<identifier>true</identifier>
</field>
- <field xml.associationTagName="item">
+ <field>
<name>links</name>
<description><![CDATA[
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><![CDATA[
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>
</association>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field xdoc.separator="blank">
<name>menus</name>
<description><![CDATA[
A list of menus to include in the navigation.
]]></description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>Menu</type>
<multiplicity>*</multiplicity>
</association>
@@ -447,13 +448,13 @@
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>items</name>
<description><![CDATA[
A list of menu item.
]]></description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>MenuItem</type>
<multiplicity>*</multiplicity>
</association>
@@ -497,11 +498,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-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo?rev=746417&r1=746416&r2=746417&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo
(original)
+++
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo
Fri Feb 20 23:45:04 2009
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<model>
+<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";
+ xml.namespace="http://maven.apache.org/DOCUMENT/${version}";
+ xml.schemaLocation="http://maven.apache.org/xsd/document-${version}.xsd";>
<id>document</id>
<name>Document</name>
<description><![CDATA[Model for Document in Doxia.]]></description>
@@ -98,11 +100,11 @@
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.listStyle="flat">
+ <field>
<name>items</name>
<description>TOC item.</description>
<version>1.0.0</version>
- <association>
+ <association xml.itemsStyle="flat">
<type>DocumentTOCItem</type>
<multiplicity>*</multiplicity>
</association>
