add additional contributor fields and default goal

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170711 13f79535-47bb-0310-9956-ffa450edef68

maven-model/maven.mdo

@@ -528,7 +528,7 @@
           <name>organization</name>
           <version>3.0.0+</version>
           <description><![CDATA[
-            This element describes various attributes of the organziation to
+            This element describes various attributes of the organization to
             which the project belongs.  These attributes are utilized when
             documentation is created (for copyright notices and links).
           ]]></description>
@@ -706,6 +706,14 @@
       <version>3.0.0+</version>
       <superClass>PluginContainer</superClass>
       <fields>
+        <field>
+          <name>defaultGoal</name>
+          <version>3.0.0+</version>
+          <description><![CDATA[
+            The default goal (or phase in Maven 2) to execute when none is specified for the project.
+          ]]></description>
+          <type>String</type>
+        </field>
         <field>
           <name>nagEmailAddress</name>
           <version>3.0.0</version>
@@ -718,7 +726,6 @@
             target.
           ]]></description>
           <type>String</type>
-          <comment>This should be moved out of the build section. Vestigal for use with Gump.</comment>
         </field>
         <field>
           <name>sourceDirectory</name>
@@ -996,12 +1003,19 @@
           <description><![CDATA[The URL for the homepage of the contributor.]]></description>
           <type>String</type>
         </field>
+        <!-- TODO: should this just be a single Organization element -->
         <field>
           <name>organization</name>
           <version>3.0.0+</version>
           <description><![CDATA[The organization to which the contributor belongs.]]></description>
           <type>String</type>
         </field>
+        <field>
+          <name>organizationUrl</name>
+          <version>3.0.0+</version>
+          <description><![CDATA[The URL of the organization.]]></description>
+          <type>String</type>
+        </field>
         <field>
           <name>roles</name>
           <version>3.0.0+</version>
@@ -1023,6 +1037,18 @@
           ]]></description>
           <type>String</type>
         </field>
+        <field>
+          <name>properties</name>
+          <version>3.0.0+</version>
+          <description><![CDATA[
+            Properties about the contributor, such as an instant messenger handle.
+          ]]></description>
+          <type>Properties</type>
+          <association xml.mapStyle="inline">
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
       </fields>
     </class>
     <class>
@@ -1396,7 +1422,7 @@
         </field>
         <field>
           <name>post</name>
-          <version>3.1.0+</version>
+          <version>3.0.0+</version>
           <description><![CDATA[
             The email address or link that can be used to post to
             the mailing list.  If this is an email address, a
@@ -1415,7 +1441,7 @@
         </field>
         <field>
           <name>otherArchives</name>
-          <version>3.1.0+</version>
+          <version>3.0.0+</version>
           <description><![CDATA[
             The link to other URLs where you can browse the list archive.
           ]]></description>

maven-model/project.properties

@@ -1 +1,8 @@
 maven.repo.remote=http://cvs.apache.org/repository,http://www.ibiblio.org/maven
+maven.repo.list=apachecvs
+maven.repo.apachecvs=scp://cvs.apache.org
+maven.repo.apachecvs.directory=/www/cvs.apache.org/repository
+maven.repo.apachecvs.username=${maven.repo.apache.username}
+maven.repo.apachecvs.privatekey=${maven.repo.apache.privatekey}
+maven.repo.apachecvs.passphrase=${maven.repo.apache.passphrase}
+maven.repo.apachecvs.group=maven

maven-model/project.xml

@@ -11,13 +11,13 @@
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-modello-plugin</artifactId>
-      <version>0.9-SNAPSHOT</version>
+      <version>1.0-alpha-1-SNAPSHOT</version>
       <type>plugin</type>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
+      <version>1.0-alpha-3</version>
     </dependency>
   </dependencies>
 </project>