[Commits] (capps) Started updating parcel files with pim schema updates from design team

commits at osafoundation.org commits at osafoundation.org
Sun Nov 30 23:52:03 PST 2003


Commit by: capps
Modified files:
osaf/chandler/Chandler/parcels/OSAF/PimSchema/parcel.xml 1.13 1.14
osaf/chandler/Chandler/parcels/OSAF/PimSchema/CalendarSchema/parcel.xml 1.9 1.10
osaf/chandler/Chandler/parcels/OSAF/PimSchema/ContactSchema/parcel.xml 1.5 1.6
osaf/chandler/Chandler/parcels/OSAF/PimSchema/EmailSchema/parcel.xml 1.7 1.8
osaf/chandler/Chandler/parcels/OSAF/PimSchema/TaskSchema/parcel.xml 1.9 1.10

Log message:
Started updating parcel files with pim schema updates from design team

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/PimSchema/parcel.xml.diff?r1=text&tr1=1.13&r2=text&tr2=1.14
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/PimSchema/CalendarSchema/parcel.xml.diff?r1=text&tr1=1.9&r2=text&tr2=1.10
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/PimSchema/ContactSchema/parcel.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/PimSchema/EmailSchema/parcel.xml.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/PimSchema/TaskSchema/parcel.xml.diff?r1=text&tr1=1.9&r2=text&tr2=1.10

Index: osaf/chandler/Chandler/parcels/OSAF/PimSchema/TaskSchema/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/PimSchema/TaskSchema/parcel.xml:1.9 osaf/chandler/Chandler/parcels/OSAF/PimSchema/TaskSchema/parcel.xml:1.10
--- osaf/chandler/Chandler/parcels/OSAF/PimSchema/TaskSchema/parcel.xml:1.9	Wed Nov 26 00:39:44 2003
+++ osaf/chandler/Chandler/parcels/OSAF/PimSchema/TaskSchema/parcel.xml	Sun Nov 30 23:51:31 2003
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.9 $ -->
-<!-- $Date: 2003/11/26 08:39:44 $ -->
+<!-- $Revision: 1.10 $ -->
+<!-- $Date: 2003/12/01 07:51:31 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -148,7 +148,7 @@
     <displayName>Task</displayName>
     <issues>possible alternate names: 'Action Item' or 'To Do Item'</issues>
     <issues>see also: TaskDataModelIssues</issues>
-    <superKinds itemref="pim:InformationItem"/>
+    <superKinds itemref="pim:ContentItem"/>
     <attributes itemref="task:name"/>
     <attributes itemref="task:notes"/>
     <attributes itemref="task:timeFrame"/>
@@ -187,7 +187,7 @@
     <displayName>estimated by</displayName>
     <description>...add description here...</description>
     <cardinality>single</cardinality>
-    <type itemref="contact:ContactEntity"/>
+    <type itemref="contact:Contact"/>
   </Attribute>
 
   <Attribute itemName="confidence">
@@ -228,14 +228,14 @@
     <displayName>assigned by</displayName>
     <description>@@@ -- should be Person or Agent</description>
     <cardinality>single</cardinality>
-    <type itemref="contact:ContactEntity"/>
+    <type itemref="contact:Contact"/>
   </Attribute>
 
   <Attribute itemName="assignedTo">
     <displayName>assigned to</displayName>
     <description>@@@ -- should be Person or Group</description>
     <cardinality>single</cardinality>
-    <type itemref="contact:ContactEntity"/>
+    <type itemref="contact:Contact"/>
   </Attribute>
 
   <Attribute itemName="furtherDelegation">

