Author: maartenc
Date: Tue May 3 22:25:12 2011
New Revision: 1099286
URL: http://svn.apache.org/viewvc?rev=1099286&view=rev
Log:
Online ivy.xsd hadn't been updated when Ivy 2.2.0 was released (IVY-1278)
Modified:
ant/site/ivy/production/schemas/ivy.xsd
ant/site/ivy/sources/schemas/ivy.xsd
Modified: ant/site/ivy/production/schemas/ivy.xsd
URL:
http://svn.apache.org/viewvc/ant/site/ivy/production/schemas/ivy.xsd?rev=1099286&r1=1099285&r2=1099286&view=diff
==============================================================================
--- ant/site/ivy/production/schemas/ivy.xsd (original)
+++ ant/site/ivy/production/schemas/ivy.xsd Tue May 3 22:25:12 2011
@@ -60,6 +60,15 @@
<xs:element name="info">
<xs:complexType>
<xs:sequence>
+ <xs:element name="extends"
minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute
name="organisation" type="xs:string" use="required"/>
+ <xs:attribute name="module"
type="xs:string" use="required"/>
+ <xs:attribute name="revision"
type="xs:string" use="required"/>
+ <xs:attribute name="location"
type="xs:string" />
+ <xs:attribute name="extendType"
type="xs:string" />
+ </xs:complexType>
+ </xs:element>
<xs:element name="license"
minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:attribute name="name"
type="xs:string" use="required"/>
@@ -91,7 +100,7 @@
</xs:element>
<xs:any minOccurs="0"
maxOccurs="unbounded" namespace="##other" processContents="lax"/>
</xs:sequence>
- <xs:attribute name="organisation" type="xs:string"
use="required"/>
+ <xs:attribute name="organisation" type="xs:string"/>
<xs:attribute name="module" type="xs:string"
use="required"/>
<xs:attribute name="branch" type="xs:string"/>
<xs:attribute name="revision" type="xs:string"/>
@@ -116,6 +125,7 @@
</xs:element>
</xs:choice>
</xs:sequence>
+ <xs:attribute name="defaultconf"
type="xs:string"/>
<xs:attribute
name="defaultconfmapping" type="xs:string"/>
<xs:attribute
name="confmappingoverride" type="xs:boolean" />
</xs:complexType>
Modified: ant/site/ivy/sources/schemas/ivy.xsd
URL:
http://svn.apache.org/viewvc/ant/site/ivy/sources/schemas/ivy.xsd?rev=1099286&r1=1099285&r2=1099286&view=diff
==============================================================================
--- ant/site/ivy/sources/schemas/ivy.xsd (original)
+++ ant/site/ivy/sources/schemas/ivy.xsd Tue May 3 22:25:12 2011
@@ -60,6 +60,15 @@
<xs:element name="info">
<xs:complexType>
<xs:sequence>
+ <xs:element name="extends"
minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute
name="organisation" type="xs:string" use="required"/>
+ <xs:attribute name="module"
type="xs:string" use="required"/>
+ <xs:attribute name="revision"
type="xs:string" use="required"/>
+ <xs:attribute name="location"
type="xs:string" />
+ <xs:attribute name="extendType"
type="xs:string" />
+ </xs:complexType>
+ </xs:element>
<xs:element name="license"
minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:attribute name="name"
type="xs:string" use="required"/>
@@ -91,7 +100,7 @@
</xs:element>
<xs:any minOccurs="0"
maxOccurs="unbounded" namespace="##other" processContents="lax"/>
</xs:sequence>
- <xs:attribute name="organisation" type="xs:string"
use="required"/>
+ <xs:attribute name="organisation" type="xs:string"/>
<xs:attribute name="module" type="xs:string"
use="required"/>
<xs:attribute name="branch" type="xs:string"/>
<xs:attribute name="revision" type="xs:string"/>
@@ -116,6 +125,7 @@
</xs:element>
</xs:choice>
</xs:sequence>
+ <xs:attribute name="defaultconf"
type="xs:string"/>
<xs:attribute
name="defaultconfmapping" type="xs:string"/>
<xs:attribute
name="confmappingoverride" type="xs:boolean" />
</xs:complexType>
@@ -141,7 +151,7 @@
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute
name="defaultconf" type="xs:string"/>
+ <xs:attribute
name="defaultconf" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="dependencies" minOccurs="0">
@@ -220,7 +230,7 @@
<xs:attribute
name="org" type="xs:string"/>
<xs:attribute
name="name" type="xs:string" use="required"/>
<xs:attribute
name="branch" type="xs:string"/>
- <xs:attribute
name="branchConstraint" type="xs:string"/>
+ <xs:attribute
name="branchConstraint" type="xs:string"/>
<xs:attribute
name="rev" type="xs:string" use="required"/>
<xs:attribute
name="revConstraint" type="xs:string"/>
<xs:attribute
name="force" type="xs:boolean"/>
