From bad27b3ade8910e3188d701636d0328620fd4192 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 3 Mar 2020 16:56:21 +0100 Subject: [PATCH 1/9] XEP-0284: Fix registrar section. --- xep-0284.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xep-0284.xml b/xep-0284.xml index 416c84730..ef7b59c58 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -1038,7 +1038,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" -

The &REGISTRAR; shall add the type of "sxe" to the "collaboration" category in its registry of service discovery identities.

+

The ®ISTRAR; shall add the type of "sxe" to the "collaboration" category in its registry of service discovery identities.

The XMPP Registrar shall include "sxe" in its registry of Jingle transport methods. The registry submission is as follows:

@@ -1047,7 +1047,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" sxe A method for exchanging Shared XML Editing data over XMPP. reliable - XEP-xxxx + XEP-0284 ]]> From 5b1a7dccd6d7d34462e6f7ec148cb840e8bf661f Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 3 Mar 2020 17:22:17 +0100 Subject: [PATCH 2/9] XEP-0284: Use dl/di/dt/dd elements in the glossary. --- xep-0284.xml | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/xep-0284.xml b/xep-0284.xml index ef7b59c58..806f1e9ed 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -175,11 +175,32 @@ -

GUID: a Globally Unique Indentifier, used as the identifier for a shared editing session.

-

Host: The JID to which the SXE messages are sent for relaying to other members of the session; this can be the initiator of the session (e.g., in a one-to-one session or small multi-user session) or a multi-user chat room or specialized shared editing component.

-

RID: the Record ID given to a record when it is created.

-

State: In the context of a new user joining, the state refers to the set of records that describes the edited object, including all previous versions of each record. All entities involved in the session are REQUIRED to keep this state unless a specialized component handles user joins.

-

Weight: Primarily, the weight of a node is represented by the 'primary-weight' field of the corresponding record. Secondarily, if the values of the 'primary-weight' of two records are equal, the first differing characters of the rids are compared by their Unicode values. The higher the character the higher the weight of the node is.

+
+ +
GUID
+
A Globally Unique Indentifier, used as the identifier for a shared editing session.
+ + + +
Host
+
The JID to which the SXE messages are sent for relaying to other members of the session; this can be the initiator of the session (e.g., in a one-to-one session or small multi-user session) or a multi-user chat room or specialized shared editing component.
+ + + +
RID
+
the Record ID given to a record when it is created.
+ + + +
State
+
In the context of a new user joining, the state refers to the set of records that describes the edited object, including all previous versions of each record. All entities involved in the session are REQUIRED to keep this state unless a specialized component handles user joins.
+ + + +
Weight
+
Primarily, the weight of a node is represented by the 'primary-weight' field of the corresponding record. Secondarily, if the values of the 'primary-weight' of two records are equal, the first differing characters of the rids are compared by their Unicode values. The higher the character the higher the weight of the node is.
+ +
From 9ded97a739c19e75d725640e4a5d5a5307a796d6 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Mon, 9 Mar 2020 16:33:50 +0100 Subject: [PATCH 3/9] XEP-0284: Add missing wrapper in examples. These had been forgotten in ae8b1eb6534d46bd5ea3ea8579b83e5069b4eab2. --- xep-0284.xml | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/xep-0284.xml b/xep-0284.xml index 806f1e9ed..c4550848a 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -891,15 +891,17 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - - + + + + ]]> @@ -928,8 +930,10 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - - + + + + ]]> @@ -1002,14 +1006,16 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" session='851ba2' id='14'> - + + - + + From ec9dd2fb2a142a1e19c6520be699114e095ac559 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 3 Mar 2020 17:32:14 +0100 Subject: [PATCH 4/9] XEP-0284: Add an XML Schema. This has only been tested against the XEP examples, but it should be complete. --- xep-0284.xml | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/xep-0284.xml b/xep-0284.xml index c4550848a..3122b1592 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -1081,7 +1081,136 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" -

To follow.

