Skip to content

XEP-0353/JMI: Fix specification and xml schema inconsistencies #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

XEP-0353/JMI: Fix specification and xml schema inconsistencies #1436

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfdacb4
XEP-0353/JMI: Remove redefinition of jingle reason element in schema
lnjX Apr 26, 2025
4f0933d
XEP-0353/JMI: XML schema: Add missing definition of 'empty' type
lnjX May 3, 2025
af96873
XEP-0353/JMI: Fix invalid XML in example
lnjX Aug 7, 2025
78f7bae
XEP-0353/JMI: Make reason element optional (also in schema)
lnjX Sep 16, 2025
e589484
XEP-0353/JMI: Add version block for 0.7.0
lnjX Apr 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 22 additions & 30 deletions xep-0353.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@
&fippo;
&stpeter;
&tmolitor;
<revision>
<version>0.7.0</version>
<date>2025-09-16</date>
<initials>lnj</initials>
<remark>
<ul>
<li>Remove local redefinition of jingle &lt;reason/&gt; element in XML schema and reference existing.</li>
<li>Make usage of &lt;reason/&gt; element optional in schema, as specified in the text.</li>
<li>Add missing definition of 'empty' type in XML schema.</li>
</ul>
</remark>
</revision>
<revision>
<version>0.6.0</version>
<date>2022-01-29</date>
Expand Down Expand Up @@ -272,7 +284,7 @@
<success/>
<text>Success</text>
</reason>
</finish
</finish>
<store xmlns="urn:xmpp:hints"/>
</message>
]]></example>
Expand Down Expand Up @@ -486,6 +498,7 @@
xmlns:xml='http://www.w3.org/XML/1998/namespace'
targetNamespace='urn:xmpp:jingle-message:0'
xmlns='urn:xmpp:jingle-message:0'
xmlns:jingle='urn:xmpp:jingle:1'
elementFormDefault='qualified'>

<xs:element name='propose'>
Expand All @@ -510,7 +523,7 @@
<xs:element name='finish'>
<xs:complexType>
<xs:sequence>
<xs:element name='reason' type='reasonElementType' minOccurs='1' maxOccurs='1'/>
<xs:element ref='jingle:reason' minOccurs='0' maxOccurs='1'/>
<xs:element name='migrated' type='migratedElementType' minOccurs='0' maxOccurs='1'/>
</xs:sequence>
<xs:attribute name='id' type='xs:string' use='required'/>
Expand All @@ -520,8 +533,8 @@
<xs:element name='reject'>
<xs:complexType>
<xs:sequence>
<xs:element name='reason' type='reasonElementType' minOccurs='1' maxOccurs='1'/>
<xs:element name='tie-break' type='empty' minOccurs='0' maxOccurs='1'>
<xs:element ref='jingle:reason' minOccurs='0' maxOccurs='1'/>
<xs:element name='tie-break' type='empty' minOccurs='0' maxOccurs='1'/>
</xs:sequence>
<xs:attribute name='id' type='xs:string' use='required'/>
</xs:complexType>
Expand All @@ -530,7 +543,7 @@
<xs:element name='retract'>
<xs:complexType>
<xs:sequence>
<xs:element name='reason' type='reasonElementType' minOccurs='1' maxOccurs='1'/>
<xs:element ref='jingle:reason' minOccurs='0' maxOccurs='1'/>
</xs:sequence>
<xs:attribute name='id' type='xs:string' use='required'/>
</xs:complexType>
Expand All @@ -544,32 +557,11 @@
</xs:simpleContent>
</xs:complexType>

<xs:complexType name='reasonElementType'>
<xs:sequence>
<xs:choice>
<xs:element name='alternative-session'
type='alternativeSessionElementType'/>
<xs:element name='busy' type='empty'/>
<xs:element name='cancel' type='empty'/>
<xs:element name='connectivity-error' type='empty'/>
<xs:element name='decline' type='empty'/>
<xs:element name='expired' type='empty'/>
<xs:element name='failed-application' type='empty'/>
<xs:element name='failed-transport' type='empty'/>
<xs:element name='general-error' type='empty'/>
<xs:element name='gone' type='empty'/>
<xs:element name='incompatible-parameters' type='empty'/>
<xs:element name='media-error' type='empty'/>
<xs:element name='security-error' type='empty'/>
<xs:element name='success' type='empty'/>
<xs:element name='timeout' type='empty'/>
<xs:element name='unsupported-applications' type='empty'/>
<xs:element name='unsupported-transports' type='empty'/>
</xs:choice>
<xs:element name='text' type='xs:string' minOccurs='0' maxOccurs='1'/>
<xs:any namespace='##other' minOccurs='0' maxOccurs='1'/>
</xs:sequence>
<!-- strictly empty type (no children, attributes, or text) -->
<xs:complexType name="empty" mixed="false">
<xs:sequence/>
</xs:complexType>

</xs:schema>
]]></code>
</section1>
Expand Down
Loading