moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-21 08:45:04 -05:00
Code Issues Releases Wiki Activity

schema fixes from Gabriel de Perthuis

Browse Source 
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@3295 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2009-07-01 19:26:46 +00:00
parent 45b1d8b8ca
commit 8c0f19b45f
15 changed files with 69 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xep-0004.xml
View File

@ -705,17 +705,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'>

7
xep-0020.xml
View File

@ -21,7 +21,7 @@
<supersededby/>
<shortname>feature-neg</shortname>
<schemaloc>
<url>http://www.xmpp.org/schemas/feature-neg.xsd</url>
<url>http://xmpp.org/schemas/feature-neg.xsd</url>
</schemaloc>
&pgmillard;
&stpeter;
@ -295,9 +295,8 @@
xmlns='http://jabber.org/protocol/feature-neg'
elementFormDefault='qualified'>
<xs:import
namespace='jabber:x:data'
schemaLocation='http://www.xmpp.org/schemas/x-data.xsd'/>
<xs:import namespace='jabber:x:data'
schemaLocation='http://xmpp.org/schemas/x-data.xsd'/>
<xs:annotation>
<xs:documentation>

3
xep-0045.xml
View File

@ -5478,7 +5478,8 @@ xmpp:darkcave@chat.shakespeare.lit?invite;jid=hecate@shakespeare.lit;password=ca
<xs:attribute name='code' use='required'>
<xs:simpleType>
<xs:restriction base='xs:int'>
<xs:length value='3'/>
<xs:minInclusive value='100'/>
<xs:maxInclusive value='999'/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>

22
xep-0060.xml
View File

@ -29,19 +29,19 @@
<shortname>pubsub</shortname>
<schemaloc>
<ns>pubsub</ns>
<url>http://www.xmpp.org/schemas/pubsub.xsd</url>
<url>http://xmpp.org/schemas/pubsub.xsd</url>
</schemaloc>
<schemaloc>
<ns>pubsub#errors</ns>
<url>http://www.xmpp.org/schemas/pubsub-errors.xsd</url>
<url>http://xmpp.org/schemas/pubsub-errors.xsd</url>
</schemaloc>
<schemaloc>
<ns>pubsub#event</ns>
<url>http://www.xmpp.org/schemas/pubsub-event.xsd</url>
<url>http://xmpp.org/schemas/pubsub-event.xsd</url>
</schemaloc>
<schemaloc>
<ns>pubsub#owner</ns>
<url>http://www.xmpp.org/schemas/pubsub-owner.xsd</url>
<url>http://xmpp.org/schemas/pubsub-owner.xsd</url>
</schemaloc>
<discuss>pubsub</discuss>
@ -6034,13 +6034,13 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
XEP-0060: http://www.xmpp.org/extensions/xep-0060.html
XEP-0060: http://xmpp.org/extensions/xep-0060.html
</xs:documentation>
</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='pubsub'>
<xs:complexType>
@ -6249,7 +6249,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
This namespace is used for error reporting only, as
defined in XEP-0060:
http://www.xmpp.org/extensions/xep-0060.html
http://xmpp.org/extensions/xep-0060.html
</xs:documentation>
</xs:annotation>
@ -6353,13 +6353,13 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
XEP-0060: http://www.xmpp.org/extensions/xep-0060.html
XEP-0060: http://xmpp.org/extensions/xep-0060.html
</xs:documentation>
</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='event'>
<xs:complexType>
@ -6510,13 +6510,13 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
XEP-0060: http://www.xmpp.org/extensions/xep-0060.html
XEP-0060: http://xmpp.org/extensions/xep-0060.html
</xs:documentation>
</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='pubsub'>
<xs:complexType>

2
xep-0079.xml
View File

@ -1198,7 +1198,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>

4
xep-0080.xml
View File

@ -266,7 +266,7 @@
</tr>
<tr>
<td>timestamp</td>
<td>xs:datetime</td>
<td>xs:dateTime</td>
<td>UTC timestamp specifying the moment when the reading was taken (MUST conform to the DateTime profile of &xep0082;)</td>
<td>2004-02-19T21:12Z</td>
</tr>
@ -511,7 +511,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>

4
xep-0083.xml
View File

