Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix some schema mistakes.

All schemas are now valid and usable in eclipse, except for some
imported xhtml schemas.
  • Loading branch information...
commit 4602f3e74ab6d185a1f105b1a2cf7e42f59b8ffd 1 parent 4630312
@g2p authored
View
2  schemas/amp.xsd
@@ -19,7 +19,7 @@
<xs:element ref='rule' minOccurs='1' maxOccurs='unbounded'/>
</xs:sequence>
<xs:attribute name='from' use='optional' type='xs:string'/>
- <xs:attribute name='per-hop' use='optional' type='xs:bool' default='false'/>
+ <xs:attribute name='per-hop' use='optional' type='xs:boolean' default='false'/>
<xs:attribute name='status' use='optional' type='xs:NCName'/>
<xs:attribute name='to' use='optional' type='xs:string'/>
</xs:complexType>
View
2  schemas/avatar-data.xsd
@@ -13,6 +13,6 @@
</xs:documentation>
</xs:annotation>
- <xs:element name='data' type='xs:base64Binary'>
+ <xs:element name='data' type='xs:base64Binary'/>
</xs:schema>
View
2  schemas/captcha.xsd
@@ -14,7 +14,7 @@
</xs:annotation>
<xs:import namespace='jabber:x:data'
- schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:element name='captcha'>
<xs:complexType>
View
7 schemas/component-accept.xsd
@@ -14,11 +14,10 @@
</xs:documentation>
</xs:annotation>
- <xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'/>
+ <xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'
schemaLocation='http://xmpp.org/schemas/streamerror.xsd'/>
-
<xs:import namespace='http://www.w3.org/XML/1998/namespace'
- schemaLocation='http://www.w3.org/2001/03/xml.xsd'/>
+ schemaLocation='http://www.w3.org/2001/xml.xsd'/>
<xs:element name='handshake' type='xs:string'/>
@@ -181,7 +180,7 @@
<xs:element name='error'>
<xs:complexType>
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-streams'>
- <xs:group ref='err:stanzaErrorGroup'/>
+ <xs:group ref='err:streamErrorGroup'/>
<xs:element ref='err:text'
minOccurs='0'
maxOccurs='1'/>
View
7 schemas/component-connect.xsd
@@ -14,11 +14,10 @@
</xs:documentation>
</xs:annotation>
- <xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'/>
+ <xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'
schemaLocation='http://xmpp.org/schemas/streamerror.xsd'/>
-
<xs:import namespace='http://www.w3.org/XML/1998/namespace'
- schemaLocation='http://www.w3.org/2001/03/xml.xsd'/>
+ schemaLocation='http://www.w3.org/2001/xml.xsd'/>
<xs:element name='handshake' type='xs:string'/>
@@ -181,7 +180,7 @@
<xs:element name='error'>
<xs:complexType>
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-streams'>
- <xs:group ref='err:stanzaErrorGroup'/>
+ <xs:group ref='err:streamErrorGroup'/>
<xs:element ref='err:text'
minOccurs='0'
maxOccurs='1'/>
View
3  schemas/compress.xsd
@@ -6,7 +6,8 @@
xmlns='http://jabber.org/protocol/compress'
elementFormDefault='qualified'>
- <xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+ <xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'
+ schemaLocation='http://xmpp.org/schemas/stanzaerror.xsd'/>
<xs:annotation>
<xs:documentation>
View
3  schemas/delimiter.xsd
@@ -12,4 +12,5 @@
</xs:documentation>
</xs:annotation>
-<xs:element name='roster' type='xs:string'/>
+ <xs:element name='roster' type='xs:string'/>
+</xs:schema>
View
2  schemas/feature-neg.xsd
@@ -8,7 +8,7 @@
<xs:import
namespace='jabber:x:data'
- schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:annotation>
<xs:documentation>
View
2  schemas/geoloc.xsd
@@ -34,7 +34,7 @@
<xs:element name='speed' minOccurs='0' type='xs:decimal'/>
<xs:element name='street' minOccurs='0' type='xs:string'/>
<xs:element name='text' minOccurs='0' type='xs:string'/>
- <xs:element name='timestamp' minOccurs='0' type='xs:datetime'/>
+ <xs:element name='timestamp' minOccurs='0' type='xs:dateTime'/>
<xs:element name='uri' minOccurs='0' type='xs:anyURI'/>
</xs:sequence>
</xs:complexType>
View
2  schemas/httpbind.xsd
@@ -15,7 +15,7 @@
</xs:annotation>
<xs:import namespace='http://www.w3.org/XML/1998/namespace'
- schemaLocation='http://www.w3.org/2001/03/xml.xsd'/>
+ schemaLocation='http://www.w3.org/2001/xml.xsd'/>
<xs:element name='body'>
<xs:complexType>
View
4 schemas/iq-register.xsd
@@ -8,10 +8,10 @@
<xs:import
namespace='jabber:x:data'
- schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:import
namespace='jabber:x:oob'
- schemaLocation='http://www.xmpp.org/schemas/x-oob.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-oob.xsd'/>
<xs:annotation>
<xs:documentation>
View
20 schemas/iq-search.xsd
@@ -7,7 +7,7 @@
elementFormDefault='qualified'>
<xs:import namespace='jabber:x:data'
- schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:annotation>
<xs:documentation>
@@ -18,15 +18,19 @@
<xs:element name='query'>
<xs:complexType>
+ <!--
+ There is a nondeterminism issue here. Introducing a grouping element
+ would have helped.
+ -->
<xs:choice>
- <xs:all xmlns:xdata='jabber:x:data'>
- <xs:element name='instructions' type='xs:string'/>
- <xs:element name='first' type='xs:string'/>
- <xs:element name='last' type='xs:string'/>
- <xs:element name='nick' type='xs:string'/>
- <xs:element name='email' type='xs:string'/>
+ <xs:choice xmlns:xdata='jabber:x:data'>
+ <xs:element name='instructions' type='xs:string' minOccurs='0'/>
+ <xs:element name='first' type='xs:string' minOccurs='0'/>
+ <xs:element name='last' type='xs:string' minOccurs='0'/>
+ <xs:element name='nick' type='xs:string' minOccurs='0'/>
+ <xs:element name='email' type='xs:string' minOccurs='0'/>
<xs:element ref='xdata:x' minOccurs='0'/>
- </xs:all>
+ </xs:choice>
<xs:element ref='item' minOccurs='0' maxOccurs='unbounded'/>
</xs:choice>
</xs:complexType>
View
4 schemas/jabber-client.xsd
@@ -7,7 +7,9 @@
elementFormDefault='qualified'>
<xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'
- schemaLocation='http://www.xmpp.org/schemas/stanzaerror.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/stanzaerror.xsd'/>
+ <xs:import namespace='http://www.w3.org/XML/1998/namespace'
+ schemaLocation='http://www.w3.org/2001/xml.xsd'/>
<xs:element name='message'>
<xs:complexType>
View
4 schemas/jabber-server.xsd
@@ -7,7 +7,9 @@
elementFormDefault='qualified'>
<xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'
- schemaLocation='http://www.xmpp.org/schemas/stanzaerror.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/stanzaerror.xsd'/>
+ <xs:import namespace='http://www.w3.org/XML/1998/namespace'
+ schemaLocation='http://www.w3.org/2001/xml.xsd'/>
<xs:element name='message'>
<xs:complexType>
View
7 schemas/langtrans.xsd
@@ -5,6 +5,9 @@
targetNamespace='urn:xmpp:langtrans'
elementFormDefault='qualified'>
+ <xs:import namespace='http://www.w3.org/XML/1998/namespace'
+ schemaLocation='http://www.w3.org/2001/xml.xsd'/>
+
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
@@ -14,9 +17,9 @@
<xs:element name='x'>
<xs:complexType>
- <xs:element ref='source' use='required'/>
<xs:sequence>
- <xs:element ref='translation' use='required' minOccurs='1'/>
+ <xs:element ref='source' minOccurs='1' maxOccurs='1'/>
+ <xs:element ref='translation' minOccurs='1'/>
</xs:sequence>
</xs:complexType>
</xs:element>
View
2  schemas/muc-owner.xsd
@@ -15,7 +15,7 @@
<xs:import
namespace='jabber:x:data'
- schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:element name='query'>
<xs:complexType>
View
3  schemas/muc-user.xsd
@@ -103,7 +103,8 @@
<xs:attribute name='code' use='required'>
<xs:simpleType>
<xs:restriction base='xs:int'>
- <xs:length value='3'/>
+ <xs:minInclusive value='100'/>
+ <xs:maxExclusive value='1000'/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
View
17 schemas/pubsub-event.xsd
@@ -15,7 +15,7 @@
<xs:import
namespace='jabber:x:data'
- schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:element name='event'>
<xs:complexType>
@@ -32,9 +32,18 @@
<xs:element name='collection'>
<xs:complexType>
- <xs:sequence minOccurs='1'>
- <xs:element ref='node'/>
- </xs:sequence>
+ <xs:all minOccurs='1'>
+ <xs:element name='associate'>
+ <xs:complexType>
+ <xs:attribute name='node' type='xs:string' use='optional'/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name='disassociate'>
+ <xs:complexType>
+ <xs:attribute name='node' type='xs:string' use='optional'/>
+ </xs:complexType>
+ </xs:element>
+ </xs:all>
<xs:attribute name='node' type='xs:string' use='optional'/>
</xs:complexType>
</xs:element>
View
7 schemas/pubsub-owner.xsd
@@ -15,7 +15,7 @@
<xs:import
namespace='jabber:x:data'
- schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:element name='pubsub'>
<xs:complexType>
@@ -126,4 +126,9 @@
</xs:complexType>
</xs:element>
+ <xs:simpleType name="empty">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="" />
+ </xs:restriction>
+ </xs:simpleType>
</xs:schema>
View
2  schemas/pubsub.xsd
@@ -15,7 +15,7 @@
<xs:import
namespace='jabber:x:data'
- schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:element name='pubsub'>
<xs:complexType>
View
4 schemas/rosterx.xsd
@@ -26,9 +26,9 @@
<xs:sequence>
<xs:element name='group' type='xs:string' minOccurs='0' maxOccurs='unbounded'/>
</xs:sequence>
- <xs:attribute name='action' use='optional'>
+ <xs:attribute name='action' use='optional' default='add'>
<xs:simpleType>
- <xs:restriction base='xs:NCName' default='add'>
+ <xs:restriction base='xs:NCName'>
<xs:enumeration value='add'/>
<xs:enumeration value='delete'/>
<xs:enumeration value='modify'/>
View
9 schemas/si.xsd
@@ -8,7 +8,7 @@
<xs:import
namespace='http://jabber.org/protocol/feature-neg'
- schemaLocation='http://www.xmpp.org/schemas/feature-neg.xsd'/>
+ schemaLocation='http://xmpp.org/schemas/feature-neg.xsd'/>
<xs:annotation>
<xs:documentation>
@@ -25,10 +25,9 @@
</xs:documentation>
</xs:annotation>
<xs:complexType>
- <xs:all xmlns:fneg='http://jabber.org/protocol/feature-neg'>
- <xs:element ref='fneg:feature'/>
- <xs:any namespace='##other'/>
- </xs:all>
+ <xs:choice xmlns:fneg='http://jabber.org/protocol/feature-neg'>
+ <xs:any namespace='##other' minOccurs='0'/>
+ </xs:choice>
<xs:attribute name='id' type='xs:string' use='optional'/>
<xs:attribute name='mime-type' type='xs:string' use='optional'/>
<xs:attribute name='profile' type='xs:string' use='optional'/>
View
9 schemas/sm.xsd
@@ -6,6 +6,9 @@
xmlns='urn:xmpp:sm:2'
elementFormDefault='qualified'>
+ <xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'
+ schemaLocation='http://xmpp.org/schemas/stanzaerror.xsd'/>
+
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
@@ -70,7 +73,7 @@
<xs:complexType>
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'
minOccurs='0'
- minOccurs='1'>
+ maxOccurs='1'>
<xs:group ref='err:stanzaErrorGroup'/>
</xs:sequence>
</xs:complexType>
@@ -88,9 +91,9 @@
</xs:complexType>
</xs:element>
- <xs:element name='resume' type='resumptionElementType'>
+ <xs:element name='resume' type='resumptionElementType'/>
- <xs:element name='resumed' type='resumptionElementType'>
+ <xs:element name='resumed' type='resumptionElementType'/>
<xs:element name='sm'>
<xs:complexType>
View
3  schemas/stanzaerror.xsd
@@ -6,6 +6,9 @@
xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'
elementFormDefault='qualified'>
+ <xs:import namespace='http://www.w3.org/XML/1998/namespace'
+ schemaLocation='http://www.w3.org/2001/xml.xsd'/>
+
<xs:element name='bad-request' type='empty'/>
<xs:element name='conflict' type='empty'/>
<xs:element name='feature-not-implemented' type='empty'/>
View
3  schemas/streamerror.xsd
@@ -6,6 +6,9 @@
xmlns='urn:ietf:params:xml:ns:xmpp-streams'
elementFormDefault='qualified'>
+ <xs:import namespace='http://www.w3.org/XML/1998/namespace'
+ schemaLocation='http://www.w3.org/2001/xml.xsd' />
+
<xs:element name='bad-format' type='empty'/>
<xs:element name='bad-namespace-prefix' type='empty'/>
<xs:element name='conflict' type='empty'/>
View
4 schemas/streams.xsd
@@ -12,6 +12,10 @@
schemaLocation='http://xmpp.org/schemas/jabber-server.xsd'/>
<xs:import namespace='jabber:server:dialback'
schemaLocation='http://xmpp.org/schemas/dialback.xsd'/>
+ <xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'
+ schemaLocation='http://xmpp.org/schemas/streamerror.xsd'/>
+ <xs:import namespace='http://www.w3.org/XML/1998/namespace'
+ schemaLocation='http://www.w3.org/2001/xml.xsd'/>
<xs:element name='stream'>
<xs:complexType>
View
18 schemas/waitinglist.xsd
@@ -13,7 +13,8 @@
</xs:documentation>
</xs:annotation>
- <xs:import namespace='jabber:client'/>
+ <xs:import namespace='jabber:client'
+ schemaLocation='http://xmpp.org/schemas/jabber-client.xsd' />
<xs:element name='waitlist'>
<xs:complexType>
@@ -28,9 +29,8 @@
<xs:element name='item'>
<xs:complexType>
<xs:choice minOccurs='0'
- maxOccurs='unbounded'
- xmlns:xmpp='jabber:client'>
- <xs:sequence>
+ maxOccurs='unbounded'>
+ <xs:sequence xmlns:xmpp='jabber:client'>
<xs:element ref='uri'/>
<xs:element ref='name' minOccurs='0'/>
<xs:element ref='xmpp:error' minOccurs='0'/>
@@ -54,11 +54,13 @@
</xs:complexType>
</xs:element>
- <xs:element name='uri' type='xs:string'>
+ <xs:element name='uri' >
<xs:complexType>
- <xs:attribute name='scheme'
- type='xs:NCNAME'
- use='required'/>
+ <xs:simpleContent>
+ <xs:extension base='xs:string'>
+ <xs:attribute name='scheme' type='xs:NCName' use='required' />
+ </xs:extension>
+ </xs:simpleContent>
</xs:complexType>
</xs:element>
View
11 schemas/x-data.xsd
@@ -79,17 +79,17 @@
<xs:element name='value' type='xs:string'/>
<xs:element name='reported'>
- <xs:complexType>
- <xs:sequence>
- <xs:element ref='field' maxOccurs='unbounded'/>
- </xs:sequence>
- </xs:complexType>
<xs:annotation>
<xs:documentation>
When contained in a "reported" element, the "field" element
SHOULD NOT contain a "value" child.
</xs:documentation>
</xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref='field' maxOccurs='unbounded'/>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
<xs:element name='item'>
@@ -98,6 +98,7 @@
<xs:element ref='field' maxOccurs='unbounded'/>
</xs:sequence>
</xs:complexType>
+ </xs:element>
<xs:simpleType name='empty'>
<xs:restriction base='xs:string'>
View
2  schemas/xbosh.xsd
@@ -16,12 +16,10 @@
<xs:attribute name='restart'
type='xs:boolean'
- use='optional'
default='false'/>
<xs:attribute name='version'
type='xs:string'
- use='optional'
default='1.0'/>
</xs:schema>
View
4 schemas/xdata-validate.xsd
@@ -46,10 +46,10 @@
<xs:simpleContent>
<xs:extension base='empty'>
<xs:attribute name='min'
- type='xs:unsignedInteger'
+ type='xs:unsignedInt'
use='optional'/>
<xs:attribute name='max'
- type='xs:unsignedInteger'
+ type='xs:unsignedInt'
use='optional'/>
</xs:extension>
</xs:simpleContent>
Please sign in to comment.
Something went wrong with that request. Please try again.