Index: osaf/chandler/Chandler/parcels/OSAF/PimSchema/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/PimSchema/parcel.xml:1.13 osaf/chandler/Chandler/parcels/OSAF/PimSchema/parcel.xml:1.14
--- osaf/chandler/Chandler/parcels/OSAF/PimSchema/parcel.xml:1.13	Wed Nov 26 00:39:35 2003
+++ osaf/chandler/Chandler/parcels/OSAF/PimSchema/parcel.xml	Sun Nov 30 23:51:27 2003
@@ -1,136 +1,163 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!-- Parcel manifest for Pim Schema -->
-<!-- $Revision: 1.13 $ -->
-<!-- $Date: 2003/11/26 08:39:35 $ -->
+<!-- $Revision: 1.14 $ -->
+<!-- $Date: 2003/12/01 07:51:27 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
-<Parcel describes="//Parcels/OSAF/PimSchema"
-        itemName="PimSchema"
-        xmlns="//Schema/Core"
-        xmlns:pim="//Parcels/OSAF/PimSchema">
-
-  <displayName>Pim Schema</displayName>
-  <description>Pim schema for the 0.3 release</description>
-  <version>0.3</version>
-  <author>Open Source Applications Foundation</author>
-
-<!-- Information Item -->
-  <Attribute itemName="projects">
-    <displayName>projects</displayName>
-    <description>What project does this item belong to?</description>
-    <cardinality>list</cardinality>
-    <type itemref="pim:Project"/>
-    <inverseAttribute itemref="pim:projectItems"/>
-  </Attribute>
-
-  <Attribute itemName="folders">
-    <displayName>folders</displayName>
-    <description>What folders is this item filed in?</description>
-    <cardinality>list</cardinality>
-    <type itemref="pim:Folder"/>
-    <inverseAttribute itemref="pim:folderItems"/>
-  </Attribute>
-  
-  <Attribute itemName="name">
-    <displayName>name</displayName>
-    <description>names of objects</description>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Kind itemName="InformationItem">
-    <displayName>Information Item</displayName>
-    <examples>an Calendar Event -- 'Lunch with Tug'</examples>
-    <examples>a Contact -- 'Terry Smith'</examples>
-    <examples>a Task -- 'mail 1040 to IRS'</examples>
-    <examples>a Sailing Ship -- 'The Beagle'</examples>
-    <description>
-      Items can appear in Views.
-      Queries return collections of Items.
-      Users can add attributes to Items.
-      Everything is a type of Item.
-    </description>
-    <issues>@@@ -- add a categories attribute, to keep track of what 'virtual folders' the item appears in</issues>
-    <superKinds itemref="Item"/>
-    <attributes itemref="pim:projects"/>
-    <attributes itemref="pim:folders"/>
-  </Kind>
+<core:Parcel describes="//Parcels/OSAF/PimSchema"
+             itemName="PimSchema"
+             xmlns:core="//Schema/Core"
+             xmlns:parcel="//Schema/Core/Parcel"
+             xmlns="//Parcels/OSAF/PimSchema">
+
+  <core:displayName>Pim Schema</core:displayName>
+  <core:description>Pim schema for the 0.3 release</core:description>
+  <core:version>0.3</core:version>
+  <core:author>Open Source Applications Foundation</core:author>
+
+  <core:Attribute itemName="name">
+    <core:displayName>name</core:displayName>
+    <core:description>names of objects</core:description>
+    <core:cardinality>single</core:cardinality>
+    <core:type itemref="core:String"/>
+  </core:Attribute>
+
+<!-- Content Item -->
+  <core:Attribute itemName="projects">
+    <core:displayName>projects</core:displayName>
+    <core:description>List of projects this item belongs to.</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="Project"/>
+    <core:inverseAttribute itemref="itemsInProject"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="groups">
+    <core:displayName>groups</core:displayName>
+    <core:description>List of groups this item belongs to.</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="Group"/>
+    <core:inverseAttribute itemref="itemsInGroup"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="attachedNotes">
+    <core:displayName>attached notes</core:displayName>
+    <core:description>Notes attached to this content item.</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="ContentItem"/>
+    <core:inverseAttribute itemref="attachedToItems"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="attachedToItems">
+    <core:displayName>attached to item</core:displayName>
+    <core:description>List of items this "note" is attached to.</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="ContentItem"/>
+    <core:inverseAttribute itemref="attachedNotes"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="fyiLinks">
+    <core:displayName>fyi links</core:displayName>
+    <core:description>@@@</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="ContentItem"/>
+    <core:inverseAttribute itemref="fyiLinkedToItems"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="fyiLinkedToItems">
+    <core:displayName>fyi linked to item</core:displayName>
+    <core:description>List of items this item is fyiLinked to.</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="ContentItem"/>
+    <core:inverseAttribute itemref="fyiLinks"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="creator">
+    <core:displayName>creator</core:displayName>
+    <core:description>Link to the user who created the item.</core:description>
+    <core:issues>The type should be Contact, but we have a circular dependency problem to fix. Perhaps this attribute definition should live in the contacts parcel, and modify the ContentItem kind?</core:issues>
+    <core:cardinality>single</core:cardinality>
+    <core:type itemref="ContentItem"/>
+    <core:inverseAttribute itemref="itemsCreated"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="itemsCreated">
+    <core:displayName>items created</core:displayName>
+    <core:description>List of content items created by this user.</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="ContentItem"/>
+    <core:inverseAttribute itemref="creator"/>
+  </core:Attribute>
+
+  <core:Kind itemName="ContentItem">
+    <core:displayName>Content Item</core:displayName>
+    <core:examples>an Calendar Event -- 'Lunch with Tug'</core:examples>
+    <core:examples>a Contact -- 'Terry Smith'</core:examples>
+    <core:examples>a Task -- 'mail 1040 to IRS'</core:examples>
+    <core:examples>a Sailing Ship -- 'The Beagle'</core:examples>
+    <core:description>@@@</core:description>
+    <core:attributes itemref="projects"/>
+    <core:attributes itemref="groups"/>
+    <core:attributes itemref="creator"/>
+    <core:attributes itemref="itemsCreated"/>
+    <core:attributes itemref="parcel:createdOn"/>
+    <core:attributes itemref="parcel:modifiedOn"/>
+    <core:attributes itemref="fyiLinks"/>
+    <core:attributes itemref="fyiLinkedToItems"/>
+    <core:attributes itemref="attachedNotes"/>
+    <core:attributes itemref="attachedToItems"/>
+  </core:Kind>
 
 
 <!-- Project -->
