maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r738080 - in /maven/doxia/doxia/trunk/doxia-core: pom.xml src/main/mdo/document.mdo
Date Tue, 27 Jan 2009 12:55:35 GMT
Author: vsiveton
Date: Tue Jan 27 12:55:35 2009
New Revision: 738080

URL: http://svn.apache.org/viewvc?rev=738080&view=rev
Log:
o added XSD for Modello and fix document
o included the generation of the xsd in the build
o <author/> is now officially supported

Modified:
    maven/doxia/doxia/trunk/doxia-core/pom.xml
    maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo

Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/pom.xml?rev=738080&r1=738079&r2=738080&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-core/pom.xml Tue Jan 27 12:55:35 2009
@@ -77,10 +77,13 @@
         <artifactId>modello-maven-plugin</artifactId>
         <executions>
           <execution>
+            <id>descriptor</id>
+            <phase>generate-sources</phase>
             <goals>
               <goal>java</goal>
               <goal>xpp3-reader</goal>
               <goal>xpp3-writer</goal>
+              <goal>xsd</goal>
             </goals>
           </execution>
           <execution>

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=738080&r1=738079&r2=738080&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 Jan 27 12:55:35 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,8 @@
   under the License.
 -->
 
-<model xml.namespace="http://maven.apache.org/DOCUMENT/${version}">
+<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}">
   <id>document</id>
   <name>Document</name>
   <description><![CDATA[
@@ -114,14 +115,13 @@
           <identifier>true</identifier>
         </field>
         <field>
-          <!-- TODO: remove -->
           <name>author</name>
           <version>1.0.0</version>
           <description><![CDATA[
-            The author of the document.
+            A shortcut for the unique author of the document, usually as a String of "firstName
lastName". For
+            more authors, you could use the <authors/> tag.
           ]]></description>
           <type>String</type>
-          <multiplicity>*</multiplicity>
           <identifier>true</identifier>
         </field>
         <field>
@@ -131,7 +131,7 @@
             The authors of the document. The names of the entities that
             are primarily responsible for the content of the document.
           ]]></description>
-          <association xml.itemsStyle="flat">
+          <association xml.itemsStyle="wrapped" xml.tagName="author">
             <type>DocumentAuthor</type>
             <multiplicity>*</multiplicity>
           </association>



Mime
View raw message