From 0cce11fd492bfecd22574f8b9648bcffc2fa3eb1 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Wed, 3 Sep 2008 21:12:56 +0000
Subject: [PATCH] 1.0 DRAFT

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2191 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0221.xml | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/xep-0221.xml b/xep-0221.xml
index 0814ef50..667bd15a 100644
--- a/xep-0221.xml
+++ b/xep-0221.xml
@@ -10,7 +10,7 @@
   <abstract>This specification defines an XMPP protocol extension for including media data in XEP-0004 data forms.</abstract>
   &LEGALNOTICE;
   <number>0221</number>
-  <status>Proposed</status>
+  <status>Draft</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <dependencies>
@@ -19,9 +19,18 @@
   </dependencies>
   <supersedes>None</supersedes>
   <supersededby>None</supersededby>
-  <shortname>NOT_YET_ASSIGNED</shortname>
+  <shortname>media-element</shortname>
+  <schemaloc>
+    <url>http://www.xmpp.org/schemas/media-element.xsd</url>
+  </schemaloc>
   &ianpaterson;
   &stpeter;
+  <revision>
+    <version>1.0</version>
+    <date>2008-09-03</date>
+    <initials>psa</initials>
+    <remark><p>Per a vote of the XMPP Council, advanced status to Draft; concurrently, the XMPP Registrar issued the urn:xmpp:media-element namespace.</p></remark>
+  </revision>
   <revision>
     <version>0.6</version>
     <date>2008-08-06</date>
@@ -65,12 +74,12 @@
 </section1>
 
 <section1 topic='Media Element' anchor='media'>
-  <p>The root element for media data is &lt;media/&gt;. This element MUST be qualified by the "urn:xmpp:tmp:media-element' namespace &NSNOTE;. The &lt;media/&gt; element MUST be contained within a &lt;field/&gt; element qualified by the 'jabber:x:data' namespace.</p>
+  <p>The root element for media data is &lt;media/&gt;. This element MUST be qualified by the "urn:xmpp:media-element' namespace. The &lt;media/&gt; element MUST be contained within a &lt;field/&gt; element qualified by the 'jabber:x:data' namespace.</p>
   <p>If the media is an image or video then the &lt;media/&gt; element SHOULD include 'height' and 'width' attributes specifying the recommended display size of the media in pixels.</p>
   <p>The &lt;media/&gt; element SHOULD contain at least one &lt;uri/&gt; element to specify the out-of-band location of the media data. <note>Constrained execution environments prevent some clients (e.g., Web clients) from rendering media unless it has been received out-of-band.</note> If included, the &lt;uri/&gt; element MUST contain a URI that indicates the location and MUST include a 'type' attribute that specifies the MIME type of the media. If the URI scheme is cid: then the identifier MUST refer to a bit of binary data as described in &xep0231;.</p>
   <p>The 'type' attribute of the &lt;uri/&gt; element is REQUIRED. The value of the 'type' attribute MUST match the syntax specified in &rfc2045;. That is, the value MUST include a top-level media type, the "/" character, and a subtype; in addition, it MAY include one or more optional parameters (e.g., the "audio/ogg" MIME type in the example shown below includes a "codecs" parameter as specified in &rfc4281;). The "type/subtype" string SHOULD be registered in the &ianamedia;, but MAY be an unregistered or yet-to-be-registered value.</p>
   <example caption='Audio Media Element'><![CDATA[
-<media xmlns='urn:xmpp:tmp:media-element'>
+<media xmlns='urn:xmpp:media-element'>
   <uri type='audio/x-wav'>
     http://victim.example.com/challenges/speech.wav?F3A6292C
   </uri>
@@ -88,7 +97,7 @@
 <x xmlns='jabber:x:data' type='form'>
   [ ... ]
   <field var='ocr'>
-    <media xmlns='xmlns='urn:xmpp:tmp:media-element'
+    <media xmlns='xmlns='urn:xmpp:media-element'
            height='80'
            width='290'>
       <uri type='image/jpeg'>
@@ -114,7 +123,7 @@
 
 <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
   <section2 topic='Protocol Namespaces' anchor='ns'>
-    <p>Until this specification advances to a status of Draft, its associated namespace shall be "urn:xmpp:tmp:media-element"; upon advancement of this specification, the &REGISTRAR; shall issue a permanent namespace in accordance with the process defined in Section 4 of &xep0053;.</p>
+    <p>The &REGISTRAR; includes "urn:xmpp:media-element" in its registry of protocol namespaces (see &NAMESPACES;).</p>
   </section2>
 </section1>
 
@@ -124,10 +133,17 @@
 
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
-    targetNamespace='urn:xmpp:tmp:media-element'
-    xmlns='urn:xmpp:tmp:media-element'
+    targetNamespace='urn:xmpp:media-element'
+    xmlns='urn:xmpp:media-element'
     elementFormDefault='qualified'>
 
+  <xs:annotation>
+    <xs:documentation>
+      The protocol documented by this schema is defined in
+      XEP-0221: http://www.xmpp.org/extensions/xep-0221.html
+    </xs:documentation>
+  </xs:annotation>
+
   <xs:element name='media'>
     <xs:complexType>
       <xs:sequence>
@@ -141,7 +157,7 @@
   <xs:element name='uri'>
     <xs:complexType>
       <xs:simpleContent>
-        <xs:extension base='xs:string'>
+        <xs:extension base='xs:anyURI'>
           <xs:attribute name='type' type='xs:string' use='required'/>
         </xs:extension>
       </xs:simpleContent>