-  <Attribute itemName="parentProject">
-    <displayName>parent project</displayName>
-    <description>projects can be organized into hierarchies</description>
-    <cardinality>single</cardinality>
-    <type itemref="pim:Project"/>
-    <inverseAttribute itemref="pim:subProjects"/>
-  </Attribute>
-
-  <Attribute itemName="subProjects">
-    <displayName>sub projects</displayName>
-    <description>projects can be organized into hierarchies</description>
-    <cardinality>list</cardinality>
-    <type itemref="pim:Project"/>
-    <inverseAttribute itemref="pim:parentProject"/>
-  </Attribute>
-
-  <Attribute itemName="projectItems">
-    <displayName>project items</displayName>
-    <description>items can be organized into projects</description>
-    <cardinality>list</cardinality>
-    <type itemref="pim:InformationItem"/>
-    <inverseAttribute itemref="pim:projects"/>
-  </Attribute>
-
-  <Kind itemName="Project">
-    <displayName>Project</displayName>
-    <superKinds itemref="Item"/>
-    <attributes itemref="pim:name"/>
-    <attributes itemref="description"/>
-    <attributes itemref="pim:parentProject"/>
-    <attributes itemref="pim:subProjects"/>
-    <attributes itemref="pim:projectItems"/>
-  </Kind>
-
-<!-- Folder -->
-  <Attribute itemName="folderItems">
-    <displayName>folder items</displayName>
-    <description>What's in the folder?</description>
-    <cardinality>list</cardinality>
-    <type itemref="Item"/>
-  </Attribute>
-
-  <Attribute itemName="folderType">
-    <displayName>type</displayName>
-    <description>What types of items should the folder be expected to hold?</description>
-    <cardinality>list</cardinality>
-    <type itemref="Taxon"/>
-  </Attribute>
-
-  <Kind itemName="Folder">
-    <displayName>Folder</displayName>
-    <examples>Inbox</examples>
-    <examples>Sent</examples>
-    <examples>Spam</examples>
-    <examples>Work address list</examples>
-    <examples>Drafts</examples>
-    <examples>Recipes</examples>
-    <examples>E-mail folders</examples>
-    <examples>agent change log</examples>
-    <examples>agent registry</examples>
-    <examples>address book</examples>
-    <examples>change log</examples>
-    <description>
-      A Folder represents a folder of e-mail messages (a mailbox) or a folder of any other type of Item.
-    </description>
-    <superKinds itemref="Item"/>
-    <attributes itemref="pim:name"/>
-    <attributes itemref="description"/>
-    <attributes itemref="pim:folderItems"/>
-    <attributes itemref="pim:folderType"/>
-  </Kind>
+  <core:Attribute itemName="parentProject">
+    <core:displayName>parent project</core:displayName>
+    <core:description>projects can be organized into hierarchies</core:description>
+    <core:cardinality>single</core:cardinality>
+    <core:type itemref="Project"/>
+    <core:inverseAttribute itemref="subProjects"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="subProjects">
+    <core:displayName>sub projects</core:displayName>
+    <core:description>projects can be organized into hierarchies</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="Project"/>
+    <core:inverseAttribute itemref="parentProject"/>
+  </core:Attribute>
+
+  <core:Attribute itemName="itemsInProject">
+    <core:displayName>project items</core:displayName>
+    <core:description>List of items in a project.</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="ContentItem"/>
+    <core:inverseAttribute itemref="projects"/>
+  </core:Attribute>
+
+  <core:Kind itemName="Project">
+    <core:displayName>Project</core:displayName>
+    <core:attributes itemref="name"/>
+    <core:attributes itemref="parentProject"/>
+    <core:attributes itemref="subProjects"/>
+    <core:attributes itemref="itemsInProject"/>
+  </core:Kind>
+
+<!-- Group -->
+  <core:Attribute itemName="itemsInGroup">
+    <core:displayName>items in group</core:displayName>
+    <core:description>List of items in a group.</core:description>
+    <core:cardinality>list</core:cardinality>
+    <core:type itemref="ContentItem"/>
+  </core:Attribute>
+
+  <core:Kind itemName="Group">
+    <core:displayName>Group</core:displayName>
+    <core:description>@@@</core:description>
+    <core:superKinds itemref="ContentItem"/>
+    <core:attributes itemref="name"/>
+    <core:attributes itemref="itemsInGroup"/>
+  </core:Kind>
 
