diff --git a/xep-0322.xml b/xep-0322.xml index 8a672d89..838985ed 100644 --- a/xep-0322.xml +++ b/xep-0322.xml @@ -26,13 +26,7 @@ exi - - Peter - Waher - peter.waher@clayster.com - peter.waher@jabber.org - http://www.linkedin.com/in/peterwaher - + &peterwaher; Yusuke DOI @@ -40,6 +34,15 @@ yusuke.doi@gmail.com http://www.linkedin.com/in/yusukedoi + + 0.5 + 2015-11-09 + pw + +

Updated contact information.

+

Updated example JIDs to example.org

+
+
0.4 2014-03-10 @@ -501,7 +504,7 @@

+ ]]> @@ -625,8 +628,8 @@

diff --git a/xep-0323.xml b/xep-0323.xml index fa293f6f..79058465 100644 --- a/xep-0323.xml +++ b/xep-0323.xml @@ -1,4 +1,4 @@ - + %ents; @@ -22,13 +22,16 @@ sensor-data - - Peter - Waher - peter.waher@clayster.com - peter.waher@jabber.org - http://www.linkedin.com/in/peterwaher - + &peterwaher; + + 0.5 + 2015-11-09 + pw + +

Updated contact information.

+

Updated example JIDs to example.org

+
+
0.4 2015-03-02 @@ -463,8 +466,8 @@ ]]> @@ -477,8 +480,8 @@ ]]> @@ -490,8 +493,8 @@ + @@ -511,21 +514,21 @@ - + Timeout. @@ -540,15 +543,15 @@ @@ -595,26 +598,26 @@ - + - + @@ -626,8 +629,8 @@ - + @@ -639,8 +642,8 @@ - + @@ -660,8 +663,8 @@ - + ]]> @@ -674,8 +677,8 @@ @@ -684,14 +687,14 @@ - + @@ -701,8 +704,8 @@ - + @@ -730,8 +733,8 @@ @@ -741,14 +744,14 @@ - + @@ -767,29 +770,29 @@ ]]> @@ -801,8 +804,8 @@ ]]> @@ -810,8 +813,8 @@ ... @@ -1244,21 +1247,21 @@ - + diff --git a/xep-0324.xml b/xep-0324.xml index 94b3ff5c..d8be3a9d 100644 --- a/xep-0324.xml +++ b/xep-0324.xml @@ -1,4 +1,4 @@ - + %ents; @@ -25,13 +25,16 @@ sensor-network-provisioning - - Peter - Waher - peter.waher@clayster.com - peter.waher@jabber.org - http://www.linkedin.com/in/peterwaher - + &peterwaher; + + 0.4 + 2015-11-09 + pw + +

Updated contact information.

+

Updated example JIDs to example.org

+
+
0.3 2014-05-21 @@ -464,11 +467,11 @@

+ - + ... @@ -481,14 +484,14 @@

+ - + ... - + ... ]]> @@ -499,15 +502,15 @@ ... @@ -548,29 +551,29 @@ BASE-64 ENCODED PUBLIC X.509 CERTIFICATE BASE-64 ENCODED CHALLENGE BASE-64 ENCODED RESPONSE ]]> @@ -590,8 +593,8 @@ @@ -604,8 +607,8 @@ @@ -637,15 +640,15 @@ BASE-64 encoded challenge
BASE-64 encoded response ]]> @@ -657,8 +660,8 @@ @@ -693,29 +696,29 @@
- + - + ]]> @@ -739,17 +742,17 @@ - + - + ]]>

@@ -773,17 +776,17 @@ - + - + ]]> @@ -805,9 +808,9 @@ - + + ]]> @@ -821,9 +824,9 @@

- + + ]]>

@@ -850,29 +853,29 @@ - + - + Access denied. @@ -903,8 +906,8 @@ @@ -913,27 +916,27 @@ - + - + ]]> @@ -963,32 +966,32 @@ - + - + ]]> @@ -1019,8 +1022,8 @@ @@ -1028,24 +1031,24 @@ - + - + ]]> @@ -1071,8 +1074,8 @@ @@ -1084,10 +1087,10 @@ - + @@ -1097,18 +1100,18 @@ - + @@ -1146,8 +1149,8 @@ @@ -1162,10 +1165,10 @@ - + @@ -1178,10 +1181,10 @@ - + @@ -1190,8 +1193,8 @@ @@ -1229,15 +1232,15 @@ ]]> @@ -1253,29 +1256,29 @@ BASE-64 ENCODED PUBLIC X.509 CERTIFICATE BASE-64 ENCODED CHALLENGE BASE-64 ENCODED RESPONSE ]]> @@ -1373,8 +1376,8 @@ @@ -1384,16 +1387,16 @@ - + @@ -1471,15 +1474,15 @@ @@ -1505,8 +1508,8 @@ @@ -1516,29 +1519,29 @@ - + @@ -1563,8 +1566,8 @@ ]]> @@ -1572,8 +1575,8 @@ ... diff --git a/xep-0325.xml b/xep-0325.xml index 193d933d..1e9902ae 100644 --- a/xep-0325.xml +++ b/xep-0325.xml @@ -1,4 +1,4 @@ - + %ents; @@ -29,13 +29,16 @@ sensor-network-control - - Peter - Waher - peter.waher@clayster.com - peter.waher@jabber.org - http://www.linkedin.com/in/peterwaher - + &peterwaher; + + 0.4 + 2015-11-09 + psa + +

Updated contact information.

+

Updated example JIDs to example.org

+ +
0.3 2014-04-07 @@ -378,8 +381,8 @@

+ @@ -397,8 +400,8 @@ @@ -406,8 +409,8 @@ ]]> @@ -429,8 +432,8 @@ @@ -438,8 +441,8 @@ @@ -463,8 +466,8 @@

+ @@ -478,8 +481,8 @@

+ @@ -494,8 +497,8 @@

+ @@ -509,8 +512,8 @@

+ @@ -524,8 +527,8 @@

+ @@ -539,8 +542,8 @@

+ @@ -554,8 +557,8 @@

+ @@ -569,8 +572,8 @@

+ @@ -584,8 +587,8 @@

+ @@ -599,8 +602,8 @@

+ @@ -614,8 +617,8 @@

+ @@ -644,15 +647,15 @@
@@ -752,8 +755,8 @@ @@ -771,8 +774,8 @@ ]]> @@ -790,8 +793,8 @@ @@ -809,8 +812,8 @@ @@ -832,8 +835,8 @@

+ @@ -848,8 +851,8 @@

+ @@ -870,8 +873,8 @@ @@ -887,8 +890,8 @@
@@ -905,8 +908,8 @@ @@ -917,8 +920,8 @@ @@ -965,8 +968,8 @@ @@ -983,8 +986,8 @@ @@ -1003,8 +1006,8 @@ ]]> @@ -1018,8 +1021,8 @@ @@ -1042,8 +1045,8 @@ @@ -1059,8 +1062,8 @@ ]]> @@ -1068,8 +1071,8 @@ ... @@ -1544,15 +1547,15 @@ sensor-network-concentrators - - Peter - Waher - peter.waher@clayster.com - peter.waher@jabber.org - http://www.linkedin.com/in/peterwaher - - + &peterwaher; + + 0.3 + 2015-11-09 + pw + +

Updated contact information.

+

Updated example JIDs to example.org

