0.2

xep-0309.xml

@@ -21,6 +21,12 @@
   <supersededby/>
   <shortname>NOT_YET_ASSIGNED</shortname>
   &stpeter;
+  <revision>
+    <version>0.2</version>
+    <date>2012-01-25</date>
+    <initials>psa</initials>
+    <remark><p>Added vCard extension for certification authority information; showed how to include software name in a vCard; recommended that the CA information and software name be added by the service directory, not included by the server itself.</p></remark>
+  </revision>
   <revision>
     <version>0.1</version>
     <date>2012-01-10</date>
@@ -277,8 +283,8 @@ Directory                      Server
     <geo><uri>geo:42.25,-91.05</uri></geo>
     <tz><text>America/Chicago</text></tz>
     <kind><text>application</text></kind>
-    <registration xmlns='urn:xmpp:vcard:registration'>
+    <registration xmlns='urn:xmpp:vcard:registration:1'>
-      <url>https://register.jabber.org/</url>
+      <uri>https://register.jabber.org/</uri>
     </registration>
   </vcard>
 </iq>
@@ -298,8 +304,11 @@ Directory                      Server
         <li>Region where the service is located (&lt;adr&gt;&lt;region/&gt;&lt;/adr&gt;)</li>
         <li>Logo for the service (&lt;logo/&gt;)</li>
         <li>Geographical coordinates for the service (&lt;geo/&gt;)</li>
-        <li>Registration URL (&lt;registration xmlns='urn:xmpp:vcard:registration'/&gt;)</li>
+        <li>Registration URI (&lt;registration xmlns='urn:xmpp:vcard:registration:1'/&gt; and its &lt;uri/&gt; child)</li>
+        <li>Certification authority name and URI (&lt;ca xmlns='urn:xmpp:vcard:ca:0'/&gt; and its &lt;name/&gt; and &lt;uri/&gt; children)</li>
+        <li>Software name (&lt;name/&gt; element qualified by the 'jabber:iq:version' namespace defined)</li>
       </ul>
+      <p>It is best for the server directory to discover the last two elements in-band (by means of TLS negotiation and &xep0092;), then add them to the contact vCard as described in the next section.</p>
     </section3>
   </section2>
 </section1>
@@ -333,9 +342,14 @@ Directory                      Server
           <geo><uri>geo:42.25,-91.05</uri></geo>
           <tz><text>America/Chicago</text></tz>
           <kind><text>application</text></kind>
-          <registration xmlns='urn:xmpp:vcard:registration'>
+          <registration xmlns='urn:xmpp:vcard:registration:1'>
-            <url>https://register.jabber.org/</url>
+            <uri>https://register.jabber.org/</uri>
           </registration>
+          <ca xmlns='urn:xmpp:vcard:ca:0'>
+            <name>StartSSL</uri>
+            <uri>http://www.startssl.com/</uri>
+          </ca>
+          <name xmlns='jabber:iq:version'>Isode M-Link</name>
         </vcard>
       </item>
     </items>
@@ -387,25 +401,49 @@ Directory                      Server
 </section1>
 
 <section1 topic='XML Schema' anchor='schema'>
+  <section2 topic='Registration URI' anchor='schema-reg'>
     <code><![CDATA[
 <?xml version='1.0' encoding='UTF-8'?>
 
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
-    targetNamespace='urn:xmpp:vcard:registration'
+    targetNamespace='urn:xmpp:vcard:registration:1'
-    xmlns='urn:xmpp:vcard:registration'
+    xmlns='urn:xmpp:vcard:registration:1'
     elementFormDefault='qualified'>
 
   <xs:element name='registration'>
     <xs:complexType>
       <xs:sequence>
-        <xs:element name='url' type='xs:anyURI'/>
+        <xs:element name='uri' type='xs:anyURI'/>
       </xs:choice>
     </xs:complexType>
   </xs:element>
 
 </xs:schema>
     ]]></code>
+  </section2>
+  <section2 topic='Certification Authority Information' anchor='schema-ca'>
+    <code><![CDATA[
+<?xml version='1.0' encoding='UTF-8'?>
+
+<xs:schema
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    targetNamespace='urn:xmpp:vcard:ca:0'
+    xmlns='urn:xmpp:vcard:ca:0'
+    elementFormDefault='qualified'>
+
+  <xs:element name='ca'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='name' type='xs:string'/>
+        <xs:element name='uri' type='xs:anyURI'/>
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
+    ]]></code>
+  </section2>
 </section1>
 
 </xep>