-</Parcel>
+</core:Parcel>
      

Index: osaf/chandler/Chandler/parcels/OSAF/PimSchema/CalendarSchema/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/PimSchema/CalendarSchema/parcel.xml:1.9 osaf/chandler/Chandler/parcels/OSAF/PimSchema/CalendarSchema/parcel.xml:1.10
--- osaf/chandler/Chandler/parcels/OSAF/PimSchema/CalendarSchema/parcel.xml:1.9	Wed Nov 26 00:39:37 2003
+++ osaf/chandler/Chandler/parcels/OSAF/PimSchema/CalendarSchema/parcel.xml	Sun Nov 30 23:51:28 2003
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.9 $ -->
-<!-- $Date: 2003/11/26 08:39:37 $ -->
+<!-- $Revision: 1.10 $ -->
+<!-- $Date: 2003/12/01 07:51:28 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -60,7 +60,7 @@
   <Attribute itemName="participants">
     <displayName>Participants</displayName>
     <cardinality>list</cardinality>
-    <type itemref="contact:ContactEntity"/>
+    <type itemref="contact:Contact"/>
     <inverseAttribute itemref="cal:participatingIn"/>
   </Attribute>
 
@@ -74,14 +74,14 @@
   <Attribute itemName="organizer">
     <displayName>Meeting Organizer</displayName>
     <cardinality>single</cardinality>
