From 3eb6fa40482b69b3e61fc4d6ebf0ee3441e65ba4 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 15 Dec 2006 15:15:26 +0000
Subject: [PATCH] Monotone-Parent: 035a7461367cb96790062dc6cf38d9a910a09534
 Monotone-Revision: 4e29c9141c3baa1b13e856cae96ad405650bbc7a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-12-15T15:15:26
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Appointments/product.plist |  6 +---
 SoObjects/Contacts/product.plist     | 45 ++++------------------------
 SoObjects/Mailer/product.plist       | 24 +++++++++++++--
 3 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist
index 3d502d760..e29f1200e 100644
--- a/SoObjects/Appointments/product.plist
+++ b/SoObjects/Appointments/product.plist
@@ -11,11 +11,7 @@
     SOGoAppointmentFolder = {
       superclass    = "SOGoFolder";
       defaultRoles = {
-        "Add Documents, Images, and Files" = ( "Owner", "Delegate" );
-        "View"          = ( "Owner", "Delegate", "Assistant" );
-        "WebDAV Access" = ( "Owner", "Delegate", "Assistant" );
         "FreeBusyLookup" = ( "Owner", "Delegate", "Assistant", "FreeBusyLookup" );
-        "Access Contents Information" = ( "Owner", "Assistant", "Delegate" );
       };
     };
 
@@ -33,7 +29,7 @@
     SOGoTaskObject = {
       superclass    = "SOGoContentObject";
       defaultRoles = {
-        "View"          = ( "Owner", "Delegate", "Organizer" );
+        "View" = ( "Owner", "Delegate", "Organizer" );
       };
     };
     SOGoFreeBusyObject = {
diff --git a/SoObjects/Contacts/product.plist b/SoObjects/Contacts/product.plist
index f1f094153..4b5f1a601 100644
--- a/SoObjects/Contacts/product.plist
+++ b/SoObjects/Contacts/product.plist
@@ -10,63 +10,30 @@
   classes = {
     SOGoContactFolders = {
       superclass    = "SOGoObject";
-
-      protectedBy   = "View";
-      defaultAccess = "allow"; /* I think this affects key lookup */
       defaultRoles = {
-        "View"          = "Authenticated";
-        "WebDAV Access" = "Owner";
+        "Add Documents, Images, and Files" = ( "Owner", "Delegate" );
+        "View"          = ( "Owner", "Delegate", "Assistant" );
+        "WebDAV Access" = ( "Owner", "Delegate", "Assistant" );
+        "Access Contents Information" = ( "Owner", "Assistant", "Delegate" );
+        "ReadAcls" = ( "Owner", "Delegate", "Assistant" );
+        "SaveAcls" = ( "Owner" );
       };
     };
 
     SOGoContactGCSFolder = {
       superclass    = "SOGoFolder";
-
-      protectedBy   = "View";
-      defaultAccess = "allow"; /* I think this affects key lookup */
-      defaultRoles = {
-        "View"          = "Authenticated";
-        "WebDAV Access" = "Owner";
-      };
     };
 
     SOGoContactGCSEntry = {
       superclass    = "SOGoContentObject";
-
-      protectedBy   = "View";
-      defaultAccess = "allow"; /* I think this affects key lookup */
-      defaultRoles = {
-        "View"          = "Authenticated";
-        "WebDAV Access" = "Owner";
-      };
-
-      methods = {
-      };
     };
 
     SOGoContactLDAPFolder = {
       superclass    = "SOGoFolder";
-
-      protectedBy   = "View";
-      defaultAccess = "allow"; /* I think this affects key lookup */
-      defaultRoles = {
-        "View"          = "Authenticated";
-        "WebDAV Access" = "Owner";
-      };
     };
 
     SOGoContactLDAPEntry = {
       superclass    = "SOGoContentObject";
-
-      protectedBy   = "View";
-      defaultAccess = "allow"; /* I think this affects key lookup */
-      defaultRoles = {
-        "View"          = "Authenticated";
-        "WebDAV Access" = "Owner";
-      };
-
-      methods = {
-      };
     };
   };
 }
diff --git a/SoObjects/Mailer/product.plist b/SoObjects/Mailer/product.plist
index 31eacb15b..2ace375aa 100644
--- a/SoObjects/Mailer/product.plist
+++ b/SoObjects/Mailer/product.plist
@@ -14,12 +14,26 @@
 
     SOGoMailAccounts = {
       superclass    = "SOGoMailBaseObject";
+      defaultRoles = {
+        "Add Documents, Images, and Files" = ( "Owner", "Delegate" );
+        "View"          = ( "Owner", "Delegate", "Assistant" );
+        "WebDAV Access" = ( "Owner", "Delegate", "Assistant" );
+        "Access Contents Information" = ( "Owner", "Assistant", "Delegate" );
+        "ReadAcls" = ( "Owner", "Delegate", "Assistant" );
+        "SaveAcls" = ( "Owner" );
+      };
     };
 
     SOGoMailAccount = {
       superclass    = "SOGoMailBaseObject";
       defaultRoles = {
-        "Add Folders" = "Owner";
+        "Add Folders" = ( "Owner", "Delegate" );
+        "Add Documents, Images, and Files" = ( "Owner", "Delegate" );
+        "View"          = ( "Owner", "Delegate", "Assistant" );
+        "WebDAV Access" = ( "Owner", "Delegate", "Assistant" );
+        "Access Contents Information" = ( "Owner", "Assistant", "Delegate" );
+        "ReadAcls" = ( "Owner", "Delegate", "Assistant" );
+        "SaveAcls" = ( "Owner" );
       };
     };
     SOGoSharedMailAccount = {
@@ -29,7 +43,13 @@
     SOGoMailFolder = {
       superclass    = "SOGoMailBaseObject";
       defaultRoles = {
-        "Add Folders" = "Owner";
+        "Add Folders" = ( "Owner", "Delegate" );
+        "Add Documents, Images, and Files" = ( "Owner", "Delegate" );
+        "View"          = ( "Owner", "Delegate", "Assistant" );
+        "WebDAV Access" = ( "Owner", "Delegate", "Assistant" );
+        "Access Contents Information" = ( "Owner", "Assistant", "Delegate" );
+        "ReadAcls" = ( "Owner", "Delegate", "Assistant" );
+        "SaveAcls" = ( "Owner" );
       };
     };
     SOGoSharedInboxFolder = {