cvs commit: jakarta-turbine-maven/src/xsd maven-project.xsd

[di...@apache.org]

dion        2003/01/15 05:37:43

  Modified:    src/xsd  maven-project.xsd
  Log:
  Updates for MAVEN-188.
  Only <properties> haven't been added, as I'm unsure they are currently using a finalised syntax
  
  Revision  Changes    Path
  1.15      +32 -1     jakarta-turbine-maven/src/xsd/maven-project.xsd
  
  Index: maven-project.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/xsd/maven-project.xsd,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- maven-project.xsd	17 Dec 2002 07:34:35 -0000	1.14
  +++ maven-project.xsd	15 Jan 2003 13:37:43 -0000	1.15
  @@ -29,17 +29,20 @@
           <xs:element ref="contributors" minOccurs="0"/>
           <xs:element ref="dependencies" minOccurs="0"/>
           <xs:element ref="build"/>
  +        <xs:element ref="reports" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
     </xs:element>
   
     <xs:element name="extend" type='xs:string'/>
     <xs:element name="connection" type='xs:string'/>
  +  <xs:element name="developerConnection" 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="groupId" type='xs:string'/>
  +  <xs:element name="artifactId" type='xs:string'/>
     <xs:element name="gumpRepositoryId" type='xs:string'/>
     <xs:element name="id" type='xs:string'/>
     <xs:element name="inceptionYear" type='xs:string'/>
  @@ -56,6 +59,7 @@
       <xs:complexType>
         <xs:sequence>
           <xs:element ref="connection"/>
  +        <xs:element ref="developerConnection" minOccurs="0"/>
           <xs:element ref="url" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
  @@ -194,7 +198,9 @@
     <xs:element name="dependency">
       <xs:complexType>
         <xs:sequence>
  -        <xs:element ref="id"/>
  +        <xs:element ref="id" minOccurs="0" />
  +        <xs:element ref="groupId" minOccurs="0" />
  +        <xs:element ref="artifactId" minOccurs="0" />
           <xs:element name="version" type="xs:string" />
           <xs:element ref="jar" minOccurs="0"/>
           <xs:element ref="type" minOccurs="0"/>
  @@ -268,9 +274,34 @@
     <xs:element name="resources">
       <xs:complexType>
         <xs:sequence>
  +        <xs:element ref="resource" minOccurs="0" maxOccurs="unbounded"/>
  +      </xs:sequence>
  +    </xs:complexType>
  +  </xs:element>
  +
  +  <xs:element name="directory" type='xs:string'/>
  +  <xs:element name="targetPath" type='xs:string'/>
  +
  +  <xs:element name="resource">
  +    <xs:complexType>
  +      <xs:sequence>
  +        <!-- FIXME: I think that this defaults to basedir, need a check -->
  +        <xs:element ref="directory" minOccurs="0" />
  +        <xs:element ref="targetPath" minOccurs="0" />
           <xs:element ref="includes" minOccurs="0" maxOccurs="unbounded"/>
           <xs:element ref="excludes" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
       </xs:complexType>
     </xs:element>
  +  
  +
  +  <xs:element name="reports">
  +    <xs:complexType>
  +      <xs:sequence>
  +        <xs:element name="report" minOccurs="0" maxOccurs="unbounded" 
  +          type="xs:string"/>
  +      </xs:sequence>
  +    </xs:complexType>
  +  </xs:element>
  +
   </xs:schema>