-    <type itemref="contact:ContactEntity"/>
+    <type itemref="contact:Contact"/>
     <superAttribute itemref="cal:participants"/>
   </Attribute>
 
   <Attribute itemName="attendees">
     <displayName>Meeting Attendee</displayName>
     <cardinality>list</cardinality>
-    <type itemref="contact:ContactEntity"/>
+    <type itemref="contact:Contact"/>
     <superAttribute itemref="cal:participants"/>
   </Attribute>
 

Index: osaf/chandler/Chandler/parcels/OSAF/PimSchema/ContactSchema/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/PimSchema/ContactSchema/parcel.xml:1.5 osaf/chandler/Chandler/parcels/OSAF/PimSchema/ContactSchema/parcel.xml:1.6
--- osaf/chandler/Chandler/parcels/OSAF/PimSchema/ContactSchema/parcel.xml:1.5	Wed Nov 26 00:39:40 2003
+++ osaf/chandler/Chandler/parcels/OSAF/PimSchema/ContactSchema/parcel.xml	Sun Nov 30 23:51:29 2003
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.5 $ -->
-<!-- $Date: 2003/11/26 08:39:40 $ -->
+<!-- $Revision: 1.6 $ -->
+<!-- $Date: 2003/12/01 07:51:29 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
 <Parcel describes="//Parcels/OSAF/PimSchema/ContactSchema"
         itemName="ContactSchema"
         xmlns="//Schema/Core"
+        xmlns:pim="//Parcels/OSAF/PimSchema"
         xmlns:contact="//Parcels/OSAF/PimSchema/ContactSchema">
 
   <displayName>Contact Schema</displayName>
@@ -15,287 +16,144 @@
   <version>0.3</version>
   <author>Open Source Applications Foundation</author>
 
-  <!-- Attributes used in ContactName -->
-
-  <Attribute itemName="fullname">
-    <displayName>Full Name</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="sortname">
-    <displayName>Sort Name</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="firstname">
-    <displayName>First Name</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="middlename">
-    <displayName>Middle Name</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="lastname">
-    <displayName>Last Name</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="nickname">
-    <displayName>Nickname</displayName>
+  <Attribute itemName="contactName">
+    <displayName>contact name</displayName>
+    <description>@@@</description>
     <cardinality>single</cardinality>
-    <type itemref="String"/>
+    <type itemref="contact:ContactName"/>
+    <inverseAttribute itemref="contact:ownerOfName"/>
   </Attribute>
 
-  <Attribute itemName="nameEntity">
-    <displayName>Name Entity</displayName>
+  <Attribute itemName="ownerOfName">
+    <displayName>owner of name</displayName>
+    <description>A reference back to the contact.</description>
     <cardinality>single</cardinality>
-    <type itemref="contact:ContactEntity"/>
+    <type itemref="contact:Contact"/>
     <inverseAttribute itemref="contact:contactName"/>
   </Attribute>
 
-  <!-- ContactName Item Definition -->
-
-  <Kind itemName="ContactName">
-    <displayName>Contact Name</displayName>
-    <attributes itemref="contact:fullname"/>
-    <attributes itemref="contact:sortname"/>
-    <attributes itemref="contact:firstname"/>
-    <attributes itemref="contact:middlename"/>
-    <attributes itemref="contact:lastname"/>
-    <attributes itemref="contact:nickname"/>
-    <attributes itemref="contact:nameEntity"/>
-  </Kind>
-
-  <!-- Attributes used in ContactMethod -->
-
-  <Attribute itemName="methodType">
-    <displayName>Method Type</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
+  <Attribute itemName="sections">
+    <displayName>Section</displayName>
+    <description>A list of collections (sections) of contact attributes</description>
+    <cardinality>list</cardinality>
+    <type itemref="contact:ContactSection"/>
+    <inverseAttribute itemref="contact:ownerOfSection"/>
   </Attribute>
 