+
+
+ 0.2 2014-03-10 pw @@ -427,15 +430,15 @@
getCapabilities @@ -491,15 +494,15 @@ getCapabilities @@ -552,15 +555,15 @@ getCapabilities @@ -599,15 +602,15 @@ getCapabilities @@ -637,15 +640,15 @@ @@ -664,15 +667,15 @@ @@ -690,15 +693,15 @@ @@ -720,15 +723,15 @@ ]]> @@ -749,15 +752,15 @@ ]]> @@ -776,16 +779,16 @@ ]]> @@ -802,15 +805,15 @@ ]]> @@ -829,16 +832,16 @@ ]]> @@ -853,15 +856,15 @@ @@ -894,15 +897,15 @@ ]]> @@ -917,15 +920,15 @@ true ]]> @@ -938,8 +941,8 @@ @@ -950,8 +953,8 @@ true @@ -972,15 +975,15 @@ @@ -1018,8 +1021,8 @@ @@ -1088,8 +1091,8 @@ Namespace.BaseClass1 @@ -1238,8 +1241,8 @@ Namespace.BaseClass1 @@ -1267,8 +1270,8 @@ @@ -1340,15 +1343,15 @@ country @@ -1498,15 +1501,15 @@ @@ -1561,8 +1564,8 @@ @@ -1590,8 +1593,8 @@ A1-1 @@ -1643,15 +1646,15 @@ ]]> @@ -1713,15 +1716,15 @@ ]]> @@ -1737,8 +1740,8 @@ @@ -1748,8 +1751,8 @@ ]]> @@ -1766,8 +1769,8 @@ @@ -1777,8 +1780,8 @@ ]]> @@ -1805,15 +1808,15 @@ @@ -1975,8 +1978,8 @@ @@ -2042,8 +2045,8 @@ There already exists a node with this ID. @@ -2074,8 +2077,8 @@ @@ -2085,8 +2088,8 @@ @@ -2202,8 +2205,8 @@ @@ -2283,8 +2286,8 @@ Parameter not available. @@ -2367,15 +2370,15 @@ @@ -2455,16 +2458,16 @@ @@ -2522,8 +2525,8 @@ @@ -2570,8 +2573,8 @@ There already exists a node with this ID. @@ -2592,15 +2595,15 @@ ]]> @@ -2617,15 +2620,15 @@ ]]> @@ -2642,15 +2645,15 @@ ]]> @@ -2706,16 +2709,16 @@ @@ -2775,8 +2778,8 @@ ]]> @@ -2792,8 +2795,8 @@ @@ -2812,8 +2815,8 @@ You are not allowed to harass people at 04:30:00! @@ -2829,16 +2832,16 @@ @@ -2901,8 +2904,8 @@ @@ -2930,8 +2933,8 @@ @@ -2949,8 +2952,8 @@ The TO timestamp needs to be later than the FROM timestamp. @@ -2966,16 +2969,16 @@ ]]> @@ -2995,8 +2998,8 @@ @@ -3009,8 +3012,8 @@ @@ -3046,8 +3049,8 @@ true @@ -3068,8 +3071,8 @@ @@ -3082,8 +3085,8 @@ @@ -3148,8 +3151,8 @@ true @@ -3172,8 +3175,8 @@ @@ -3197,8 +3200,8 @@ You are not allowed to harass people at 04:30:00! @@ -3220,8 +3223,8 @@ @@ -3245,8 +3248,8 @@ true @@ -3267,8 +3270,8 @@ @@ -3281,8 +3284,8 @@ @@ -3350,8 +3353,8 @@ @@ -3380,8 +3383,8 @@ @@ -3405,8 +3408,8 @@ The TO timestamp needs to be later than the FROM timestamp. @@ -3428,8 +3431,8 @@ @@ -3453,8 +3456,8 @@ true @@ -3474,8 +3477,8 @@ @@ -3488,8 +3491,8 @@ ]]> @@ -3527,8 +3530,8 @@

+ ... @@ -3543,8 +3546,8 @@

+ ... @@ -3559,8 +3562,8 @@

+ ... @@ -3576,8 +3579,8 @@

+ ... @@ -3598,8 +3601,8 @@

+ ... @@ -3624,8 +3627,8 @@

+ ... @@ -3642,8 +3645,8 @@

+ ... ... @@ -3659,8 +3662,8 @@

+ ... 30 events found. @@ -3678,8 +3681,8 @@