@ -148,7 +148,9 @@ SERVER:
</xs:documentation>
</xs:annotation>
<xs:element name='roster' type='xs:string'/>
<xs:element name='roster' type='xs:string'/>
</xs:schema>
]]></code>
</section1>
</xep>

2
xep-0084.xml
View File

@ -540,7 +540,7 @@
</xs:documentation>
</xs:annotation>
<xs:element name='data' type='xs:base64Binary'>
<xs:element name='data' type='xs:base64Binary'/>
</xs:schema>
]]></code>

6
xep-0095.xml
View File

@ -351,10 +351,10 @@
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:all xmlns:fneg='http://jabber.org/protocol/feature-neg'>
<xs:sequence xmlns:fneg='http://jabber.org/protocol/feature-neg'>
<xs:any namespace='##other' minOccurs='0'/>
<xs:element ref='fneg:feature'/>
<xs:any namespace='##other'/>
</xs:all>
</xs:sequence>
<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'/>

26
xep-0114.xml
View File

@ -21,11 +21,11 @@
<shortname>component</shortname>
<schemaloc>
<ns>jabber:component:accept</ns>
<url>http://www.xmpp.org/schemas/component-accept.xsd</url>
<url>http://xmpp.org/schemas/component-accept.xsd</url>
</schemaloc>
<schemaloc>
<ns>jabber:component:connect</ns>
<url>http://www.xmpp.org/schemas/component-connect.xsd</url>
<url>http://xmpp.org/schemas/component-connect.xsd</url>
</schemaloc>
&stpeter;
<revision>
@ -134,15 +134,19 @@
xmlns='jabber:component:accept'
elementFormDefault='qualified'>
<xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'/>
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
XEP-0114: http://www.xmpp.org/extensions/xep-0114.html
XEP-0114: http://xmpp.org/extensions/xep-0114.html
</xs:documentation>
</xs:annotation>
<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'/>
<xs:element name='handshake' type='xs:string'/>
<xs:element name='message'>
@ -338,15 +342,19 @@
xmlns='jabber:component:connect'
elementFormDefault='qualified'>
<xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'/>
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
XEP-0114: http://www.xmpp.org/extensions/xep-0114.html
XEP-0114: http://xmpp.org/extensions/xep-0114.html
</xs:documentation>
</xs:annotation>
<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'/>
<xs:element name='handshake' type='xs:string'/>
<xs:element name='message'>
@ -508,7 +516,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'/>

15
xep-0130.xml
View File

@ -950,7 +950,8 @@
</xs:documentation>
</xs:annotation>
<xs:import namespace='jabber:client'/>
<xs:import namespace='jabber:client'
schemaLocation='http://xmpp.org/schemas/jabber-client.xsd'/>
<xs:annotation>
<xs:documentation>
@ -1011,11 +1012,15 @@
</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>

5
xep-0138.xml
View File

@ -301,8 +301,6 @@
xmlns='http://jabber.org/protocol/compress'
elementFormDefault='qualified'>
<xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'/>
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
@ -310,6 +308,9 @@
</xs:documentation>
</xs:annotation>
<xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'
schemaLocation='http://xmpp.org/schemas/stanzaerror.xsd'/>
<xs:element name='compress'>
<xs:complexType>
<xs:sequence>

4
xep-0144.xml
View File

@ -303,9 +303,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'/>

6
xep-0158.xml
View File

@ -24,7 +24,7 @@
<supersededby>None</supersededby>
<shortname>captcha</shortname>
<schemaloc>
<url>http://www.xmpp.org/schemas/captcha.xsd</url>
<url>http://xmpp.org/schemas/captcha.xsd</url>
</schemaloc>
&ianpaterson;
&stpeter;
@ -849,12 +849,12 @@
<xs:annotation>
<xs:documentation>
The protocol documented by this schema is defined in
XEP-0158: http://www.xmpp.org/extensions/xep-0158.html
XEP-0158: http://xmpp.org/extensions/xep-0158.html
</xs:documentation>
</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>

6
xep-0198.xml
View File

@ -566,7 +566,7 @@ S: <t stanzas='10'/>
<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>
@ -584,9 +584,9 @@ S: <t stanzas='10'/>
</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>