-  <Attribute itemName="methodDescription">
-    <displayName>Method Description</displayName>
+  <Attribute itemName="ownerOfSection">
+    <displayName>owner of section</displayName>
+    <description>A reference back to the contact</description>
     <cardinality>single</cardinality>
-    <type itemref="String"/>
+    <type itemref="contact:Contact"/>
+    <inverseAttribute itemref="contact:sections"/>
   </Attribute>
 
-  <Attribute itemName="methodComment">
-    <displayName>Method Type</displayName>
+  <Attribute itemName="workSection">
+    <displayName>work section</displayName>
+    <description>Work section</description>
+    <superAttribute itemref="contact:sections"/>
     <cardinality>single</cardinality>
-    <type itemref="String"/>
   </Attribute>
 
-  <Attribute itemName="methodValue">
-    <displayName>Method Value</displayName>
+  <Attribute itemName="homeSection">
+    <displayName>work section</displayName>
+    <description>Work section</description>
+    <superAttribute itemref="contact:sections"/>
     <cardinality>single</cardinality>
-    <type itemref="String"/>
   </Attribute>
 
-  <Attribute itemName="methodEntity">
-    <displayName>Method Entity</displayName>
+  <Attribute itemName="birthday">
+    <displayName>birthday</displayName>
+    <description>@@@</description>
     <cardinality>single</cardinality>
-    <type itemref="contact:ContactEntity"/>
-    <inverseAttribute itemref="contact:contactMethods"/>
+    <type itemref="DateTime"/>
   </Attribute>
 
-  <!-- ContactMethod Item Definition -->
-
-  <Kind itemName="ContactMethod">
-    <displayName>Contact Method</displayName>
-    <attributes itemref="contact:methodType"/>
-    <attributes itemref="contact:methodDescription"/>
-    <attributes itemref="contact:methodComment"/>
-    <attributes itemref="contact:methodValue"/>
-    <attributes itemref="contact:methodEntity"/>
-  </Kind>
-
-  <!-- Attributes used in PhoneContactMethod -->
+  <Enumeration itemName="GenderEnum">
+    <values>Male</values>
+    <values>Female</values>
+  </Enumeration>
 
-  <Attribute itemName="phonenumber">
-    <displayName>Phone Number</displayName>
+  <Attribute itemName="gender">
+    <displayName>gender</displayName>
+    <description>@@@</description>
     <cardinality>single</cardinality>
-    <type itemref="String"/>
+    <type itemref="contact:GenderEnum"/>
   </Attribute>
 
-  <!-- PhoneContactMethod Item Definition -->
-
-  <Kind itemName="PhoneContactMethod">
-    <displayName>Phone Contact Method</displayName>
-    <attributes itemref="contact:phonenumber"/>
-    <superKinds itemref="contact:ContactMethod"/>
-  </Kind>
-
-  <!-- Attributes used in EmailContactMethod -->
-
-  <Attribute itemName="emailaddress">
-    <displayName>Email Address</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
+  <Attribute itemName="">
+    <displayName></displayName>
+    <description></description>
   </Attribute>
 
-  <!-- EmailContactMethod Item Definition -->
-
-  <Kind itemName="EmailContactMethod">
-    <displayName>Email Contact Method</displayName>
-    <attributes itemref="contact:emailaddress"/>
-    <superKinds itemref="contact:ContactMethod"/>
+  <Kind itemName="Contact">
+    <displayName>Contact</displayName>
+    <description>Contact</description>
+    <superKinds itemref="pim:ContentItem"/>
+    <attributes itemref="contact:homeSection"/>
+    <attributes itemref="contact:workSection"/>
+    <attributes itemref="contact:sections"/>
   </Kind>
 
