moparisthebest
/
xeps
mirror of https://github.com/moparisthebest/xeps
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Revert normative changes for 'meta-data'" 

This reverts commit 37c7b852f3.
This commit is contained in:
Maxime “pep” Buquet 2018-11-03 14:03:00 +00:00
parent 37c7b852f3
commit 6842676930
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inbox/calendaring.xml
View File

@ -353,7 +353,7 @@ END:VCALENDAR
<feature var='urn:xmpp:tmp:calendar:0'/>
<x xmlns='jabber:x:data' type='result'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value>
<value>http://jabber.org/protocol/pubsub#metadata</value>
</field>
<field var='pubsub#type' label='Payload type'>
<value>urn:ietf:params:xml:ns:xcal</value>

2
inbox/pubsub-uri.xml
View File

@ -175,7 +175,7 @@ pubsub-itemid = 1*( unreserved / pct-encoded / sub-delims )
</example>
<example caption="A URI referring to the metadata of a node">
<![CDATA[xmpp.pubsub:pubsub.shakespeare.lit/princely_musings/?meta-data]]>
<![CDATA[xmpp.pubsub:pubsub.shakespeare.lit/princely_musings/?metadata]]>
</example>
<example caption="A URI referring to the last published item of a node">

20
xep-0060.xml
View File

