[CalendarServer-changes] [2828] CalendarServer/branches/users/cdaboo/implicit-2805

[source_changes at macosforge.org]

Revision: 2828
          http://trac.macosforge.org/projects/calendarserver/changeset/2828
Author:   cdaboo at apple.com
Date:     2008-08-18 12:46:56 -0700 (Mon, 18 Aug 2008)
Log Message:
-----------
Allow default scheduling calendar to be set as part of provisioning. This is on by default.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/implicit-2805/conf/caldavd-test.plist
    CalendarServer/branches/users/cdaboo/implicit-2805/conf/caldavd.plist
    CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/config.py
    CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/directory/calendar.py

Modified: CalendarServer/branches/users/cdaboo/implicit-2805/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2805/conf/caldavd-test.plist	2008-08-14 21:15:41 UTC (rev 2827)
+++ CalendarServer/branches/users/cdaboo/implicit-2805/conf/caldavd-test.plist	2008-08-18 19:46:56 UTC (rev 2828)
@@ -394,6 +394,8 @@
   	  </array>
   	  <key>OldDraftCompatability</key>
   	  <true/>
+  	  <key>DefaultCalendarProvisioned</key>
+  	  <true/>
   	</dict>
     <!--  iSchedule protocol options -->
   	<key>iSchedule</key>

Modified: CalendarServer/branches/users/cdaboo/implicit-2805/conf/caldavd.plist
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2805/conf/caldavd.plist	2008-08-14 21:15:41 UTC (rev 2827)
+++ CalendarServer/branches/users/cdaboo/implicit-2805/conf/caldavd.plist	2008-08-18 19:46:56 UTC (rev 2828)
@@ -363,6 +363,8 @@
   	  </array>
   	  <key>OldDraftCompatability</key>
   	  <true/>
+  	  <key>DefaultCalendarProvisioned</key>
+  	  <true/>
   	</dict>
     <!--  iSchedule protocol options -->
   	<key>iSchedule</key>

Modified: CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/config.py	2008-08-14 21:15:41 UTC (rev 2827)
+++ CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/config.py	2008-08-18 19:46:56 UTC (rev 2828)
@@ -183,10 +183,11 @@
     "Scheduling": {
         
         "CalDAV": {
-            "EmailDomain"           : "",    # Domain for mailto calendar user addresses on this server
-            "HTTPDomain"            : "",    # Domain for http calendar user addresses on this server
-            "AddressPatterns"       : [],    # Reg-ex patterns to match local calendar user addresses
-            "OldDraftCompatability" : True   # Whether to maintain compatibility with non-implicit mode
+            "EmailDomain"                : "",    # Domain for mailto calendar user addresses on this server
+            "HTTPDomain"                 : "",    # Domain for http calendar user addresses on this server
+            "AddressPatterns"            : [],    # Reg-ex patterns to match local calendar user addresses
+            "OldDraftCompatability"      : True,  # Whether to maintain compatibility with non-implicit mode
+            "DefaultCalendarProvisioned" : True, # Whether the provisioned default calendar is marked as the scheduling default
         },
 
         "iSchedule": {

Modified: CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/directory/calendar.py	2008-08-14 21:15:41 UTC (rev 2827)
+++ CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/directory/calendar.py	2008-08-18 19:46:56 UTC (rev 2828)
@@ -300,6 +300,10 @@
             inbox.provision()
             inbox.writeDeadProperty(caldavxml.CalendarFreeBusySet(davxml.HRef(childURL)))
 
+            # Default calendar may need to be marked as the default for scheduling
+            if config.Scheduling["CalDAV"]["DefaultCalendarProvisioned"]:
+                inbox.writeDeadProperty(caldavxml.ScheduleDefaultCalendarURL(davxml.HRef(childURL)))
+
             return self
 
         d = child.createCalendarCollection()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080818/0d68d651/attachment.html