-  <!-- Attributes used in JabberContactMethod -->
-
-  <Attribute itemName="jabberAddress">
-    <displayName>Jabber ID</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <!-- JabberContactMethod Item Definition -->
-  <Kind itemName="JabberContactMethod">
-    <displayName>Jabber Contact Method</displayName>
-    <attributes itemref="contact:jabberAddress"/>
-    <superKinds itemref="contact:ContactMethod"/>
-  </Kind>
-
-  <!-- Attributes used in ContactFormat -->
-
-  <Attribute itemName="headerAttributes">
-    <displayName>Header Attributes</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="bodyAttributes">
-    <displayName>Body Attributes</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="formatEntity">
-    <displayName>Format Entity</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="contact:ContactEntity"/>
-    <inverseAttribute itemref="contact:contactFormat"/>
-  </Attribute>
-
-  <!-- ContactFormat Item Definition -->
-
-  <Kind itemName="ContactFormat">
-    <displayName>Contact Format</displayName>
-    <attributes itemref="contact:headerAttributes"/>
-    <attributes itemref="contact:bodyAttributes"/>
-    <attributes itemref="contact:formatEntity"/>
+  <Kind itemName="ContactSection">
+    <displayName>Contact Section</displayName>
+    <description>Section of a contact.</description>
+    <!--<attributes itemref="contact:phoneNumbers"/>-->
+    <!--<attributes itemref="contact:emailAddresses"/>-->
+    <!--<attributes itemref="contact:streetAddresses"/>-->
+    <!--<attributes itemref="contact:jabberAddresses"/>-->
   </Kind>
 
-  <!-- Main Attributes used in ContactEntity -->
-
-  <Attribute itemName="contactType">
-    <displayName>Contact Type</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="contactName">
-    <displayName>Contact Name</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="contact:ContactName"/>
-    <inverseAttribute itemref="contact:nameEntity"/>
-  </Attribute>
-
-  <Attribute itemName="contactMethods">
-    <displayName>Contact Methods</displayName>
-    <cardinality>list</cardinality>
-    <type itemref="contact:ContactMethod"/>
-    <inverseAttribute itemref="contact:methodEntity"/>
-  </Attribute>
-
-  <Attribute itemName="contactPhotoURL">
-    <displayName>Contact Photo URL</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="contactGroups">
-    <displayName>Contact Groups</displayName>
-    <cardinality>list</cardinality>
-    <type itemref="String"/>
-  </Attribute>
-
-  <Attribute itemName="contactFormat">
-    <displayName>Contact Format</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="contact:ContactFormat"/>
-    <inverseAttribute itemref="contact:formatEntity"/>
-  </Attribute>
-
-  <!-- Other Attributes used in ContactEntity -->
+  <!-- Attributes used in ContactName -->
 
-  <Attribute itemName="companyName">
-    <displayName>Company Name</displayName>
+  <Attribute itemName="fullName">
+    <displayName>Full Name</displayName>
     <cardinality>single</cardinality>
     <type itemref="String"/>
   </Attribute>
 
-  <Attribute itemName="jobTitle">
-    <displayName>Job Title</displayName>
+  <Attribute itemName="sortName">
+    <displayName>Sort Name</displayName>
+    <description>Name to use for sorting</description>
     <cardinality>single</cardinality>
     <type itemref="String"/>
   </Attribute>
 
-  <Attribute itemName="occupation">
-    <displayName>Occupation</displayName>
+  <Attribute itemName="firstName">
+    <displayName>First Name</displayName>
     <cardinality>single</cardinality>
     <type itemref="String"/>
   </Attribute>
 