+ + + + + + + The protocol documented by this schema is defined in + XEP-0284: http://xmpp.org/extensions/xep-0284.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> From 9f8ac0a6a980275d11ed81c5d57b4cf67aaf2616 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Mon, 16 Mar 2020 12:32:34 +0100 Subject: [PATCH 5/9] XEP-0284: Fix typo in example 7. --- xep-0284.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0284.xml b/xep-0284.xml index 3122b1592..942f58141 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -300,7 +300,7 @@ + id='disco1' type='get'> From 3277a51664520a8fc9440b8ab477cc3ddf802e9f Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Thu, 19 Mar 2020 17:46:10 +0100 Subject: [PATCH 6/9] XEP-0284: Linkify all XEP references. --- xep-0284.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xep-0284.xml b/xep-0284.xml index 942f58141..767f19f87 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -279,7 +279,7 @@ ]]> -

The responder indiciates the reason for refusing the session by including a "reason" element. The following reasons are suggested (see also XEP-0166):

+

The responder indiciates the reason for refusing the session by including a "reason" element. The following reasons are suggested (see also &xep0166;):

  • alternative-session -- the responder already has an active session with the initiator and wishes to use that session instead.
  • decline -- the responder formally declines the session.
    • @@ -326,8 +326,8 @@ ]]> -

    Such presence can be broadcast or can be sent in the context of a multi-user chat room (see XEP-0045).

    -

    However, presence is not sent when operating in a serverless messaging environment (see XEP-0174). Instead, DNS TXT records are published. Two new key-value pairs are used to advertise a session id ("sxe_id") and session name ("sxe_name") when using serverless messaging.

    +

    Such presence can be broadcast or can be sent in the context of a multi-user chat room (see &xep0045;).

    +

    However, presence is not sent when operating in a serverless messaging environment (see &xep0174;). Instead, DNS TXT records are published. Two new key-value pairs are used to advertise a session id ("sxe_id") and session name ("sxe_name") when using serverless messaging.

    From fad05490618b18d2bf25880d37059afc9017e5ec Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 3 Mar 2020 17:32:38 +0100 Subject: [PATCH 7/9] XEP-0284: Release version 0.1.3. --- xep-0284.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xep-0284.xml b/xep-0284.xml index 767f19f87..2abffdfde 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -33,6 +33,17 @@ Pusateri pusateri@bangj.com + + 0.1.3 + 2020-03-10 + egp +
      +
    • Fix the registrar section.
      • +
    • Format the glossary better.
      • +
    • Add missing <state/> wrappers in examples.
      • +
    • Write an XML Schema.
      • +
    +     0.1.2 2019-11-23 From abdbd87a1033216fc6472d8174559bec3996487f Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 10 Mar 2020 18:20:32 +0100 Subject: [PATCH 8/9] XEP-0284: Un-defer this XEP. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’d say the addition of an XML Schema is important enough to warrant putting it back on the Standards Track. --- xep-0284.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0284.xml b/xep-0284.xml index 2abffdfde..a4a45f0af 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -10,7 +10,7 @@ This specification defines a protocol that enables two or more endpoints to collaboratively edit an XML object. The protocol is intended for use mainly over the Extensible Messaging and Presence Protocol (XMPP), either by existing instant messaging clients or by specialized editing clients. However, the protocol could also be used over a direct TCP connection rather than over XMPP. &LEGALNOTICE; 0284 - Deferred + Experimental Standards Track Standards Council From a12b74d2b647d4a961fd7fc1da6b2f9cb83e290c Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 10 Mar 2020 18:17:02 +0100 Subject: [PATCH 9/9] XEP-0284: Add myself as an author. --- xep-0284.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/xep-0284.xml b/xep-0284.xml index a4a45f0af..0faf16cd0 100644 --- a/xep-0284.xml +++ b/xep-0284.xml @@ -33,6 +33,7 @@ Pusateri pusateri@bangj.com + &linkmauve; 0.1.3 2020-03-10