dion        2002/06/04 09:22:40

  Modified:    src/dtd  project.xsd
               .        project.xml
  Log:
  - Synched schema and project.xml
  - maven:validate-pom now works ok
  
  Revision  Changes    Path
  1.16      +15 -10    jakarta-turbine-maven/src/dtd/project.xsd
  
  Index: project.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/dtd/project.xsd,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.xsd       4 Jun 2002 15:37:42 -0000       1.15
  +++ project.xsd       4 Jun 2002 16:22:40 -0000       1.16
  @@ -10,6 +10,7 @@
           <xs:element ref="organization"/>
           <xs:element ref="inceptionYear"/>
           <xs:element ref="package"/>
  +        <xs:element ref="logo"/>
           <xs:element ref="gumpRepositoryId" minOccurs="0"/>
           <xs:element ref="description" minOccurs="0"/>
           <xs:element ref="shortDescription"/>
  @@ -18,6 +19,7 @@
           <xs:element ref="siteAddress" minOccurs="0"/>
           <xs:element ref="siteDirectory" minOccurs="0"/>
           <xs:element ref="distributionDirectory" minOccurs="0"/>
  +        <xs:element ref="repository" />
           <xs:element ref="versions" minOccurs="0"/>
           <xs:element ref="branches" minOccurs="0"/>
           <xs:element ref="mailingLists"/>
  @@ -29,20 +31,22 @@
       </xs:complexType>
     </xs:element>
   
  -  <xs:element name="pomVersion" type='xs:string'/>
  +  <xs:element name="connection" type='xs:string'/>
  +  <xs:element name="currentVersion" type='xs:string'/>
  +  <xs:element name="description" type='xs:string'/>
  +  <xs:element name="distributionDirectory" type='xs:string'/>
     <xs:element name="name" type='xs:string'/>
  +  <xs:element name="gumpRepositoryId" type='xs:string'/>
     <xs:element name="id" type='xs:string'/>
  -  <xs:element name="currentVersion" type='xs:string'/>
     <xs:element name="inceptionYear" type='xs:string'/>
  +  <xs:element name="issueTrackingUrl" type='xs:string'/>
  +  <xs:element name="logo" type='xs:string'/>
     <xs:element name="package" type='xs:string'/>
  +  <xs:element name="pomVersion" type='xs:string'/>
     <xs:element name="shortDescription" type='xs:string'/>
  -  <xs:element name="gumpRepositoryId" type='xs:string'/>
  -  <xs:element name="description" type='xs:string'/>
  -  <xs:element name="url" type='xs:string'/>
  -  <xs:element name="issueTrackingUrl" type='xs:string'/>
     <xs:element name="siteAddress" type='xs:string'/>
     <xs:element name="siteDirectory" type='xs:string'/>
  -  <xs:element name="distributionDirectory" type='xs:string'/>
  +  <xs:element name="url" type='xs:string'/>
   
     <xs:element name="repository">
       <xs:complexType>
  @@ -58,6 +62,7 @@
         <xs:sequence>
           <xs:element ref="name"/>
           <xs:element ref="url"/>
  +        <xs:element ref="logo"/>
         </xs:sequence>
       </xs:complexType>
     </xs:element>
  @@ -163,14 +168,14 @@
       <xs:complexType>
         <xs:sequence>
           <xs:element ref="name"/>
  -        <xs:element ref="email"/>
  +        <xs:element ref="email" minOccurs="0" />
           <xs:element name="organization" type='xs:string' minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
     </xs:element>
   
     <xs:element name="email" type='xs:string'/>
  -  
  +      
     <xs:element name="dependencies">
       <xs:complexType>
         <xs:sequence>
  @@ -183,7 +188,7 @@
       <xs:complexType>
         <xs:sequence>
           <xs:element ref="id"/>
  -        <xs:element ref="version"/>
  +        <xs:element name="version" type="xs:string" />
           <xs:element ref="url" minOccurs="0"/>
           <xs:element ref="jar" minOccurs="0"/>
         </xs:sequence>
  
  
  
  1.99      +4 -5      jakarta-turbine-maven/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- project.xml       4 Jun 2002 15:38:18 -0000       1.98
  +++ project.xml       4 Jun 2002 16:22:40 -0000       1.99
  @@ -2,8 +2,8 @@
   <project>
     
     <pomVersion>3</pomVersion>
  -  <name>jakarta-turbine-maven</name>
     <id>maven</id>
  +  <name>jakarta-turbine-maven</name>
     <currentVersion>1.0-b5-dev</currentVersion>
     <organization>
       <name>Apache Software Foundation</name>
  @@ -13,9 +13,7 @@
     <inceptionYear>2001</inceptionYear>
     <package>org.apache.maven</package>
     <logo>/images/maven.jpg</logo>
  -
  -  <shortDescription>Java Project Management Tools</shortDescription>
  -
  +  
     <!-- Gump integration -->
     <gumpRepositoryId>jakarta</gumpRepositoryId>
   
  @@ -27,6 +25,8 @@
       to create source metrics, change logs based directly on source
       repository, and source cross-references.
     </description>
  +  
  +  <shortDescription>Java Project Management Tools</shortDescription>
   
     <url>http://jakarta.apache.org/turbine/maven/</url>
     
<issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
  @@ -148,7 +148,6 @@
         <id>dion</id>
         <email>[EMAIL PROTECTED]</email>
         <organization>Multitask Consulting</organization>
  -      <organization></organization>
         <roles>
           <role>Java Developer</role>
         </roles>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to