[Commits] (donn) Minor reorganization of the ContentModel:

commits at osafoundation.org commits at osafoundation.org
Tue Aug 3 02:34:29 PDT 2004


Commit by: donn
Modified files:
chandler/parcels/osaf/contentmodel/parcel.xml 1.49 1.50
chandler/parcels/osaf/contentmodel/calendar/parcel.xml 1.35 1.36
chandler/parcels/osaf/contentmodel/contacts/parcel.xml 1.24 1.25
chandler/parcels/osaf/contentmodel/mail/parcel.xml 1.36 1.37
chandler/parcels/osaf/contentmodel/tasks/parcel.xml 1.25 1.26

Log message:
Minor reorganization of the ContentModel:
   * Moved redirectTo attributes back to their Mixin Kinds
   * Reordered ContentItems with multiple superKinds to the correct order

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/parcel.xml.diff?r1=text&tr1=1.49&r2=text&tr2=1.50
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/calendar/parcel.xml.diff?r1=text&tr1=1.35&r2=text&tr2=1.36
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/contacts/parcel.xml.diff?r1=text&tr1=1.24&r2=text&tr2=1.25
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/mail/parcel.xml.diff?r1=text&tr1=1.36&r2=text&tr2=1.37
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/tasks/parcel.xml.diff?r1=text&tr1=1.25&r2=text&tr2=1.26

Index: chandler/parcels/osaf/contentmodel/mail/parcel.xml
diff -u chandler/parcels/osaf/contentmodel/mail/parcel.xml:1.36 chandler/parcels/osaf/contentmodel/mail/parcel.xml:1.37
--- chandler/parcels/osaf/contentmodel/mail/parcel.xml:1.36	Thu Jul 29 09:03:49 2004
+++ chandler/parcels/osaf/contentmodel/mail/parcel.xml	Tue Aug  3 02:34:26 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.36 $ -->
-<!-- $Date: 2004/07/29 16:03:49 $ -->
+<!-- $Revision: 1.37 $ -->
+<!-- $Date: 2004/08/03 09:34:26 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -351,22 +351,6 @@
     <type itemref="Integer"/>
   </Attribute>
 
-  <Attribute itsName="who">
-    <redirectTo>toAddress</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="whoFrom">
-    <redirectTo>replyAddress</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="about">
-    <redirectTo>subject</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="date">
-    <redirectTo>dateReceived</redirectTo>
-  </Attribute>  
-
   <Kind itsName="MailMessageMixin">
     <displayName>Mail Message Mixin Kind</displayName>
     <description>This is the set of Message-specific attributes.</description>
@@ -396,6 +380,23 @@
     <attributes itemref="mail:deliveryStatus"/>
     <attributes itemref="mail:spamScore"/>
 
+    <!-- redirections -->
+    <Attribute itsName="who">
+      <redirectTo>toAddress</redirectTo>
+    </Attribute>
+    
+    <Attribute itsName="whoFrom">
+      <redirectTo>replyAddress</redirectTo>
+    </Attribute>
+    
+    <Attribute itsName="about">
+      <redirectTo>subject</redirectTo>
+    </Attribute>
+    
+    <Attribute itsName="date">
+      <redirectTo>dateReceived</redirectTo>
+    </Attribute>  
+    
     <classes key="python">osaf.contentmodel.mail.Mail.MailMessageMixin</classes>
       
     <Cloud itsName="Cloud">
