1.13rc13: commented out data versioning, pending further discussion

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

xep-0060.xml

@@ -51,7 +51,7 @@
   &ralphm;
 
   <revision>
-    <version>1.13rc12</version>
+    <version>1.13rc13</version>
     <date>in progress, 2009-12-07</date>
     <initials>psa</initials>
     <remark>
@@ -77,7 +77,6 @@
         <li>Removed the notion of batch publishing because it makes information coherence and atom handling excessively difficult.</li>
         <li>Added error handling for too-many-subscriptions to help prevent a certain denial of service attack.</li>
         <li>Added process for retrieving default subscription configuration options for leaf nodes, by omitting the 'node' attribute on the &lt;default/&gt; element (also added the &lt;default/&gt; element to the schema for the http://jabber.org/protocol/pubsub namespace, since it was missing).</li>
-        <li>Added optional data versioning via the 'ver' attribute on the &lt;item/&gt; element (item-level versioning) and &lt;items/&gt; element (node-level versioning), along with associated pubsub#versioning configuration field.</li>
       </ul>
     </remark>
   </revision>
@@ -3256,7 +3255,6 @@ And by opposing end them?
         <field var='pubsub#access_model'><value>open</value></field>
         <field var='pubsub#publish_model'><value>publishers</value></field>
         <field var='pubsub#purge_offline'><value>0</value></field>
-        <field var='pubsub#versioning'><value>0</value></field>
         <field var='pubsub#send_last_published_item'><value>never</value></field>
         <field var='pubsub#presence_based_delivery'><value>false</value></field>
         <field var='pubsub#notification_type'><value>headline</value></field>
@@ -3380,10 +3378,6 @@ And by opposing end them?
                label='Purge all items when the relevant publisher goes offline?'>
           <value>0</value>
         </field>
-        <field var='pubsub#versioning' type='boolean'
-               label='Provide versioning information about published items'>
-          <value>0</value>
-        </field>
         <field var='pubsub#max_payload_size' type='text-single'
                label='Max Payload size in bytes'>
           <value>1028</value>
@@ -3525,7 +3519,6 @@ And by opposing end them?
         </field>
         <field var='pubsub#publish_model'><value>publishers</value></field>
         <field var='pubsub#purge_offline'><value>0</value></field>
-        <field var='pubsub#versioning'><value>0</value></field>
         <field var='pubsub#send_last_published_item'><value>never</value></field>
         <field var='pubsub#presence_based_delivery'><value>false</value></field>
         <field var='pubsub#notification_type'><value>headline</value></field>
@@ -3612,7 +3605,6 @@ And by opposing end them?
         <field var='pubsub#access_model'><value>open</value></field>
         <field var='pubsub#publish_model'><value>publishers</value></field>
         <field var='pubsub#purge_offline'><value>0</value></field>
-        <field var='pubsub#versioning'><value>0</value></field>
         <field var='pubsub#max_payload_size'><value>9216</value></field>
         <field var='pubsub#send_last_published_item'><value>never</value></field>
         <field var='pubsub#presence_based_delivery'><value>0</value></field>
@@ -3728,10 +3720,6 @@ And by opposing end them?
                label='Purge all items when the relevant publisher goes offline?'>
           <value>0</value>
         </field>
-        <field var='pubsub#versioning' type='boolean'
-               label='Provide versioning information about published items'>
-          <value>0</value>
-        </field>
         <field var='pubsub#max_payload_size' type='text-single'
                label='Max payload size in bytes'>
           <value>9216</value>
@@ -4756,6 +4744,8 @@ And by opposing end them?
   </section2>
 </section1>
 
+<!-- REMOVED PENDING FURTHER DISCUSSION
+
 <section1 topic='Data Versioning' anchor='versioning'>
   <p>A service MAY track the "version" of data published at a node, in the form of the version across all published items ("node-level versioning"), the version of each particular item ("item-level versioning"), or both. The version is tracked using the 'ver' attribute, which is included on the &lt;items/&gt; element for node-level versioning and on the &lt;item/&gt; element for item-level versioning.</p>
   <p class='def'><strong>Definition:</strong> The <strong>'ver' attribute</strong> is a string that identifies a given version of the collective items published at a node, or of a particular item. The value of a node-level version identifier MUST be generated only by the service, MUST NOT be accepted by the service from a publisher. The value of an item-level version identifier MAY be accepted by a service from a publisher, but if not included SHOULD be generated by the service. Version identifiers MUST be treated by subscribers as opaque, but MAY have meaning to publishers. Any appropriate method can be used for generating version identifiers, such as a hash of the published data or a strictly-increasing sequence number.</p>
@@ -4855,6 +4845,8 @@ And by opposing end them?
   </section2>
 </section1>
 
+-->
+
 <section1 topic='Feature Summary' anchor='features'>
   <p>This section summarizes the features described herein, specifies the appropriate requirements level for each feature (REQUIRED, RECOMMENDED, or OPTIONAL), and provides cross-references to the section of this document in which each feature is described.</p>
   <p>Note: The feature names are all of the form "http://jabber.org/protocol/pubsub#name", where "name" is the text specified in the first column below.</p>
@@ -5123,12 +5115,6 @@ And by opposing end them?
       <td>OPTIONAL</td>
       <td><link url='#impl-subchange'>Notification of Subscription State Changes</link></td>
     </tr>
-    <tr>
-      <td>versioning</td>
-      <td>Data versioning is supported.</td>
-      <td>OPTIONAL</td>
-      <td><link url='#versioning'>Data Versioning</link></td>
-    </tr>
   </table>
 </section1>
 
@@ -6310,11 +6296,6 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
   <field var='pubsub#purge_offline' 
          type='boolean'
          label='Whether to purge all items when the relevant publisher goes offline'/>
-  <field var='pubsub#versioning' 
-         type='boolean'
-         label='Provide versioning information about published items'>
-    <value>0</value>
-  </field>
   <field var='pubsub#roster_groups_allowed'
          type='list-multi'
          label='The roster group(s) allowed to subscribe and retrieve items'/>
@@ -6896,7 +6877,6 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
         <xs:element ref='retract' minOccurs='0' maxOccurs='unbounded'/>
       </xs:choice>
       <xs:attribute name='node' type='xs:string' use='required'/>
-      <xs:attribute name='ver' type='xs:string' use='optional'/>
     </xs:complexType>
   </xs:element>
 
@@ -6908,7 +6888,6 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
       <xs:attribute name='id' type='xs:string' use='optional'/>
       <xs:attribute name='node' type='xs:string' use='optional'/>
       <xs:attribute name='publisher' type='xs:string' use='optional'/>
-      <xs:attribute name='ver' type='xs:string' use='optional'/>
     </xs:complexType>
   </xs:element>