-  <Attribute itemName="relationship">
-    <displayName>Relationship</displayName>
+  <Attribute itemName="middleName">
+    <displayName>Middle Name</displayName>
     <cardinality>single</cardinality>
     <type itemref="String"/>
   </Attribute>
 
-  <Attribute itemName="age">
-    <displayName>Age</displayName>
-    <cardinality>single</cardinality>
-    <type itemref="Integer"/>
-  </Attribute>
-
-  <Attribute itemName="gender">
-    <displayName>Gender</displayName>
+  <Attribute itemName="lastName">
+    <displayName>Last Name</displayName>
     <cardinality>single</cardinality>
     <type itemref="String"/>
   </Attribute>
 
-  <Attribute itemName="sharing">
-    <displayName>Sharing</displayName>
+  <Attribute itemName="nickname">
+    <displayName>Nickname</displayName>
     <cardinality>single</cardinality>
     <type itemref="String"/>
   </Attribute>
 
-  <!-- ContactEntity Item Definition -->
+  <!-- ContactName Item Definition -->
 
-  <Kind itemName="ContactEntity">
-    <displayName>Contact Entity</displayName>
-    <attributes itemref="contact:contactType"/>
-    <attributes itemref="contact:contactName"/>
-    <attributes itemref="contact:contactMethods"/>
-    <attributes itemref="contact:contactPhotoURL"/>
-    <attributes itemref="contact:contactGroups"/>
-    <attributes itemref="contact:contactFormat"/>
-    <attributes itemref="contact:companyName"/>
-    <attributes itemref="contact:jobTitle"/>
-    <attributes itemref="contact:occupation"/>
-    <attributes itemref="contact:relationship"/>
-    <attributes itemref="contact:age"/>
-    <attributes itemref="contact:gender"/>
-    <attributes itemref="contact:sharing"/>
+  <Kind itemName="ContactName">
+    <displayName>Contact Name</displayName>
+    <attributes itemref="contact:fullName"/>
+    <attributes itemref="contact:sortName"/>
+    <attributes itemref="contact:firstName"/>
+    <attributes itemref="contact:middleName"/>
+    <attributes itemref="contact:lastName"/>
+    <attributes itemref="contact:nickname"/>
+    <attributes itemref="contact:ownerOfName"/>
   </Kind>
 
 </Parcel>

Index: osaf/chandler/Chandler/parcels/OSAF/PimSchema/EmailSchema/parcel.xml
diff -u osaf/chandler/Chandler/parcels/OSAF/PimSchema/EmailSchema/parcel.xml:1.7 osaf/chandler/Chandler/parcels/OSAF/PimSchema/EmailSchema/parcel.xml:1.8
--- osaf/chandler/Chandler/parcels/OSAF/PimSchema/EmailSchema/parcel.xml:1.7	Wed Nov 26 00:39:42 2003
+++ osaf/chandler/Chandler/parcels/OSAF/PimSchema/EmailSchema/parcel.xml	Sun Nov 30 23:51:30 2003
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.7 $ -->
-<!-- $Date: 2003/11/26 08:39:42 $ -->
+<!-- $Revision: 1.8 $ -->
+<!-- $Date: 2003/12/01 07:51:30 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -244,7 +244,7 @@
     <issues>see also: MessageDataModelIssues</issues>
     <issues>We want people to be able to use e-mail messages as tasks, so the data model needs to reflect that.  We might want ot make it so that an Item can be both an Email Message and a Task.  Or we might want to just add a few lightweight taskish attribute to the Email Message Kind: attributes like 'priority', 'due-by date', and 'has been done'.</issues>
     <issues>We might also want to add a few derived attributes, like 'message size' or 'has been forwarded'.</issues>
-    <superKinds itemref="pim:InformationItem"/>
+    <superKinds itemref="pim:ContentItem"/>
     <attributes itemref="email:subject"/>
     <attributes itemref="email:sentTo"/>
     <attributes itemref="email:toAddress"/>



More information about the Commits mailing list