+ ... @@ -3695,8 +3698,8 @@ </p> <example caption='Status'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'> ... <status message='Processing. 67% done.'/> @@ -3713,8 +3716,8 @@ </p> <example caption='Starting a section or subsection'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'> ... <beginSection header='1. Stockholm'/> @@ -3737,8 +3740,8 @@ </section3> <example caption='Starting a section or subsection'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'> ... <endSection/> @@ -3776,8 +3779,8 @@ </p> <example caption='Node added event, without parameters'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeAdded xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01'/> @@ -3785,8 +3788,8 @@ </example> <example caption='Node added event, with parameters'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeAdded xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01'> @@ -3812,8 +3815,8 @@ </p> <example caption='Ordered Node added event, without parameters'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeAdded xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node2' nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01' afterNodeId='Node1' afterNodeCacheType='Node'/> @@ -3827,8 +3830,8 @@ </p> <example caption='Node removed'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeRemoved xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1'/> </message>]]> </example> @@ -3845,8 +3848,8 @@ </p> <example caption='Node updated event, without parameters'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeUpdated xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01'/> @@ -3854,8 +3857,8 @@ </example> <example caption='Node updated event, with parameters'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeUpdated xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01'> @@ -3876,8 +3879,8 @@ </p> <example caption='Node renamed event, without parameters'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeUpdated xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' oldId='OldNode1' nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01'/> @@ -3885,8 +3888,8 @@ </example> <example caption='Node renamed event, with parameters'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeUpdated xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' oldId='OldNode1' nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01'> @@ -3913,15 +3916,15 @@ </p> <example caption='Node status changed event, without messages'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeStatusChanged xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' cacheType='Node' state='ErrorUnsigned'/> </message>]]> </example> <example caption='Node status changed event, with messages'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeStatusChanged xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' cacheType='Node' state='ErrorUnsigned'> <message timestamp='2013-03-22T12:49:34' type='Error'>Sensor does not respond to read-out requests.</message> </nodeStatusChanged> @@ -3935,8 +3938,8 @@ </p> <example caption='Node moved up'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeMovedUp xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1'/> </message>]]> </example> @@ -3953,8 +3956,8 @@ </p> <example caption='Node moved down'> <![CDATA[ - <message from='concentrator@clayster.com' - to='client@clayster.com/client'> + <message from='concentrator@example.org' + to='client@example.org/client'> <nodeMovedDown xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1'/> </message>]]> </example> @@ -3982,15 +3985,15 @@ <example caption='Get All Databases'> <![CDATA[ <iq type='get' - from='client@clayster.com/client' - to='concentrator@clayster.com' + from='client@example.org/client' + to='concentrator@example.org' id='64'> <getDatabases xmlns='urn:xmpp:iot:concentrators' xml:lang='en'/> </iq> <iq type='result' - from='concentrator@clayster.com' - to='client@clayster.com/client' + from='concentrator@example.org' + to='client@example.org/client' id='64'> <getDatabasesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'> <database databaseId='LocalDB' name='Local Database'/> @@ -4009,15 +4012,15 @@ <example caption='Get Database Readout Parameters'> <![CDATA[ <iq type='get' - from='client@clayster.com/client' - to='concentrator@clayster.com' + from='client@example.org/client' + to='concentrator@example.org' id='65'> <getDatabaseReadoutParameters xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB'/> </iq> <iq type='result' - from='concentrator@clayster.com' - to='client@clayster.com/client' + from='concentrator@example.org' + to='client@example.org/client' id='65'> <getDatabaseReadoutParametersResponse xmlns='urn:xmpp:iot:concentrators' result='OK'> <x type='form' @@ -4265,8 +4268,8 @@ <example caption='Start Database Readout'> <![CDATA[ <iq type='set' - from='client@clayster.com/client' - to='concentrator@clayster.com' + from='client@example.org/client' + to='concentrator@example.org' id='66'> <startDatabaseReadout xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB' seqnr='1' userToken='12392748927492834'> <node sourceId='MeteringTopology' nodeId='Node1'/> @@ -4376,8 +4379,8 @@ </iq> <iq type='result' - from='concentrator@clayster.com' - to='client@clayster.com/client' + from='concentrator@example.org' + to='client@example.org/client' id='66'> <startDatabaseReadoutResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/> </iq> @@ -4392,8 +4395,8 @@ <example caption='Start Database Readout, Failure'> <![CDATA[ <iq type='set' - from='client@clayster.com/client' - to='concentrator@clayster.com' + from='client@example.org/client' + to='concentrator@example.org' id='67'> <startDatabaseReadout xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB' seqnr='2' userToken='12392748927492834'> <node sourceId='MeteringTopology' nodeId='Node1'/> @@ -4406,8 +4409,8 @@ </iq> <iq type='error' - from='concentrator@clayster.com' - to='client@clayster.com/client' + from='concentrator@example.org' + to='client@example.org/client' id='67'> <startDatabaseReadoutResponse xmlns='urn:xmpp:iot:concentrators' result='InsufficientPrivileges'/> </iq>]]> @@ -4418,8 +4421,8 @@ <example caption='Start Database Readout, Failure 2'> <![CDATA[ <iq type='set' - from='client@clayster.com/client' - to='concentrator@clayster.com' + from='client@example.org/client' + to='concentrator@example.org' id='68'> <startDatabaseReadout xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB' seqnr='3' userToken='12392748927492834'> <node sourceId='MeteringTopology' nodeId='Node1'/> @@ -4439,8 +4442,8 @@ </iq> <iq type='error' - from='concentrator@clayster.com' - to='client@clayster.com/client' + from='concentrator@example.org' + to='client@example.org/client' id='68'> <startDatabaseReadoutResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'> <error var='to'>The To timestamp cannot be older than the From timestamp.</error> @@ -4456,8 +4459,8 @@ <example caption='Cancelling a database read-out'> <![CDATA[ <iq type='set' - from='client@clayster.com/client' - to='concentrator@clayster.com' + from='client@example.org/client' + to='concentrator@example.org' id='70'> <startDatabaseReadout xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB' seqnr='4' userToken='12392748927492834'> <node sourceId='MeteringTopology' nodeId='Node1'/> @@ -4470,8 +4473,8 @@ </iq> <iq type='result' - from='concentrator@clayster.com' - to='client@clayster.com/client' + from='concentrator@example.org' + to='client@example.org/client' id='70'> <startDatabaseReadoutResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/> </iq> @@ -4479,15 +4482,15 @@ ... <iq type='get' - from='client@clayster.com/client' - to='concentrator@clayster.com' + from='client@example.org/client' + to='concentrator@example.org' id='71'> <cancel xmlns='urn:xmpp:iot:sensordata' seqnr='4'/> </iq> <iq type='result' - from='concentrator@clayster.com' - to='client@clayster.com/client' + from='concentrator@example.org' + to='client@example.org/client' id='71'> <cancelled xmlns='urn:xmpp:iot:sensordata' seqnr='4'/> </iq>]]> @@ -4500,8 +4503,8 @@ <example caption="Service discovery information request"> <![CDATA[ <iq type='get' - from='device@clayster.com/device' - to='provisioning@clayster.com' + from='device@example.org/device' + to='provisioning@example.org' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'/> </iq>]]> @@ -4509,8 +4512,8 @@ <example caption="Service discovery information response"> <![CDATA[ <iq type='result' - from='provisioning@clayster.com' - to='device@clayster.com/device' + from='provisioning@example.org' + to='device@example.org/device' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'> ... @@ -4755,8 +4758,8 @@ <example caption='Unimplemented commands'> <![CDATA[ <iq type='get' - from='client@clayster.com/client' - to='concentrator@clayster.com' + from='client@example.org/client' + to='concentrator@example.org' id='69'> <holabandola xmlns='urn:xmpp:iot:concentrators' ...> ... @@ -4764,8 +4767,8 @@ </iq> <iq type='error' - from='concentrator@clayster.com' - to='client@clayster.com/client' + from='concentrator@example.org' + to='client@example.org/client' id='69'> <holabandolaResponse xmlns='urn:xmpp:iot:concentrators' result='NotImplemented'/> </iq>]]> diff --git a/xep-0331.xml b/xep-0331.xml index 53f13538..ead08259 100644 --- a/xep-0331.xml +++ b/xep-0331.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE xep SYSTEM 'xep.dtd' [ <!ENTITY % ents SYSTEM 'xep.ent'> %ents; @@ -24,13 +24,16 @@ <supersedes/> <supersededby/> <shortname>color-parameter</shortname> - <author> - <firstname>Peter</firstname> - <surname>Waher</surname> - <email>peter.waher@clayster.com</email> - <jid>peter.waher@jabber.org</jid> - <uri>http://www.linkedin.com/in/peterwaher</uri> - </author> + &peterwaher; + <revision> + <version>0.3</version> + <date>2015-11-09</date> + <initials>pw</initials> + <remark> + <p>Updated contact information.</p> + <p>Updated example JIDs to example.org</p> + </remark> + </revision> <revision> <version>0.2</version> <date>2014-03-10</date> diff --git a/xep-0332.xml b/xep-0332.xml index 0d5c45b4..4a6ea7c4 100644 --- a/xep-0332.xml +++ b/xep-0332.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE xep SYSTEM 'xep.dtd' [ <!ENTITY % ents SYSTEM 'xep.ent'> %ents; @@ -27,13 +27,16 @@ <supersedes/> <supersededby/> <shortname>NOT_YET_ASSIGNED</shortname> - <author> - <firstname>Peter</firstname> - <surname>Waher</surname> - <email>peter.waher@clayster.com</email> - <jid>peter.waher@jabber.org</jid> - <uri>http://www.linkedin.com/in/peterwaher</uri> - </author> + &peterwaher; + <revision> + <version>0.4</version> + <date>2015-11-09</date> + <initials>pw</initials> + <remark> + <p>Updated contact information.</p> + <p>Updated example JIDs to example.org</p> + </remark> + </revision> <revision> <version>0.3</version> <date>2014-08-12</date> @@ -384,19 +387,19 @@ <example caption='OPTIONS'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='1'> <req xmlns='urn:xmpp:http' method='OPTIONS' resource='*' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> </headers> </req> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='1'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -415,19 +418,19 @@ <example caption='GET'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='2'> <req xmlns='urn:xmpp:http' method='GET' resource='/rdf/xep' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> </headers> </req> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='2'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -439,7 +442,7 @@ </headers> <data> <text>@prefix dc: <http://purl.org/dc/elements/1.1/>. -@base <http://clayster.com/>. +@base <http://example.org/>. <xep> dc:title "HTTP over XMPP"; dc:creator <PeterWaher>; @@ -461,19 +464,19 @@ <example caption='HEAD'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='3'> <req xmlns='urn:xmpp:http' method='HEAD' resource='/video/video1.m4' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> </headers> </req> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='3'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -493,19 +496,19 @@ <example caption='POST'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='4'> - <req xmlns='urn:xmpp:http' method='POST' resource='/sparql/?default-graph-uri=http%3A%2F%2Fclayster.com%2Frdf/xep' version='1.1'> + <req xmlns='urn:xmpp:http' method='POST' resource='/sparql/?default-graph-uri=http%3A%2F%2Fexample.org%2Frdf/xep' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> <header name='User-agent'>Clayster HTTP/XMPP Client</header> <header name='Content-Type'>application/sparql-query</header> <header name='Content-Length'>...</header> </headers> <data> <text>PREFIX dc: <http://purl.org/dc/elements/1.1/> -BASE <http://clayster.com/> +BASE <http://example.org/> SELECT ?title ?creator ?publisher WHERE { ?x dc:title ?title . @@ -516,8 +519,8 @@ WHERE { ?x dc:title ?title . </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='4'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -539,7 +542,7 @@ WHERE { ?x dc:title ?title . <literal>HTTP over XMPP</literal> </binding> <binding name="creator"> - <uri>http://clayster.com/PeterWaher</uri> + <uri>http://example.org/PeterWaher</uri> </binding> </result> </results> @@ -563,12 +566,12 @@ WHERE { ?x dc:title ?title . <example caption='PUT'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='5'> <req xmlns='urn:xmpp:http' method='PUT' resource='/index.html' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> <header name='Content-Type'>text/html</header> <header name='Content-Length'>...</header> </headers> @@ -579,8 +582,8 @@ WHERE { ?x dc:title ?title . </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='5'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='204' statusMessage='No Content'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -598,19 +601,19 @@ WHERE { ?x dc:title ?title . <example caption='DELETE'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='6'> <req xmlns='urn:xmpp:http' method='DELETE' resource='/index.html' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> </headers> </req> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='6'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='403' statusMessage='Forbidden'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -632,19 +635,19 @@ WHERE { ?x dc:title ?title . <example caption='TRACE'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='7'> <req xmlns='urn:xmpp:http' method='TRACE' resource='/rdf/ex1.turtle' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> </headers> </req> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='7'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -655,7 +658,7 @@ WHERE { ?x dc:title ?title . </headers> <data> <text>GET /rdf/ex1.turtle HTTP/1.1 -Host: clayster.com</text> +Host: example.org</text> </data> </resp> </iq>]]> @@ -675,8 +678,8 @@ Host: clayster.com</text> <example caption='PATCH'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='8'> <req xmlns='urn:xmpp:http' method='PATCH' resource='/file.txt' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -692,8 +695,8 @@ Host: clayster.com</text> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='8'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='204' statusMessage='No Content'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -721,8 +724,8 @@ Host: clayster.com</text> <example caption='text'> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='2'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -734,7 +737,7 @@ Host: clayster.com</text> </headers> <data> <text>@prefix dc: <http://purl.org/dc/elements/1.1/>. -@base <http://clayster.com/>. +@base <http://example.org/>. <xep> dc:title "HTTP over XMPP"; dc:creator <PeterWaher>; @@ -765,8 +768,8 @@ Host: clayster.com</text> <example caption='xml'> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='4'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -788,7 +791,7 @@ Host: clayster.com</text> <literal>HTTP over XMPP</literal> </binding> <binding name="creator"> - <uri>http://clayster.com/PeterWaher</uri> + <uri>http://example.org/PeterWaher</uri> </binding> </result> </results> @@ -816,8 +819,8 @@ Host: clayster.com</text> <example caption='base64'> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='9'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -851,8 +854,8 @@ Host: clayster.com</text> <example caption='chunkedBase64'> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='10'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -867,15 +870,15 @@ Host: clayster.com</text> </resp> </iq> - <message from='httpserver@clayster.com' - to='httpclient@clayster.com/browser'> + <message from='httpserver@example.org' + to='httpclient@example.org/browser'> <chunk xmlns='urn:xmpp:http' streamId='Stream0001' nr='0'>iVBORw0KGgoAAAANSUhEUgAAASwAAAGQCAYAA ...</chunk> </message> ... - <message from='httpserver@clayster.com' - to='httpclient@clayster.com/browser'> + <message from='httpserver@example.org' + to='httpclient@example.org/browser'> <chunk xmlns='urn:xmpp:http' streamId='Stream0001' nr='5' last='true'>... 2uPzi9u+tVWJd+e+y1AAAAABJRU5ErkJggg==</chunk> </message>]]> </example> @@ -909,8 +912,8 @@ Host: clayster.com</text> <example caption='sipub'> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='11'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -921,7 +924,7 @@ Host: clayster.com</text> </headers> <data> <sipub xmlns='http://jabber.org/protocol/sipub' - from='httpserver@clayster.com' + from='httpserver@example.org' id='file-0001' mime-type='image/png' profile='http://jabber.org/protocol/si/profile/file-transfer'> @@ -956,19 +959,19 @@ Host: clayster.com</text> <example caption='ibb'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='12'> <req xmlns='urn:xmpp:http' method='GET' resource='/webcam1.jpg' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> </headers> </req> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='12'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -983,8 +986,8 @@ Host: clayster.com</text> </iq> <iq type='set' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='13'> <open xmlns='http://jabber.org/protocol/ibb' block-size='32768' @@ -993,27 +996,27 @@ Host: clayster.com</text> </iq> <iq type='result' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='13'/> - <message from='httpserver@clayster.com' - to='httpclient@clayster.com/browser'> + <message from='httpserver@example.org' + to='httpclient@example.org/browser'> <data xmlns='http://jabber.org/protocol/ibb' sid='Stream0002' seq='0'>...</chunk> </message> ... <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='14'> <close xmlns='http://jabber.org/protocol/ibb' sid='Stream0002'/> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='14'/>]]> </example> </section3> @@ -1027,8 +1030,8 @@ Host: clayster.com</text> <example caption='jingle'> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='14'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -1145,9 +1148,9 @@ Host: clayster.com</text> </p> <example caption='Examples of URLs with the httpx scheme'> <![CDATA[ - httpx://httpServer@clayster.com/index.html - httpx://httpServer@clayster.com/images/image1.png - httpx://httpServer@clayster.com/api?p1=a&p2=b]]> + httpx://httpServer@example.org/index.html + httpx://httpServer@example.org/images/image1.png + httpx://httpServer@example.org/api?p1=a&p2=b]]> </example> <p> By creating a new scheme for HTTP over XMPP transport, and implementing support for it in web browsers, XML HTTP request objects and web servers, @@ -1241,7 +1244,7 @@ Host: clayster.com</text> <example caption='SOAP method call'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' + from='httpclient@example.org/browser' to='httpserver@example.com' id='15'> <req xmlns='urn:xmpp:http' method='POST' resource='/Math' version='1.1'> @@ -1254,7 +1257,7 @@ Host: clayster.com</text> <xml> <soap:Envelope xmlns:soap="http://www.w3.org/2001/12/soap-envelope" soap:encodingStyle="http://www.w3.org/2001/12/soap-encoding"> - <soap:Body xmlns:m="http://www.clayster.com/math"> + <soap:Body xmlns:m="http://www.example.org/math"> <m:AddNumbers> <m:N1>10</m:N1> <m:N2>20</m:N2> @@ -1268,7 +1271,7 @@ Host: clayster.com</text> <iq type='result' from='httpserver@example.com' - to='httpclient@clayster.com/browser' + to='httpclient@example.org/browser' id='15'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -1279,7 +1282,7 @@ Host: clayster.com</text> <xml> <soap:Envelope xmlns:soap="http://www.w3.org/2001/12/soap-envelope" soap:encodingStyle="http://www.w3.org/2001/12/soap-encoding"> - <soap:Body xmlns:m="http://www.clayster.com/math"> + <soap:Body xmlns:m="http://www.example.org/math"> <m:AddNumbersResponse> <m:Sum>30</m:Sum> </m:AddNumbersResponse> @@ -1304,19 +1307,19 @@ Host: clayster.com</text> <example caption='REST'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='16'> <req xmlns='urn:xmpp:http' method='GET' resource='/api/multiplicationtable?m=5' version='1.1'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> </headers> </req> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='16'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -1373,8 +1376,8 @@ Host: clayster.com</text> <example caption='Turtle'> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='2'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -1386,7 +1389,7 @@ Host: clayster.com</text> </headers> <data> <text>@prefix dc: <http://purl.org/dc/elements/1.1/>. -@base <http://clayster.com/>. +@base <http://example.org/>. <xep> dc:title "HTTP over XMPP"; dc:creator <PeterWaher>; @@ -1409,8 +1412,8 @@ Host: clayster.com</text> <example caption='RDF'> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='17'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -1423,10 +1426,10 @@ Host: clayster.com</text> <xml> <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <rdf:Description rdf:about="http://clayster.com/xep"> + <rdf:Description rdf:about="http://example.org/xep"> <dc:title>HTTP over XMPP</dc:title> - <dc:creator rdf:resource="http://clayster.com/PeterWaher" /> - <dc:publisher rdf:resource="http://clayster.com/XSF" /> + <dc:creator rdf:resource="http://example.org/PeterWaher" /> + <dc:publisher rdf:resource="http://example.org/XSF" /> </rdf:Description> </rdf:RDF> </xml> @@ -1442,20 +1445,20 @@ Host: clayster.com</text> <example caption='SPARQL'> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='4'> <req xmlns='urn:xmpp:http' method='POST' version='1.1' resource='/sparql/?default-graph-uri=http%3A%2F%2Fanother.example%2Fcalendar.rdf'> <headers xmlns='http://jabber.org/protocol/shim'> - <header name='Host'>clayster.com</header> + <header name='Host'>example.org</header> <header name='User-agent'>Clayster HTTP/XMPP Client</header> <header name='Content-Type'>application/sparql-query</header> <header name='Content-Length'>...</header> </headers> <data> <text>@prefix dc: <http://purl.org/dc/elements/1.1/>. -@base <http://clayster.com/>. +@base <http://example.org/>. <xep> dc:title "HTTP over XMPP"; dc:creator <PeterWaher>; @@ -1465,8 +1468,8 @@ Host: clayster.com</text> </iq> <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='4'> <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'> <headers xmlns='http://jabber.org/protocol/shim'> @@ -1488,7 +1491,7 @@ Host: clayster.com</text> <literal>HTTP over XMPP</literal> </binding> <binding name="creator"> - <uri>http://clayster.com/PeterWaher</uri> + <uri>http://example.org/PeterWaher</uri> </binding> </result> </results> @@ -1526,8 +1529,8 @@ Host: clayster.com</text> <example caption="Service discovery information request"> <![CDATA[ <iq type='set' - from='httpclient@clayster.com/browser' - to='httpserver@clayster.com' + from='httpclient@example.org/browser' + to='httpserver@example.org' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'/> </iq>]]> @@ -1535,8 +1538,8 @@ Host: clayster.com</text> <example caption="Service discovery information response"> <![CDATA[ <iq type='result' - from='httpserver@clayster.com' - to='httpclient@clayster.com/browser' + from='httpserver@example.org' + to='httpclient@example.org/browser' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'> ... @@ -1732,9 +1735,9 @@ Host: clayster.com</text> </p> <code> <![CDATA[ - httpx://httpServer@clayster.com/index.html - httpx://httpServer@clayster.com/images/image1.png - httpx://httpServer@clayster.com/api?p1=a&p2=b]]> + httpx://httpServer@example.org/index.html + httpx://httpServer@example.org/images/image1.png + httpx://httpServer@example.org/api?p1=a&p2=b]]> </code> </dd> </di> @@ -1791,7 +1794,7 @@ Host: clayster.com</text> For further information, please contact Peter Waher: </p> <p> - Email: <link url='mailto:peter.waher@clayster.com'>peter.waher@clayster.com</link><br/> + Email: <link url='mailto:peter.waher@example.org'>peter.waher@example.org</link><br/> JabberID: <link url='xmpp:peter.waher@jabber.org'>peter.waher@jabber.org</link><br/> URI: <link url='http://www.linkedin.com/in/peterwaher'>http://www.linkedin.com/in/peterwaher</link> </p> @@ -1804,7 +1807,7 @@ Host: clayster.com</text> For concerns regarding changes to the provisional registration, please contact Peter Waher: </p> <p> - Email: <link url='mailto:peter.waher@clayster.com'>peter.waher@clayster.com</link><br/> + Email: <link url='mailto:peter.waher@example.org'>peter.waher@example.org</link><br/> JabberID: <link url='xmpp:peter.waher@jabber.org'>peter.waher@jabber.org</link><br/> URI: <link url='http://www.linkedin.com/in/peterwaher'>http://www.linkedin.com/in/peterwaher</link> </p> diff --git a/xep-0336.xml b/xep-0336.xml index 1142e3db..07f0a900 100644 --- a/xep-0336.xml +++ b/xep-0336.xml @@ -27,13 +27,16 @@ <supersedes/> <supersededby/> <shortname>dynamic-forms</shortname> - <author> - <firstname>Peter</firstname> - <surname>Waher</surname> - <email>peter.waher@clayster.com</email> - <jid>peter.waher@jabber.org</jid> - <uri>http://www.linkedin.com/in/peterwaher</uri> - </author> + &peterwaher; + <revision> + <version>0.2</version> + <date>2015-11-09</date> + <initials>pw</initials> + <remark> + <p>Updated contact information.</p> + <p>Updated example JIDs to example.org</p> + </remark> + </revision> <revision> <version>0.1</version> <date>2014-01-08</date> @@ -356,8 +359,8 @@ <example caption='Performing a server post-back'> <![CDATA[ <iq type='set' - from='formclient@clayster.com/client' - to='formserver@clayster.com' + from='formclient@example.org/client' + to='formserver@example.org' id='1'> <submit xmlns='urn:xmpp:xdata:dynamic' xml:lang='en'> <x xmlns="jabber:x:data" type="submit"> @@ -381,8 +384,8 @@ <example caption='Post-back response'> <![CDATA[ <iq type='result' - from='formserver@clayster.com' - to='formclient@clayster.com/client' + from='formserver@example.org' + to='formclient@example.org/client' id='1'> <x xmlns="jabber:x:data" type="form" xmlns:xdd="urn:xmpp:xdata:dynamic" @@ -601,8 +604,8 @@ <example caption='Cancelling a dynamic form'> <![CDATA[ <iq type='set' - from='formclient@clayster.com/client' - to='formserver@clayster.com' + from='formclient@example.org/client' + to='formserver@example.org' id='4'> <cancel xmlns='urn:xmpp:xdata:dynamic'> <x xmlns="jabber:x:data" type="submit"> @@ -622,8 +625,8 @@ <example caption='Dynamic form cancelled'> <![CDATA[ <iq type='result' - from='formserver@clayster.com' - to='formclient@clayster.com/client' + from='formserver@example.org' + to='formclient@example.org/client' id='4'/>]]> </example> <p> @@ -647,8 +650,8 @@ <example caption='Dynamic form not found during post-back'> <![CDATA[ <iq type='error' - from='formserver@clayster.com' - to='formclient@clayster.com/client' + from='formserver@example.org' + to='formclient@example.org/client' id='2'> <error type='cancel'> <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> @@ -668,8 +671,8 @@ <example caption='Other error during post-back'> <![CDATA[ <iq type='error' - from='formserver@clayster.com' - to='formclient@clayster.com/client' + from='formserver@example.org' + to='formclient@example.org/client' id='3'> <error type='cancel'> <internal-server-error xmlns='urn:ietf:params:xml:ns:xmpp-streams'/> @@ -721,8 +724,8 @@ </x> ... - <message from='server@clayster.com' - to='client@clayster.com/client'> + <message from='server@example.org' + to='client@example.org/client'> <updated xmlns='urn:xmpp:xdata:dynamic' sessionVariable='xdd session' xml:lang='en'> <x xmlns="jabber:x:data" type="form" xmlns:xdd="urn:xmpp:xdata:dynamic" @@ -758,8 +761,8 @@ <example caption="Service discovery information request"> <![CDATA[ <iq type='get' - from='formclient@clayster.com/client' - to='formserver@clayster.com' + from='formclient@example.org/client' + to='formserver@example.org' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'/> </iq>]]> @@ -767,8 +770,8 @@ <example caption="Service discovery information response"> <![CDATA[ <iq type='result' - from='formserver@clayster.com' - to='formclient@clayster.com/client' + from='formserver@example.org' + to='formclient@example.org/client' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'> ... diff --git a/xep-0337.xml b/xep-0337.xml index 25b8016d..4450e9c9 100644 --- a/xep-0337.xml +++ b/xep-0337.xml @@ -21,13 +21,16 @@ <supersedes/> <supersededby/> <shortname>eventlogging</shortname> - <author> - <firstname>Peter</firstname> - <surname>Waher</surname> - <email>peter.waher@clayster.com</email> - <jid>peter.waher@jabber.org</jid> - <uri>http://www.linkedin.com/in/peterwaher</uri> - </author> + &peterwaher; + <revision> + <version>0.2</version> + <date>2015-11-09</date> + <initials>pw</initials> + <remark> + <p>Updated contact information.</p> + <p>Updated example JIDs to example.org</p> + </remark> + </revision> <revision> <version>0.1</version> <date>2014-01-08</date> @@ -142,7 +145,7 @@ </p> <example caption='Simple event message'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T15:52:23Z'> <message>Something happened.</message> </log> @@ -155,7 +158,7 @@ </p> <example caption='Multi-line event message'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-12T11:47:12Z'> <message>10 objects deleted: Object 1 @@ -171,7 +174,7 @@ Object 10</message> </p> <example caption='Specifying type and level'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T15:54:55Z' type='Warning' level='Major'> <message>Low on memory.</message> </log> @@ -184,7 +187,7 @@ Object 10</message> </p> <example caption='Specifying object and subject'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T15:58:12Z' type='Informational' level='Major' object='Towel' subject='Arthur Dent'> <message>Object deleted.</message> </log> @@ -197,7 +200,7 @@ Object 10</message> </p> <example caption='Specifying an event ID'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' id='LoginFailed' timestamp='2013-11-10T16:04:45Z' type='Warning' level='Minor' object='user1' subject='10.0.0.1'> <message>User attempted to login but provided incorrect password.</message> </log> @@ -210,7 +213,7 @@ Object 10</message> </p> <example caption='Tagging events with custom information'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T16:07:01Z' type='Informational' level='Minor'> <message>Current resources.</message> <tag name='RAM' value='1655709892' type='xs:long'/> @@ -228,7 +231,7 @@ Object 10</message> </p> <example caption='Specifying program module'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T16:17:56Z' type='Error' level='Major' object='object1' subject='user1' module='application1'> <message>Something horrible happened.</message> </log> @@ -241,7 +244,7 @@ Object 10</message> </p> <example caption='Sending debug information'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T16:12:25Z' type='Debug' level='Major' module='My new application' stackTrace='file1, line 1, ...'> <message>Something is rotten in the state of Denmark.</message> <tag name='a' value='1' type='xs:int'/> @@ -261,7 +264,7 @@ File2, Line2, ... </p> <example caption='Sending multiple events'> <![CDATA[ - <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'> + <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'> <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T15:52:23Z'> <message>Something happened.</message> </log> @@ -277,8 +280,8 @@ File2, Line2, ... <example caption="Service discovery information request"> <![CDATA[ <iq type='get' - from='device@clayster.com/device' - to='eventlog@clayster.com' + from='device@example.org/device' + to='eventlog@example.org' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'/> </iq>]]> @@ -286,8 +289,8 @@ File2, Line2, ... <example caption="Service discovery information response"> <![CDATA[ <iq type='result' - from='eventlog@clayster.com' - to='device@clayster.com/device' + from='eventlog@example.org' + to='device@example.org/device' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'> ... diff --git a/xep-0347.xml b/xep-0347.xml index c1bde211..047db9a5 100644 --- a/xep-0347.xml +++ b/xep-0347.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version='1.0' encoding='UTF-8'?> <!-- TODO: Sub-namespace for Registration Clients. urn:xmpp:iot:discovery:regunit - Registration Units (can claim ownership) --> @@ -33,13 +33,7 @@ <supersedes/> <supersededby/> <shortname>iot-discovery</shortname> - <author> - <firstname>Peter</firstname> - <surname>Waher</surname> - <email>peter.waher@clayster.com</email> - <jid>peter.waher@jabber.org</jid> - <uri>http://www.linkedin.com/in/peterwaher</uri> - </author> + &peterwaher; <author> <firstname>Ronny</firstname> <surname>Klauck</surname> @@ -47,6 +41,15 @@ <jid>TBD</jid> <uri>http://www-rnks.informatik.tu-cottbus.de/~rklauck</uri> </author> + <revision> + <version>0.4</version> + <date>2015-11-09</date> + <initials>pw</initials> + <remark> + <p>Updated contact information.</p> + <p>Updated example JIDs to example.org</p> + </remark> + </revision> <revision> <version>0.3</version> <date>2014-11-11</date> @@ -613,8 +616,8 @@ <example caption='Register Thing'> <![CDATA[ <iq type='set' - from='thing@clayster.com/imc' - to='discovery.clayster.com' + from='thing@example.org/imc' + to='discovery.example.org' id='1'> <register xmlns='urn:xmpp:iot:discovery'> <str name='SN' value='394872348732948723'/> @@ -626,8 +629,8 @@ </iq> <iq type='result' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='1'/>]]> </example> <p> @@ -652,10 +655,10 @@ <example caption='Registration response when alrady claimed'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='1'> - <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@clayster.com'/> + <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@example.org'/> </iq>]]> </example> <p> @@ -671,8 +674,8 @@ <example caption='Register self-owned Thing'> <![CDATA[ <iq type='set' - from='thing@clayster.com/imc' - to='discovery.clayster.com' + from='thing@example.org/imc' + to='discovery.example.org' id='2'> <register xmlns='urn:xmpp:iot:discovery' selfOwned='true'> <str name='SN' value='394872348732948723'/> @@ -684,8 +687,8 @@ </iq> <iq type='result' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='2'/>]]> </example> </section2> @@ -705,8 +708,8 @@ <example caption='Register Thing behind Concentrator'> <![CDATA[ <iq type='set' - from='rack@clayster.com/plcs' - to='discovery.clayster.com' + from='rack@example.org/plcs' + to='discovery.example.org' id='3'> <register xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'> <str name='SN' value='394872348732948723'/> @@ -718,8 +721,8 @@ </iq> <iq type='result' - from='discovery.clayster.com' - to='rack@clayster.com/plcs' + from='discovery.example.org' + to='rack@example.org/plcs' id='3'/>]]> </example> <p> @@ -765,8 +768,8 @@ <example caption='Claim Ownership of public Thing'> <![CDATA[ <iq type='set' - from='owner@clayster.com/phone' - to='discovery.clayster.com' + from='owner@example.org/phone' + to='discovery.example.org' id='4'> <mine xmlns='urn:xmpp:iot:discovery'> <str name='SN' value='394872348732948723'/> @@ -784,8 +787,8 @@ <example caption='Claim Ownership of private Thing'> <![CDATA[ <iq type='set' - from='owner@clayster.com/phone' - to='discovery.clayster.com' + from='owner@example.org/phone' + to='discovery.example.org' id='4'> <mine xmlns='urn:xmpp:iot:discovery' public='false'> <str name='SN' value='394872348732948723'/> @@ -808,10 +811,10 @@ <example caption='Ownership claim successful'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='owner@clayster.com/phone' + from='discovery.example.org' + to='owner@example.org/phone' id='4'> - <claimed xmlns='urn:xmpp:iot:discovery' jid='thing@clayster.com'/> + <claimed xmlns='urn:xmpp:iot:discovery' jid='thing@example.org'/> </iq>]]> </example> <p> @@ -822,10 +825,10 @@ <example caption='Ownership claim of a Thing behind a concentrator successful'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='owner@clayster.com/phone' + from='discovery.example.org' + to='owner@example.org/phone' id='4'> - <claimed xmlns='urn:xmpp:iot:discovery' jid='rack@clayster.com/plcs' nodeId='imc1' sourceId='MeteringTopology'/> + <claimed xmlns='urn:xmpp:iot:discovery' jid='rack@example.org/plcs' nodeId='imc1' sourceId='MeteringTopology'/> </iq>]]> </example> <p> @@ -835,8 +838,8 @@ <example caption='Ownership claim failure'> <![CDATA[ <iq type='error' - from='discovery.clayster.com' - to='owner@clayster.com/phone' + from='discovery.example.org' + to='owner@example.org/phone' id='4'> <error type='cancel'> <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> @@ -850,10 +853,10 @@ <example caption='Ownership claimed'> <![CDATA[ <iq type='set' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='5'> - <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@clayster.com'/> + <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@example.org'/> </iq>]]> </example> <p> @@ -862,10 +865,10 @@ <example caption='Ownership claim of private Thing successful'> <![CDATA[ <iq type='set' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='5'> - <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@clayster.com' public='false'/> + <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@example.org' public='false'/> </iq>]]> </example> <p> @@ -879,10 +882,10 @@ <example caption='Ownership of Thing behind concentrator claimed'> <![CDATA[ <iq type='set' - from='discovery.clayster.com' - to='rack@clayster.com/plcs' + from='discovery.example.org' + to='rack@example.org/plcs' id='5'> - <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@clayster.com' nodeId='imc1' sourceId='MeteringTopology'/> + <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@example.org' nodeId='imc1' sourceId='MeteringTopology'/> </iq>]]> </example> <p> @@ -891,8 +894,8 @@ <example caption='Ownership claimed acknowledged'> <![CDATA[ <iq type='result' - from='thing@clayster.com/imc' - to='discovery.clayster.com' + from='thing@example.org/imc' + to='discovery.example.org' id='5'/>]]> </example> <p> @@ -911,10 +914,10 @@ <example caption='Remove Thing'> <![CDATA[ <iq type='set' - from='owner@clayster.com/phone' - to='discovery.clayster.com' + from='owner@example.org/phone' + to='discovery.example.org' id='6'> - <remove xmlns='urn:xmpp:iot:discovery' jid='thing@clayster.com'/> + <remove xmlns='urn:xmpp:iot:discovery' jid='thing@example.org'/> </iq>]]> </example> <p> @@ -924,10 +927,10 @@ <example caption='Remove Thing behind concentrator'> <![CDATA[ <iq type='set' - from='owner@clayster.com/phone' - to='discovery.clayster.com' + from='owner@example.org/phone' + to='discovery.example.org' id='6'> - <remove xmlns='urn:xmpp:iot:discovery' jid='rack@clayster.com/plcs' nodeId='imc1' sourceId='MeteringTopology'/> + <remove xmlns='urn:xmpp:iot:discovery' jid='rack@example.org/plcs' nodeId='imc1' sourceId='MeteringTopology'/> </iq>]]> </example> <p> @@ -937,8 +940,8 @@ <example caption='Thing removed'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='owner@clayster.com/phone' + from='discovery.example.org' + to='owner@example.org/phone' id='6'/>]]> </example> <p> @@ -947,8 +950,8 @@ <example caption='Removal failure'> <![CDATA[ <iq type='error' - from='discovery.clayster.com' - to='owner@clayster.com/phone' + from='discovery.example.org' + to='owner@example.org/phone' id='6'> <error type='cancel'> <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> @@ -962,15 +965,15 @@ <example caption='Thing removed from registry by owner'> <![CDATA[ <iq type='set' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='7'> <removed xmlns='urn:xmpp:iot:discovery'/> </iq> <iq type='result' - from='thing@clayster.com/imc' - to='discovery.clayster.com' + from='thing@example.org/imc' + to='discovery.example.org' id='7'/>]]> </example> <p> @@ -979,8 +982,8 @@ <example caption='Thing behind concentrator removed from registry by owner'> <![CDATA[ <iq type='set' - from='discovery.clayster.com' - to='rack@clayster.com/plcs' + from='discovery.example.org' + to='rack@example.org/plcs' id='7'> <removed xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'/> </iq>]]> @@ -991,8 +994,8 @@ <example caption='Removal acknowledgement'> <![CDATA[ <iq type='result' - from='thing@clayster.com/imc' - to='discovery.clayster.com' + from='thing@example.org/imc' + to='discovery.example.org' id='7'/>]]> </example> </section2> @@ -1051,8 +1054,8 @@ <example caption='Update Meta Data request'> <![CDATA[ <iq type='set' - from='thing@clayster.com/imc' - to='discovery.clayster.com' + from='thing@example.org/imc' + to='discovery.example.org' id='8'> <update xmlns='urn:xmpp:iot:discovery'> <str name='KEY' value=''/> @@ -1069,8 +1072,8 @@ <example caption='Update Meta Data of Thing behind concentrator'> <![CDATA[ <iq type='set' - from='rack@clayster.com/plcs' - to='discovery.clayster.com' + from='rack@example.org/plcs' + to='discovery.example.org' id='8'> <update xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'> <str name='KEY' value=''/> @@ -1086,8 +1089,8 @@ <example caption='Update Meta Data request acknowledgement'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='8'/>]]> </example> <p> @@ -1098,8 +1101,8 @@ <example caption='Update Meta Data request failure'> <![CDATA[ <iq type='error' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='8'> <error type='cancel'> <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> @@ -1114,8 +1117,8 @@ <example caption='Update Meta Data response to request from disowned Thing'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='8'> <disowned xmlns='urn:xmpp:iot:discovery'/> </iq>]]> @@ -1132,10 +1135,10 @@ <example caption='Owner requests an update of Meta Data of Thing'> <![CDATA[ <iq type='set' - from='owner@clayster.com/1234' - to='discovery.clayster.com' + from='owner@example.org/1234' + to='discovery.example.org' id='8'> - <update xmlns='urn:xmpp:iot:discovery' jid='thing@clayster.com'> + <update xmlns='urn:xmpp:iot:discovery' jid='thing@example.org'> <str name='ROOM' value='...'/> <str name='APT' value='...'/> <str name='BLD' value='...'/> @@ -1155,10 +1158,10 @@ <example caption='Owner requests an update of Meta Data of Thing behind concentrator'> <![CDATA[ <iq type='set' - from='owner@clayster.com/1234' - to='discovery.clayster.com' + from='owner@example.org/1234' + to='discovery.example.org' id='8'> - <update xmlns='urn:xmpp:iot:discovery' jid='rack@clayster.com' nodeId='imc1' sourceId='MeteringTopology'> + <update xmlns='urn:xmpp:iot:discovery' jid='rack@example.org' nodeId='imc1' sourceId='MeteringTopology'> <str name='ROOM' value='...'/> <str name='APT' value='...'/> <str name='BLD' value='...'/> @@ -1177,8 +1180,8 @@ <example caption='Owner updating thing Meta Data request acknowledgement'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='owner@clayster.com/1234' + from='discovery.example.org' + to='owner@example.org/1234' id='8'/>]]> </example> <p> @@ -1188,8 +1191,8 @@ <example caption='Owner updating thing Meta Data request failure'> <![CDATA[ <iq type='error' - from='discovery.clayster.com' - to='owner@clayster.com/1234' + from='discovery.example.org' + to='owner@example.org/1234' id='8'> <error type='cancel'> <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> @@ -1328,8 +1331,8 @@ <example caption='Searching for Things'> <![CDATA[ <iq type='get' - from='curious@clayster.com/client' - to='discovery.clayster.com' + from='curious@example.org/client' + to='discovery.example.org' id='9'> <search xmlns='urn:xmpp:iot:discovery' offset='0' maxCount='20'> <strEq name='MAN' value='www.ktc.se'/> @@ -1357,11 +1360,11 @@ <example caption='Search result'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='curious@clayster.com/client' + from='discovery.example.org' + to='curious@example.org/client' id='9'> <found xmlns='urn:xmpp:iot:discovery' more='false'> - <thing owner='owner@clayster.com' jid='thing@clayster.com'> + <thing owner='owner@example.org' jid='thing@example.org'> <str name='SN' value='394872348732948723'/> <str name='MAN' value='www.ktc.se'/> <str name='MODEL' value='IMC'/> @@ -1381,11 +1384,11 @@ <example caption='Search result containing Thing behind a concentrator'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='curious@clayster.com/client' + from='discovery.example.org' + to='curious@example.org/client' id='9'> <found xmlns='urn:xmpp:iot:discovery' more='false'> - <thing owner='owner@clayster.com' jid='rack@clayster.com' nodeId='imc1' sourceId='MeteringTopology'> + <thing owner='owner@example.org' jid='rack@example.org' nodeId='imc1' sourceId='MeteringTopology'> <str name='SN' value='394872348732948723'/> <str name='MAN' value='www.ktc.se'/> <str name='MODEL' value='IMC'/> @@ -1414,8 +1417,8 @@ <example caption='Unregister Thing'> <![CDATA[ <iq type='set' - from='thing@clayster.com/imc' - to='discovery.clayster.com' + from='thing@example.org/imc' + to='discovery.example.org' id='10'> <unregister xmlns='urn:xmpp:iot:discovery'/> </iq>]]> @@ -1427,8 +1430,8 @@ <example caption='Unregistring Thing behind concentrator'> <![CDATA[ <iq type='set' - from='rack@clayster.com/plcs' - to='discovery.clayster.com' + from='rack@example.org/plcs' + to='discovery.example.org' id='10'> <unregister xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'/> </iq>]]> @@ -1439,8 +1442,8 @@ <example caption='Unregister Thing acknowledgement'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='10'/>]]> </example> </section2> @@ -1451,10 +1454,10 @@ <example caption='Disowning Thing'> <![CDATA[ <iq type='set' - from='owner@clayster.com/phone' - to='discovery.clayster.com' + from='owner@example.org/phone' + to='discovery.example.org' id='11'> - <disown xmlns='urn:xmpp:iot:discovery' jid='thing@clayster.com'/> + <disown xmlns='urn:xmpp:iot:discovery' jid='thing@example.org'/> </iq>]]> </example> <p> @@ -1464,10 +1467,10 @@ <example caption='Disowning Thing behind concentrator'> <![CDATA[ <iq type='set' - from='owner@clayster.com/phone' - to='discovery.clayster.com' + from='owner@example.org/phone' + to='discovery.example.org' id='11'> - <disown xmlns='urn:xmpp:iot:discovery' jid='rack@clayster.com/plcs' nodeId='imc1' sourceId='MeteringTopology'/> + <disown xmlns='urn:xmpp:iot:discovery' jid='rack@example.org/plcs' nodeId='imc1' sourceId='MeteringTopology'/> </iq>]]> </example> <p> @@ -1476,8 +1479,8 @@ <example caption='Failure to disown Thing - Not Found'> <![CDATA[ <iq type='error' - from='discovery.clayster.com' - to='owner@clayster.com/phone' + from='discovery.example.org' + to='owner@example.org/phone' id='11'> <error type='cancel'> <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> @@ -1491,8 +1494,8 @@ <example caption='Failure to disown Thing - Offline'> <![CDATA[ <iq type='error' - from='discovery.clayster.com' - to='owner@clayster.com/phone' + from='discovery.example.org' + to='owner@example.org/phone' id='11'> <error type='cancel'> <not-allowed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> @@ -1506,8 +1509,8 @@ <example caption='Thing disowned in registry by owner'> <![CDATA[ <iq type='set' - from='discovery.clayster.com' - to='thing@clayster.com/imc' + from='discovery.example.org' + to='thing@example.org/imc' id='12'> <disowned xmlns='urn:xmpp:iot:discovery'/> </iq>]]> @@ -1518,8 +1521,8 @@ <example caption='Thing behind concentrator disowned in registry by owner'> <![CDATA[ <iq type='set' - from='discovery.clayster.com' - to='rack@clayster.com/plcs' + from='discovery.example.org' + to='rack@example.org/plcs' id='12'> <disowned xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'/> </iq>]]> @@ -1530,8 +1533,8 @@ <example caption='Acknowledging disownment'> <![CDATA[ <iq type='result' - from='thing@clayster.com/imc' - to='discovery.clayster.com' + from='thing@example.org/imc' + to='discovery.example.org' id='12'/>]]> </example> <p> @@ -1542,8 +1545,8 @@ <example caption='Thing disowned'> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='owner@clayster.com/phone' + from='discovery.example.org' + to='owner@example.org/phone' id='11'/>]]> </example> <p> @@ -1559,8 +1562,8 @@ <example caption="Service discovery information request"> <![CDATA[ <iq type='get' - from='device@clayster.com/device' - to='provisioning@clayster.com' + from='device@example.org/device' + to='provisioning@example.org' id='13'> <query xmlns='http://jabber.org/protocol/disco#info'/> </iq>]]> @@ -1568,8 +1571,8 @@ <example caption="Service discovery information response"> <![CDATA[ <iq type='result' - from='provisioning@clayster.com' - to='device@clayster.com/device' + from='provisioning@example.org' + to='device@example.org/device' id='13'> <query xmlns='http://jabber.org/protocol/disco#info'> ... @@ -1583,13 +1586,13 @@ </p> <example caption="Checking if server supports components"> <![CDATA[ - <iq from='device@clayster.com/device' to='clayster.com' type='get' id='14'> + <iq from='device@example.org/device' to='example.org' type='get' id='14'> <query xmlns="http://jabber.org/protocol/disco#info"/> </iq>]]> </example> <example caption="Response confirming support for components"> <![CDATA[ - <iq type="result" id="14" from="clayster.com" to="device@clayster.com/device"> + <iq type="result" id="14" from="example.org" to="device@example.org/device"> <query xmlns="http://jabber.org/protocol/disco#info"> ... <feature var="http://jabber.org/protocol/disco#items"/> @@ -1602,16 +1605,16 @@ </p> <example caption="Requesting list of server components"> <![CDATA[ - <iq from='device@clayster.com/device' to='clayster.com' type='get' id='15'> + <iq from='device@example.org/device' to='example.org' type='get' id='15'> <query xmlns="http://jabber.org/protocol/disco#items"/> </iq>]]> </example> <example caption="Response containing list of server components"> <![CDATA[ - <iq type="result" id="15" from="clayster.com" to="995fab3dd759452ca9c370647323af0c@clayster.com/ebe2348e"> + <iq type="result" id="15" from="example.org" to="995fab3dd759452ca9c370647323af0c@example.org/ebe2348e"> <query xmlns="http://jabber.org/protocol/disco#items"> ... - <item jid="discovery.clayster.com" name="Registro de cosas"/> + <item jid="discovery.example.org" name="Registro de cosas"/> ... </query> </iq>]]> @@ -1622,8 +1625,8 @@ <example caption="Service discovery information request made to each component"> <![CDATA[ <iq type='get' - from='device@clayster.com/device' - to='discovery.clayster.com' + from='device@example.org/device' + to='discovery.example.org' id='16'> <query xmlns='http://jabber.org/protocol/disco#info'/> </iq>]]> @@ -1631,8 +1634,8 @@ <example caption="Service discovery information response from each component"> <![CDATA[ <iq type='result' - from='discovery.clayster.com' - to='device@clayster.com/device' + from='discovery.example.org' + to='device@example.org/device' id='16'> <query xmlns='http://jabber.org/protocol/disco#info'> ... diff --git a/xep-0348.xml b/xep-0348.xml index c6f52789..4d663884 100644 --- a/xep-0348.xml +++ b/xep-0348.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE xep SYSTEM 'xep.dtd' [ <!ENTITY % ents SYSTEM 'xep.ent'> %ents; @@ -24,13 +24,16 @@ <supersedes/> <supersededby/> <shortname>signing-forms</shortname> - <author> - <firstname>Peter</firstname> - <surname>Waher</surname> - <email>peter.waher@clayster.com</email> - <jid>peter.waher@jabber.org</jid> - <uri>http://www.linkedin.com/in/peterwaher</uri> - </author> + &peterwaher; + <revision> + <version>0.2</version> + <date>2015-11-09</date> + <initials>pw</initials> + <remark> + <p>Updated contact information.</p> + <p>Updated example JIDs to example.org</p> + </remark> + </revision> <revision> <version>0.1</version> <date>2014-05-28</date> @@ -445,8 +448,8 @@ <example caption="Service discovery information request"> <![CDATA[ <iq type='get' - from='clayster.com' - to='device@clayster.com' + from='example.org' + to='device@example.org' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'/> </iq>]]> @@ -454,8 +457,8 @@ <example caption="Service discovery information response"> <![CDATA[ <iq type='result' - from='device@clayster.com' - to='clayster.com' + from='device@example.org' + to='example.org' id='disco1'> <query xmlns='http://jabber.org/protocol/disco#info'> ... diff --git a/xep.ent b/xep.ent index faaab0f5..b19358ac 100644 --- a/xep.ent +++ b/xep.ent @@ -995,6 +995,15 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note> <uri>https://blog.samwhited.com/</uri> </author> " > +<!ENTITY peterwaher " + <author> + <firstname>Peter</firstname> + <surname>Waher</surname> + <email>peterwaher@hotmail.com</email> + <jid>peter.waher@jabber.org</jid> + <uri>http://www.linkedin.com/in/peterwaher</uri> + </author> +" > <!-- XMPP Extension Protocols -->