From b93fcce85116837b8d6fde0be829e7a3be8d1671 Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Thu, 27 Sep 2007 22:55:53 +0000 Subject: [PATCH] 1.1pre3 git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1260 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0048.xml | 99 +++++++++++++--------------------------------------- xep-0145.xml | 98 +++++++++++++-------------------------------------- 2 files changed, 50 insertions(+), 147 deletions(-) diff --git a/xep-0048.xml b/xep-0048.xml index 05afe6ec6..8866d1b49 100644 --- a/xep-0048.xml +++ b/xep-0048.xml @@ -15,7 +15,7 @@ Standards XMPP Core - XEP-0049 + XEP-0060 XEP-0223 @@ -33,10 +33,10 @@ &pgmillard; &stpeter; - 1.1pre2 - in progress, last updated 2007-09-24 + 1.1pre3 + in progress, last updated 2007-09-27 psa -

Specified use of PEP as a storage mechanism in addition to existing jabber:iq:private method.

 +

Specified use of publish-subscribe private information nodes as the preferred storage mechanism.

 1.0 @@ -72,7 +72,7 @@

A storage element marked by the storage:bookmarks namespace will contain a collection of child elements, each representing a 'bookmark' to be displayed in the client. At present, only two sub-elements are defined, 'conference' for conference rooms and 'url' for normal URLs.

All elements under storage MUST allow a 'name' tag, which is the friendly name by which they will be displayed in the client. If an element lacks a 'name' tag, the client SHOULD generate an appropriate substitution based on the other available data.

-

One of the most common uses of bookmarks will likely be to bookmark conference rooms on various Jabber servers. It is this aspect of the bookmark system which is used today by existing clients such as Exodus Exodus, see <http://exodus.jabberstudio.org/>. and Rival Messenger Rival Messenger, see <http://rival.chote.net/>.. In addition to the required 'jid' attribute, the conference element also possesses an 'autojoin' attribute, which determines whether or not the client should automatically join that conference room on login; this attribute is of type xs:boolean (see &w3xmlschema2;) and the default value is "false". &BOOLEANNOTE;

+

One of the most common uses of bookmarks will likely be to bookmark conference rooms on various Jabber servers. It is this aspect of the bookmark system which is used today by existing clients. In addition to the required 'jid' attribute, the conference element also possesses an 'autojoin' attribute, which determines whether or not the client should automatically join that conference room on login; this attribute is of type xs:boolean (see &w3xmlschema2;) and the default value is "false". &BOOLEANNOTE;

The conference element MAY also contain 'nick' and 'password' sub-elements; the XML character data from these elements should be used when joining the room from the bookmark. Password is, of course, important for joining potentially password-protected &xep0045; rooms.

@@ -99,12 +99,11 @@ - -

It is recommended to use either &xep0060; or &xep0049; in order to store the data format defined above; however, other methods could be used, such as HTTP.

- -

A client may use Publish-Subscribe (XEP-0060) for data storage, specifically through the use of personal data nodes hosted at the user's virtual publish-subscribe service as described in &xep0223;.

- - +

It is RECOMMENDED to use &xep0060; for data storage, specifically through the use of personal data nodes hosted at the user's virtual publish-subscribe service as described in &xep0223; and illustrated in the following sections.

+

Note: In the past, &xep0049; was the recommended method (see the archived version of this specification at <http://www.xmpp.org/extensions/attic/xep-0048-1.0.html>). In addition, other methods could be used, such as HTTP or WebDAV.

+ + @@ -134,14 +133,14 @@ - ]]> - + - ]]> - - -

The stored data is automatically pushed to all of the user's connected resources.

- + + +

The stored data is automatically pushed to all of the user's connected resources.

+ - ]]> - - -

In order to retrieve stored data without receiving notifications (e.g., upon initial login), the user's client sends a retrieve-items request as specified in XEP-0060.

- + + +

In order to retrieve stored data without receiving notifications (e.g., upon initial login), the user's client sends a retrieve-items request as specified in XEP-0060.

+ - ]]> - + @@ -211,60 +210,12 @@ - ]]> - - - -

A client may use Private Data Storage (XEP-0049) for data storage.

- - - - - - Puck - titania - - - - - ]]> - - ]]> -

Note: The private XML storage protocol does not provide notifications to all connected resources, only an acknowledgement to the uploading resource.

- - - - - - - - ]]> - - - - - Puck - titania - - - - - ]]> - + ]]>

Security considerations related to object persistent via publish-subscribe are described in XEP-0060 and XEP-0223.

-

Security considerations related to private XML storage are described in XEP-0049.

 diff --git a/xep-0145.xml b/xep-0145.xml index fa8037729..44f92f7f0 100644 --- a/xep-0145.xml +++ b/xep-0145.xml @@ -16,7 +16,8 @@ Council XMPP Core - XEP-0049 + XEP-0060 + XEP-0223 @@ -32,10 +33,10 @@ &stpeter; - 1.1pre2 - in progress, last updated 2007-09-24 + 1.1pre3 + in progress, last updated 2007-09-27 psa -

Specified use of PEP as a storage mechanism in addition to existing jabber:iq:private method.

 +

Specified use of publish-subscribe private information nodes as the preferred storage mechanism.

 1.0 @@ -78,11 +79,10 @@ -

It is recommended to use either &xep0060; or &xep0049; in order to store the data format defined above; however, other methods could be used, such as HTTP.

- -

A client may use Publish-Subscribe (XEP-0060) for data storage, specifically through the use of personal data nodes hosted at the user's virtual publish-subscribe service as described in &xep0223;.

- - It is RECOMMENDED to use &xep0060; for data storage, specifically through the use of personal data nodes hosted at the user's virtual publish-subscribe service as described in &xep0223; and illustrated in the following sections.

+

Note: In the past, &xep0049; was the recommended method (see the archived version of this specification at <http://www.xmpp.org/extensions/attic/xep-0048-1.0.html>). In addition, other methods could be used, such as HTTP or WebDAV.

+ + @@ -112,14 +112,14 @@ - ]]> - - ]]> - - -

The stored data is automatically pushed to all of the user's connected resources.

- + + ]]> + + +

The stored data is automatically pushed to all of the user's connected resources.

+ - ]]> - - -

In order to retrieve stored data without receiving notifications (e.g., upon initial login), the user's client sends a retrieve-items request as specified in XEP-0060.

- + + +

In order to retrieve stored data without receiving notifications (e.g., upon initial login), the user's client sends a retrieve-items request as specified in XEP-0060.

+ - ]]> - + @@ -189,60 +189,12 @@ - ]]> - - - -

A client may use Private Data Storage (XEP-0049) for data storage.

- - - - - Seems to be a good writer - Oh my sweetest love ... - - - - ]]> - - ]]> -

Note: The private XML storage protocol does not provide notifications to all connected resources, only an acknowledgement to the uploading resource.

- - - - - - - - ]]> - - - - Seems to be a good writer - Oh my sweetest love ... - - - - ]]> - + ]]>

Security considerations related to object persistent via publish-subscribe are described in XEP-0060 and XEP-0223.

-

Security considerations related to private XML storage are described in XEP-0049.