git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2278 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2008-09-26 01:30:40 +00:00
parent a9c2272c00
commit a33315f245
1 changed files with 49 additions and 6 deletions

View File

@ -25,6 +25,12 @@
</schemaloc>
&ralphm;
&stpeter;
<revision>
<version>1.3rc1</version>
<date>in progress, last updated 2008-09-22</date>
<initials>psa</initials>
<remark><p>Allowed empty activity element to signify a pause in publishing; added undefined element to handle any unspecified activity; also added more activities: dancing, fishing, hiding, praying, smoking, thinking.</p></remark>
</revision>
<revision>
<version>1.2</version>
<date>2007-07-11</date>
@ -86,7 +92,7 @@
<code><![CDATA[
<activity xmlns='http://jabber.org/protocol/activity'>
<relaxing>
<fishing xmlns='http://www.ilovefishing.info'/>
<tanning xmlns='http://www.ilovetanning.info'/>
</relaxing>
</activity>
]]></code>
@ -140,9 +146,33 @@
</items>
</event>
</message>
.
.
.
]]></example>
<p>In order to indicate that the user is no longer publishing activities, the user's client shall send an empty &lt;activity/&gt; element, which can be considered a "stop command" for user activities:</p>
<example caption='User Disables Publishing'><![CDATA[
<iq from='juliet@capulet.lit/balcony'
id='publish1'
type='set'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
<publish node='http://jabber.org/protocol/activity'>
<item>
<activity xmlns='http://jabber.org/protocol/activity'/>
</item>
</publish>
</pubsub>
</iq>
]]></example>
<example caption='Empty Activity Information is Delivered to All Subscribers'><![CDATA[
<message
from='juliet@capulet.lit'
to='romeo@montague.net'>
<event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='http://jabber.org/protocol/activity'>
<item id='b5ac48d0-0f9c-11dc-8754-001143d5d5db'>
<activity xmlns='http://jabber.org/protocol/activity'/>
</item>
</items>
</event>
</message>
]]></example>
</section2>
</section1>
@ -186,6 +216,7 @@
<li>exercising
<ul>
<li>cycling</li>
<li>dancing</li>
<li>hiking</li>
<li>jogging</li>
<li>playing_sports</li>
@ -213,20 +244,25 @@
<ul>
<li>day_off</li>
<li>hanging_out</li>
<li>hiding</li>
<li>on_vacation</li>
<li>praying</li>
<li>scheduled_holiday</li>
<li>sleeping</li>
<li>thinking</li>
</ul>
</li>
<li>relaxing
<ul>
<li>fishing</li>
<li>gaming</li>
<li>going_out</li>
<li>partying</li>
<li>reading</li>
<li>rehearsing</li>
<li>shopping</li>
<li>smoking</li>
<li>socializing</li>
<li>sunbathing</li>
<li>watching_tv</li>
@ -375,7 +411,7 @@
<xs:element name='activity'>
<xs:complexType>
<xs:sequence>
<xs:choice>
<xs:choice minOccurs='0'>
<xs:element name='doing_chores' type='general'/>
<xs:element name='drinking' type='general'/>
<xs:element name='eating' type='general'/>
@ -386,6 +422,7 @@
<xs:element name='relaxing' type='general'/>
<xs:element name='talking' type='general'/>
<xs:element name='traveling' type='general'/>
<xs:element name='undefined' type='general'/>
<xs:element name='working' type='general'/>
</xs:choice>
<xs:element name='text' minOccurs='0' type='xs:string'/>
@ -404,11 +441,13 @@
<xs:element name='commuting' type='specific'/>
<xs:element name='cooking' type='specific'/>
<xs:element name='cycling' type='specific'/>
<xs:element name='dancing' type='specific'/>
<xs:element name='day_off' type='specific'/>
<xs:element name='doing_maintenance' type='specific'/>
<xs:element name='doing_the_dishes' type='specific'/>
<xs:element name='doing_the_laundry' type='specific'/>
<xs:element name='driving' type='specific'/>
<xs:element name='fishing' type='specific'/>
<xs:element name='gaming' type='specific'/>
<xs:element name='gardening' type='specific'/>
<xs:element name='getting_a_haircut' type='specific'/>
@ -421,6 +460,7 @@
<xs:element name='having_dinner' type='specific'/>
<xs:element name='having_lunch' type='specific'/>
<xs:element name='having_tea' type='specific'/>
<xs:element name='hiding' type='specific'/>
<xs:element name='hiking' type='specific'/>
<xs:element name='in_a_car' type='specific'/>
<xs:element name='in_a_meeting' type='specific'/>
@ -436,6 +476,7 @@
<xs:element name='other' type='specific'/>
<xs:element name='partying' type='specific'/>
<xs:element name='playing_sports' type='specific'/>
<xs:element name='praying' type='specific'/>
<xs:element name='reading' type='specific'/>
<xs:element name='rehearsing' type='specific'/>
<xs:element name='running' type='specific'/>
@ -445,16 +486,18 @@
<xs:element name='shopping' type='specific'/>
<xs:element name='skiing' type='specific'/>
<xs:element name='sleeping' type='specific'/>
<xs:element name='smoking' type='specific'/>
<xs:element name='socializing' type='specific'/>
<xs:element name='studying' type='specific'/>
<xs:element name='sunbathing' type='specific'/>
<xs:element name='swimming' type='specific'/>
<xs:element name='taking_a_bath' type='specific'/>
<xs:element name='taking_a_shower' type='specific'/>
<xs:element name='thinking' type='specific'/>
<xs:element name='walking' type='specific'/>
<xs:element name='walking_the_dog' type='specific'/>
<xs:element name='watching_tv' type='specific'/>
<xs:element name='watching_a_movie' type='specific'/>
<xs:element name='watching_tv' type='specific'/>
<xs:element name='working_out' type='specific'/>
<xs:element name='writing' type='specific'/>
</xs:choice>