svn commit: r928204 - in /maven/archetype/trunk/archetype-common/src/main/mdo: archetype-catalog.mdo archetype.mdo

[hb...@apache.org]

Author: hboutemy
Date: Sat Mar 27 14:33:56 2010
New Revision: 928204

URL: http://svn.apache.org/viewvc?rev=928204&view=rev
Log:
added source and resource XML attributes to the descriptor

Modified:
    maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo
    maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo

Modified: maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo?rev=928204&r1=928203&r2=928204&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo (original)
+++ maven/archetype/trunk/archetype-common/src/main/mdo/archetype-catalog.mdo Sat Mar 27 14:33:56 2010
@@ -33,7 +33,7 @@
     about the <code>local</code> and <code>remote</code> catalogs:</p>
     <ul>
       <li><code>local</code> represents the <code>~/.m2/archetype-catalog.xml</code> catalog file,</li>
-      <li><code>remote</code> represents the <code>http://repo1.maven.org/maven2/archetype-catalog.xml</code> catalog file.
+      <li><code>remote</code> represents the <code>http://repo1.maven.org/maven2/archetype-catalog.xml</code> catalog file.</li>
     </ul>
     <p>The Archetype Plugin can also read catalogs from filesystem/HTTP by providing the path/URL of a catalog file or
     of a directory containing an <code>archetype-catalog.xml</code> file.</p>

Modified: maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo?rev=928204&r1=928203&r2=928204&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo (original)
+++ maven/archetype/trunk/archetype-common/src/main/mdo/archetype.mdo Sat Mar 27 14:33:56 2010
@@ -44,12 +44,13 @@
           <description><![CDATA[Setting this option to <code>true</code> makes it possible to run the
             <code>archetype:create</code> even on existing projects.]]></description>
         </field>
+
         <field xdoc.separator="blank">
           <name>sources</name>
           <version>1.0.0</version>
           <description><![CDATA[Files that will go into <code>src/main/java</code>.]]></description>
           <association>
-            <type>String</type>
+            <type>Source</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
@@ -58,16 +59,17 @@
           <version>1.0.0</version>
           <description><![CDATA[Files that will go into <code>src/main/resources</code>.]]></description>
           <association>
-            <type>String</type>
+            <type>Resource</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
-        <field>
+
+        <field xdoc.separator="blank">
           <name>testSources</name>
           <version>1.0.0</version>
           <description><![CDATA[Files that will go into <code>src/test/java</code>.]]></description>
           <association xml.tagName="source">
-            <type>String</type>
+            <type>Source</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
@@ -76,21 +78,58 @@
           <version>1.0.0</version>
           <description><![CDATA[Files that will go into <code>src/test/resources</code>.]]></description>
           <association xml.tagName="resource">
-            <type>String</type>
+            <type>Resource</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
-        <field>
+
+        <field xdoc.separator="blank">
           <name>siteResources</name>
           <version>1.0.0</version>
           <description><![CDATA[Files that will go into <code>src/site</code>.]]></description>
           <association xml.tagName="resource">
-            <type>String</type>
+            <type>Resource</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
       </fields>
     </class>
+
+    <class>
+      <name>Source</name>
+      <description>Describes a source file. Note that source files are always filtered, unlike resources that
+        can be non-filtered.</description>
+      <version>1.0.0</version>
+      <fields>
+        <field xml.attribute="true">
+          <name>encoding</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description><![CDATA[The encoding to be used when reading/writing this file.]]></description>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>Resource</name>
+      <description>Describes a resource file.</description>
+      <version>1.0.0</version>
+      <fields>
+        <field xml.attribute="true">
+          <name>encoding</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description><![CDATA[The encoding to be used when reading/writing this file.]]></description>
+        </field>
+        <field xml.attribute="true">
+          <name>filtered</name>
+          <version>1.0.0</version>
+          <type>boolean</type>
+          <defaultValue>true</defaultValue>
+          <description>A resource can be filtered, which means the file will be used as Velocity template.
+          It can be non-filtered, which means the file will be copied without modification.</description>
+        </field>
+      </fields>
+    </class>
   </classes>
 </model>