Update label catalogs to include user input selector.

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@3330 4b5297f7-1745-476d-ba37-a9c6900126ab

xep-0258.xml

@@ -35,6 +35,12 @@
     <email>Kurt.Zeilenga@Isode.COM</email>
     <jid>Kurt.Zeilenga@Isode.COM</jid>
   </author>
+  <revision>
+    <version>0.4</version>
+    <date>2009-06-15</date>
+    <initials>kdz</initials>
+    <remark><p>Update label catalogs to include user input selector.</p></remark>
+  </revision>
   <revision>
     <version>0.3</version>
     <date>2009-03-20</date>
@@ -218,8 +224,23 @@
        servers should advertise and clients should perform appropriate
        discovery lookups on a per service basis.</p>
     <p>To indicate the support for label catalog discovery, a server
-       advertises the <tt>urn:xmpp:sec-label:catalog:0</tt> feature.
+       advertises the <tt>urn:xmpp:sec-label:catalog:1</tt> feature.
        The following pair of examples illustrates this feature discovery.</p>
+    <p>Each item in the catalog may contain a selector attribute.  The
+       value of this attribute represents the item's placement in a
+       hierarchical organization of the items.  The form is:
+<blockquote>
+<![CDATA[
+<label>"|"]*<label>
+]]>
+</blockquote>
+    <p>where &lt;label&gt; is a sequence of characters not including "|".</p>.
+    <p>A value of "X|Y|Z" indicates that this item is "Z" in the
+       the "Y" subset of the "X" subset of items.  This information may
+       be used, for instance, in generating label selection menus in
+       graphical user interfaces.</p>
+    <blockqoute>Note: use of unnecessarily deep hierarchies should be
+	avoided.</blockquote>
     <example caption="Label Catalog Feature Discovery request"><![CDATA[
 <iq type='get'
     from='user@example.com/Work'
@@ -234,7 +255,7 @@
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     ...
-    <feature var='urn:xmpp:sec-label:catalog:0'/>
+    <feature var='urn:xmpp:sec-label:catalog:1'/>
     ...
   </query>
 </iq>
@@ -244,7 +265,7 @@
 
     <example caption="Label Catalog request"><![CDATA[
 <iq type='get' id='cat1'>
-  <catalog xmlns='urn:xmpp:sec-label:catalog:0' to='example.com'/>
+  <catalog xmlns='urn:xmpp:sec-label:catalog:1' to='example.com'/>
 </iq>
   ]]></example>
 
@@ -253,6 +274,7 @@
   <catalog xmlns='urn:xmpp:sec-label:catalog:0'
       to='example.com' name='Default'
       desc='an example set of labels'>
+	<item selector="Classified|SECRET">
             <securitylabel xmlns='urn:xmpp:sec-label:0'>
                 <displaymarking fgcolor='black' bgcolor='red'>SECRET</displaymarking>
                 <label>
@@ -260,6 +282,8 @@
                         >MQYCAQQGASk=</esssecuritylabel>
                 </label>
             </securitylabel>
+	</item>
+	<item selector="Classified|CONFIDENTIAL">
             <securitylabel xmlns='urn:xmpp:sec-label:0'>
                 <displaymarking fgcolor='black' bgcolor='navy'>CONFIDENTIAL</displaymarking>
                 <label>
@@ -267,6 +291,8 @@
                         >MQYCAQMGASk</esssecuritylabel>
                 </label>
             </securitylabel>
+	</item>
+	<item selector="Classified|RESTRICTED">
             <securitylabel xmlns='urn:xmpp:sec-label:0'>
                 <displaymarking fgcolor='black' bgcolor='aqua'>RESTRICTED</displaymarking>
                 <label>
@@ -274,6 +300,8 @@
                         >MQYCAQIGASk=</esssecuritylabel>
                 </label>
             </securitylabel>
+	</item>
+	<item selector="Unclassified|UNCLASSIFIED">
             <securitylabel xmlns='urn:xmpp:sec-label:0'>
                 <displaymarking fgcolor='black' bgcolor='green'>UNCLASSIFIED</displaymarking>
                 <label>
@@ -281,6 +309,7 @@
                         >MQMGASk=</esssecuritylabel>
                 </label>
             </securitylabel>
+	</item>
   </catalog>
 </iq>
   ]]></example>
@@ -701,7 +730,7 @@ And by opposing end them?
       <code><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sl="urn:xmpp:sec-label:0"
-    xmlns="urn:xmpp:sec-label:catalog:0" targetNamespace="urn:xmpp:sec-label:catalog:0"
+    xmlns="urn:xmpp:sec-label:catalog:1" targetNamespace="urn:xmpp:sec-label:catalog:1"
     elementFormDefault="qualified">
 
     <xs:annotation>
@@ -741,6 +770,12 @@ And by opposing end them?
         </xs:annotation>
     </xs:attribute>
 
+    <xs:attribute name="selector" type="xs:string">
+        <xs:annotation>
+            <xs:documentation>User input selector</xs:documentation>
+        </xs:annotation>
+    </xs:attribute>
+
     <xs:element name="catalog">
         <xs:annotation>
             <xs:documentation>A Catalog of Labels</xs:documentation>
@@ -748,7 +783,14 @@ And by opposing end them?
 
         <xs:complexType>
             <xs:sequence>
-                <xs:element ref="sl:securitylabel" maxOccurs="unbounded"/>
+                <xs:element name="item" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element ref="sl:securitylabel"/>
+                        </xs:sequence>
+                        <xs:attribute ref="selector" use="optional"/>
+                    </xs:complexType>
+                </xs:element>
             </xs:sequence>
             <xs:attribute ref="to" use="optional"/>
             <xs:attribute ref="name" use="optional"/>