@@ -458,14 +459,9 @@
     <description>A Mail Message represents any sort of email message, sent or received.</description>
     <issues>We need another attribute. A boolean attribute to indicate whether this message was an incoming message or outgoing message. (I suspect that we won't want to derive whether something was in or out.  If we base it on headers, the headers could potentially be forged. -Ducky)</issues>
     <issues>We probably don't want to have both 'hasBeenRead' and 'status'.</issues>
-    <superKinds itemref="content:Note"/>
     <superKinds itemref="mail:MailMessageMixin"/>
+    <superKinds itemref="content:Note"/>
     <displayAttribute itemref="mail:subject"/>
-    <!-- redirections -->
-    <attributes itemref="mail:who"/>
-    <attributes itemref="mail:whoFrom"/>
-    <attributes itemref="mail:about"/>
-    <attributes itemref="mail:date"/>
     <classes key="python">osaf.contentmodel.mail.Mail.MailMessage</classes>
   </Kind>
 

Index: chandler/parcels/osaf/contentmodel/parcel.xml
diff -u chandler/parcels/osaf/contentmodel/parcel.xml:1.49 chandler/parcels/osaf/contentmodel/parcel.xml:1.50
--- chandler/parcels/osaf/contentmodel/parcel.xml:1.49	Thu Jul 29 16:37:12 2004
+++ chandler/parcels/osaf/contentmodel/parcel.xml	Tue Aug  3 02:34:25 2004
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!-- Parcel manifest for Pim Schema -->
-<!-- $Revision: 1.49 $ -->
-<!-- $Date: 2004/07/29 23:37:12 $ -->
+<!-- $Revision: 1.50 $ -->
+<!-- $Date: 2004/08/03 09:34:25 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -64,18 +64,6 @@
     <core:type itemref="ContextEnum"/>
   </core:Attribute>
 
-  <core:Attribute itsName="who">
-    <redirectTo>creator</redirectTo>
-  </core:Attribute>
-
-  <core:Attribute itsName="about">
-    <redirectTo>displayName</redirectTo>
-  </core:Attribute>
-
-  <core:Attribute itsName="date">
-    <redirectTo>createdOn</redirectTo>
-  </core:Attribute>
-
   <core:Kind itsName="ContentItem">
     <core:superKinds itemref="core:Item"/>
     <core:displayName>Default Content Item Display Name</core:displayName>
@@ -128,9 +116,17 @@
     <core:classes key="python">osaf.contentmodel.Notes.Note</core:classes>
     
     <!-- redirections -->
-    <core:attributes itemref="who"/>
-    <core:attributes itemref="date"/>
-    <core:attributes itemref="about"/>
+    <core:Attribute itsName="who">
+      <redirectTo>creator</redirectTo>
+    </core:Attribute>
+  
+    <core:Attribute itsName="about">
+      <redirectTo>displayName</redirectTo>
+    </core:Attribute>
+  
+    <core:Attribute itsName="date">
+      <redirectTo>createdOn</redirectTo>
+    </core:Attribute>
   </core:Kind>
   
   <!-- Conversation -->
@@ -234,50 +230,30 @@
   <core:Kind itsName="MailedTask">
     <core:displayName>Mailed Task</core:displayName>
     <core:description>A Task stamped as a Mail, or vica versa</core:description>
-    <core:superKinds itemref="mail:MailMessage"/>
-    <core:superKinds itemref="tasks:TaskMixin"/>
-    <!-- redirections -->
-    <attributes itemref="tasks:who"/>
-    <attributes itemref="tasks:whoFrom"/>
-    <attributes itemref="tasks:about"/>
-    <attributes itemref="tasks:date"/>
+    <core:superKinds itemref="tasks:Task"/>
+    <core:superKinds itemref="mail:MailMessageMixin"/>
   </core:Kind>
 
   <core:Kind itsName="MailedEvent">
     <core:displayName>Mailed Event</core:displayName>
     <core:description>An Event stamped as a Mail, or vica versa</core:description>
-    <core:superKinds itemref="mail:MailMessage"/>
-    <core:superKinds itemref="calendar:CalendarEventMixin"/>
-    <!-- redirections -->
-    <attributes itemref="calendar:who"/>
-    <attributes itemref="calendar:whoFrom"/>
-    <attributes itemref="calendar:about"/>
-    <attributes itemref="calendar:date"/>
+    <core:superKinds itemref="calendar:CalendarEvent"/>
+    <core:superKinds itemref="mail:MailMessageMixin"/>
   </core:Kind>
 
   <core:Kind itsName="EventTask">
     <core:displayName>Event Task</core:displayName>
     <core:description>A Task stamped as an Event, or vica versa</core:description>
-    <core:superKinds itemref="calendar:CalendarEvent"/>
-    <core:superKinds itemref="tasks:TaskMixin"/>
+    <core:superKinds itemref="tasks:Task"/>
+    <core:superKinds itemref="calendar:CalendarEventMixin"/>
     <core:superKinds itemref="TaskEventExtraMixin"/>
-    <!-- redirections -->
-    <attributes itemref="tasks:who"/>
-    <attributes itemref="tasks:whoFrom"/>
-    <attributes itemref="tasks:about"/>
-    <attributes itemref="tasks:date"/>
   </core:Kind>
 
   <core:Kind itsName="MailedEventTask">
     <core:displayName>Mailed Event Task</core:displayName>
     <core:description>A Task stamped as an Event stamped as Mail, in any sequence</core:description>
-    <core:superKinds itemref="mail:MailMessageMixin"/>
     <core:superKinds itemref="EventTask"/>
-    <!-- redirections -->
-    <attributes itemref="tasks:who"/>
-    <attributes itemref="tasks:whoFrom"/>
-    <attributes itemref="tasks:about"/>
-    <attributes itemref="tasks:date"/>
+    <core:superKinds itemref="mail:MailMessageMixin"/>
   </core:Kind>
 
 <!-- Project -->

Index: chandler/parcels/osaf/contentmodel/contacts/parcel.xml
diff -u chandler/parcels/osaf/contentmodel/contacts/parcel.xml:1.24 chandler/parcels/osaf/contentmodel/contacts/parcel.xml:1.25
--- chandler/parcels/osaf/contentmodel/contacts/parcel.xml:1.24	Sat Jul 10 13:51:46 2004
+++ chandler/parcels/osaf/contentmodel/contacts/parcel.xml	Tue Aug  3 02:34:25 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.24 $ -->
-<!-- $Date: 2004/07/10 20:51:46 $ -->
+<!-- $Revision: 1.25 $ -->
+<!-- $Date: 2004/08/03 09:34:25 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -131,18 +131,6 @@
     <inverseAttribute itemref="contact:onceBelongedTo"/>
   </Attribute>
 
-  <Attribute itsName="who">
-    <redirectTo>contactName</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="about">
-    <redirectTo>displayName</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="date">
-    <redirectTo>createdOn</redirectTo>
-  </Attribute>
-
   <Kind itsName="Contact">
     <displayName>Contact</displayName>
     <description>An entry in an address book. Typically represents either a person or a company.</description>
@@ -162,9 +150,17 @@
     <attributes itemref="tasks:requestedTasks"/>
     <attributes itemref="tasks:taskRequests"/>
     <!-- redirections -->
-    <attributes itemref="contact:who"/>
-    <attributes itemref="contact:about"/>
-    <attributes itemref="contact:date"/>
+    <Attribute itsName="who">
+      <redirectTo>contactName</redirectTo>
+    </Attribute>
+  
+    <Attribute itsName="about">
+      <redirectTo>displayName</redirectTo>
+    </Attribute>
+  
+    <Attribute itsName="date">
+      <redirectTo>createdOn</redirectTo>
+    </Attribute>
     <classes key="python">osaf.contentmodel.contacts.Contacts.Contact</classes>
   </Kind>
 

Index: chandler/parcels/osaf/contentmodel/calendar/parcel.xml
diff -u chandler/parcels/osaf/contentmodel/calendar/parcel.xml:1.35 chandler/parcels/osaf/contentmodel/calendar/parcel.xml:1.36
--- chandler/parcels/osaf/contentmodel/calendar/parcel.xml:1.35	Thu Jul 29 09:03:50 2004
+++ chandler/parcels/osaf/contentmodel/calendar/parcel.xml	Tue Aug  3 02:34:25 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.35 $ -->
-<!-- $Date: 2004/07/29 16:03:50 $ -->
+<!-- $Revision: 1.36 $ -->
+<!-- $Date: 2004/08/03 09:34:25 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -102,22 +102,6 @@
     <type itemref="cal:TimeTransparencyEnum"/>
   </Attribute>
   
-  <Attribute itsName="who">
-    <redirectTo>participants</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="whoFrom">
-    <redirectTo>organizer</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="about">
-    <redirectTo>displayName</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="date">
-    <redirectTo>startTime</redirectTo>
-  </Attribute>  
-
   <Kind itsName="CalendarEventMixin">
     <displayName>Calendar Event Mixin Kind</displayName>
     <description>This is the set of CalendarEvent-specific attributes.</description>
@@ -134,6 +118,23 @@
     <attributes itemref="cal:attendees"/>
     <attributes itemref="cal:transparency"/>
 
+    <!-- redirections -->
+    <Attribute itsName="who">
+      <redirectTo>participants</redirectTo>
+    </Attribute>
+    
+    <Attribute itsName="whoFrom">
+      <redirectTo>organizer</redirectTo>
+    </Attribute>
+    
+    <Attribute itsName="about">
+      <redirectTo>displayName</redirectTo>
+    </Attribute>
+    
+    <Attribute itsName="date">
+      <redirectTo>startTime</redirectTo>
+    </Attribute>  
+
     <!-- local attributes -->
     <Attribute itsName="calendar">
       <displayName>Calendar</displayName>
@@ -198,14 +199,8 @@
     <issues>Calendar Event should maybe have a 'Timezone' attribute.</issues>
     <issues>Do we want to have 'Duration' as a derived attribute on Calendar Event? </issues>
     <issues>Do we want to have a Boolean 'AllDay' attribute, to indicate that an event is an all day event? Or should we instead have the 'startTime' and 'endTime' attributes be 'RelativeDateTime' instead of 'DateTime', so that they can store all day values like '14 June 2004' as well as specific time values like '4:05pm 14 June 2004'?</issues>
-    <superKinds itemref="content:Note"/>
     <superKinds itemref="cal:CalendarEventMixin"/>
-    <!-- redirections -->
-    <attributes itemref="cal:who"/>
-    <attributes itemref="cal:whoFrom"/>
-    <attributes itemref="cal:about"/>
-    <attributes itemref="cal:date"/>
-
+    <superKinds itemref="content:Note"/>
     <classes key="python">osaf.contentmodel.calendar.Calendar.CalendarEvent</classes>
 
   </Kind>

Index: chandler/parcels/osaf/contentmodel/tasks/parcel.xml
diff -u chandler/parcels/osaf/contentmodel/tasks/parcel.xml:1.25 chandler/parcels/osaf/contentmodel/tasks/parcel.xml:1.26
--- chandler/parcels/osaf/contentmodel/tasks/parcel.xml:1.25	Thu Jul 29 09:03:49 2004
+++ chandler/parcels/osaf/contentmodel/tasks/parcel.xml	Tue Aug  3 02:34:27 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.25 $ -->
-<!-- $Date: 2004/07/29 16:03:49 $ -->
+<!-- $Revision: 1.26 $ -->
+<!-- $Date: 2004/08/03 09:34:27 $ -->
 <!-- Copyright (c) 2004 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -88,22 +88,6 @@
     <type itemref="DateTime"/>
   </Attribute>
 
-  <Attribute itsName="who">
-    <redirectTo>requestor</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="whoFrom">
-    <redirectTo>requestee</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="about">
-    <redirectTo>displayName</redirectTo>
-  </Attribute>
-
-  <Attribute itsName="date">
-    <redirectTo>dueDate</redirectTo>
-  </Attribute>  
-
   <Kind itsName="TaskMixin">
     <displayName>Task Mixin Kind</displayName>
     <description>This is the set of Task-specific attributes.</description>
@@ -120,6 +104,23 @@
     <attributes itemref="tasks:taskStatus"/>
     <attributes itemref="tasks:dueDate"/>
     
+    <!-- redirections -->
+    <Attribute itsName="who">
+      <redirectTo>requestee</redirectTo>
+    </Attribute>
+  
+    <Attribute itsName="whoFrom">
+      <redirectTo>requestor</redirectTo>
+    </Attribute>
+  
+    <Attribute itsName="about">
+      <redirectTo>displayName</redirectTo>
+    </Attribute>
+  
+    <Attribute itsName="date">
+      <redirectTo>dueDate</redirectTo>
+    </Attribute>  
+
     <classes key="python">osaf.contentmodel.tasks.Task.TaskMixin</classes>
       
     <Cloud itsName="Cloud">
@@ -156,14 +157,8 @@
     <displayName>Task</displayName>
     <issues>Do we want to support the idea of tasks having sub-tasks? If so, then we need to add attributes for 'superTask' and 'subTasks'.</issues>
     <issues>Task should maybe have a 'Timezone' attribute.</issues>
-    <superKinds itemref="content:Note"/>
     <superKinds itemref="tasks:TaskMixin"/>
-    <!-- redirections -->
-    <attributes itemref="tasks:who"/>
-    <attributes itemref="tasks:whoFrom"/>
-    <attributes itemref="tasks:about"/>
-    <attributes itemref="tasks:date"/>
-    
+    <superKinds itemref="content:Note"/>
     <classes key="python">osaf.contentmodel.tasks.Task.Task</classes>
     
   </Kind>



More information about the Commits mailing list