@ -301,7 +301,7 @@
<version>1.6</version>
<date>2004-07-13</date>
<initials>pgm/psa</initials>
<remark><p>Added service discovery features for pubsub#meta-data, and pubsub#retrieve-items. Added pubsub#subscription_depth configuration option. Specified pubsub-specific error condition elements qualified by pubsub#errors namespace.</p></remark>
<remark><p>Added service discovery features for pubsub#metadata, and pubsub#retrieve-items. Added pubsub#subscription_depth configuration option. Specified pubsub-specific error condition elements qualified by pubsub#errors namespace.</p></remark>
</revision>
<revision>
<version>1.5</version>
@ -367,7 +367,7 @@
<version>0.12</version>
<date>2003-08-13</date>
<initials>pgm/psa</initials>
<remark><p>Defined public vs. private nodes; described how changes to existing nodes might trigger meta-node events (e.g., configuration changes); changed &lt;x/&gt; to &lt;event/&gt; for #events namespace; added meta-data about meta-nodes; fully defined XMPP Registrar considerations.</p></remark>
<remark><p>Defined public vs. private nodes; described how changes to existing nodes might trigger meta-node events (e.g., configuration changes); changed &lt;x/&gt; to &lt;event/&gt; for #events namespace; added metadata about meta-nodes; fully defined XMPP Registrar considerations.</p></remark>
</revision>
<revision>
<version>0.11</version>
@ -981,7 +981,7 @@ And by opposing end them?
]]></example>
</section2>
<section2 topic='Discover Node Metadata' anchor='entity-metadata'>
<p>The "disco#info" result MAY include detailed metadata about the node, encapsulated in the &xep0004; format as described in &xep0128;, where the data form context is specified by including a FORM_TYPE of "http://jabber.org/protocol/pubsub#meta-data" in accordance with &xep0068;. If metadata is provided, it SHOULD include values for all configured options as well as "automatic" information such as the node creation date, a list of publishers, and the like.</p>
<p>The "disco#info" result MAY include detailed metadata about the node, encapsulated in the &xep0004; format as described in &xep0128;, where the data form context is specified by including a FORM_TYPE of "http://jabber.org/protocol/pubsub#metadata" in accordance with &xep0068;. If metadata is provided, it SHOULD include values for all configured options as well as "automatic" information such as the node creation date, a list of publishers, and the like.</p>
<example caption='Entity queries a node for information'><![CDATA[
<iq type='get'
from='francisco@denmark.lit/barracks'
@ -1002,7 +1002,7 @@ And by opposing end them?
<feature var='http://jabber.org/protocol/pubsub'/>
<x xmlns='jabber:x:data' type='result'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value>
<value>http://jabber.org/protocol/pubsub#metadata</value>
</field>
<field var='pubsub#type' label='Payload type' type='text-single'>
<value>http://www.w3.org/2005/Atom</value>
@ -5118,7 +5118,7 @@ And by opposing end them?
<td><link url='#affiliations'>Affiliations</link></td>
</tr>
<tr>
<td>meta-data</td>
<td>metadata</td>
<td>Node metadata is supported.</td>
<td>RECOMMENDED</td>
<td>&#160;</td>
@ -6013,7 +6013,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
<doc>XEP-0060</doc>
</var>
<var>
<name>http://jabber.org/protocol/pubsub#meta-data</name>
<name>http://jabber.org/protocol/pubsub#metadata</name>
<desc>Node metadata is supported.</desc>
<doc>XEP-0060</doc>
</var>
@ -6136,7 +6136,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
<li>Authorization of subscriptions using the 'http://jabber.org/protocol/pubsub#subscribe_authorization' namespace.</li>
<li>Configuration of subscription options using the 'http://jabber.org/protocol/pubsub#subscribe_options' namespace.</li>
<li>Configuration of a node using the 'http://jabber.org/protocol/pubsub#node_config' namespace.</li>
<li>Setting of metadata information using the 'http://jabber.org/protocol/pubsub#meta-data' namespace.</li>
<li>Setting of metadata information using the 'http://jabber.org/protocol/pubsub#metadata' namespace.</li>
</ol>
<p>The registry submissions associated with these namespaces are defined below.</p>
<p>Note: There is no requirement that configuration fields need to be registered with the XMPP Registrar. However, as specified in Section 3.4 of <cite>XEP-0068</cite>, names of custom (unregistered) fields MUST begin with the characters "x-" if the form itself is scoped by a registered FORM_TYPE.</p>
@ -6240,10 +6240,10 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
</form_type>
]]></code>
</section3>
<section3 topic='pubsub#meta-data FORM_TYPE' anchor='registrar-formtypes-metadata'>
<section3 topic='pubsub#metadata FORM_TYPE' anchor='registrar-formtypes-metadata'>
<code><![CDATA[
<form_type>
<name>http://jabber.org/protocol/pubsub#meta-data</name>
<name>http://jabber.org/protocol/pubsub#metadata</name>
<doc>XEP-0060</doc>
<desc>Forms enabling setting of metadata information about pubsub nodes</desc>
<field var='pubsub#contact'
@ -6863,7 +6863,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:enumeration value='leased-subscription'/>
<xs:enumeration value='manage-subscriptions'/>
<xs:enumeration value='member-affiliation'/>
<xs:enumeration value='meta-data'/>
<xs:enumeration value='metadata'/>
<xs:enumeration value='modify-affiliations'/>
<xs:enumeration value='multi-collection'/>
<xs:enumeration value='multi-items'/>

10
xep-0214.xml
View File

@ -127,7 +127,7 @@
<configure node='juliets_sonnets'/>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value>
<value>http://jabber.org/protocol/pubsub#metadata</value>
</field>
<field var='pubsub#title'><value>Juliet's Sonnets</value></field>
<field var='pubsub#description'><value>Optional Description</value></field>
@ -163,7 +163,7 @@
<configure node='35227eec194a4f3971a5f3771e9c2271'/>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value>
<value>http://jabber.org/protocol/pubsub#metadata</value>
</field>
<field var='pubsub#title'><value>Sonnets About Romeo</value></field>
<field var='pubsub#description'><value>Optional Description</value></field>
@ -218,7 +218,7 @@
<configure node='a6190c5d38e22452041d1c5798eff3f5'>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value>
<value>http://jabber.org/protocol/pubsub#metadata</value>
</field>
<field var='pubsub#title'><value>sonnet.txt</value></field>
<field var='pubsub#description'><value>Sonnet 42</value></field>
@ -234,7 +234,7 @@
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
<publish node='a6190c5d38e22452041d1c5798eff3f5'>
<item id='1'>
<entry xmlns='http://jabber.org/protocol/fileshare#item_meta-data'>
<entry xmlns='http://jabber.org/protocol/fileshare#item_metadata'>
<size>5623</size>
<modified>2006-12-13T18:30:02Z</modified>
<checksum type="sha1">59282c5db190bdc3b152c5b38363442bfda8ebdd</checksum>
@ -332,7 +332,7 @@
<configuration node='a6190c5d38e22452041d1c5798eff3f5'>
<x xmlns='jabber:x:data' type='result'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value>
<value>http://jabber.org/protocol/pubsub#metadata</value>
</field>
<field var='pubsub#description'><var>Sonnet 42</var></field>
<field var='pubsub#title'><var>sonnet.txt</var></field>

2
xep-0248.xml
View File

@ -259,7 +259,7 @@
<associate node='new-node-id'>
<x xmlns='jabber:x:data' type='result'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value>
<value>http://jabber.org/protocol/pubsub#metadata</value>
</field>
<field var='pubsub#creation_date'>
<value>2003-07-29T22:56Z</value>