[CalendarServer-changes] [723] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 723
          http://trac.macosforge.org/projects/calendarserver/changeset/723
Author:   wsanchez at apple.com
Date:     2006-12-05 22:35:01 -0800 (Tue, 05 Dec 2006)

Log Message:
-----------
Remove configuration options for drop box locations

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/caldavd.py
    CalendarServer/trunk/twistedcaldav/dropbox.py
    CalendarServer/trunk/twistedcaldav/repository.py

Modified: CalendarServer/trunk/twistedcaldav/caldavd.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/caldavd.py	2006-12-06 05:49:30 UTC (rev 722)
+++ CalendarServer/trunk/twistedcaldav/caldavd.py	2006-12-06 06:35:01 UTC (rev 723)
@@ -47,11 +47,9 @@
     'DocumentRoot': '/Library/CalendarServer/Documents',
     'DropBoxEnabled': True,
     'DropBoxInheritedACLs': True,
-    'DropBoxName': 'dropbox',
     'ErrorLogFile': '/var/log/caldavd/error.log',
     'ManholePort': 0,
     'MaximumAttachmentSizeBytes': 1048576,
-    'NotificationCollectionName': 'notifications',
     'NotificationsEnabled': False,
     'PIDFile': '/var/run/caldavd.pid',
     'Port': 8008,
@@ -113,10 +111,8 @@
         print "Directory Service:                %s" % (self.config['DirectoryService']["type"],)
         print "Directory Service Parameters:     %r" % (self.config['DirectoryService']["params"],)
         print "Drop Box Enabled:                 %s" % (self.config['DropBoxEnabled'],)
-        print "Drop Box Name:                    %s" % (self.config['DropBoxName'],)
         print "Drop Box ACLs are Inherited       %s" % (self.config['DropBoxInheritedACLs'],)
         print "Notifications Enabled:            %s" % (self.config['NotificationsEnabled'],)
-        print "Notification Collection Name:     %s" % (self.config['NotificationCollectionName'],)
         print "Server Log File:                  %s" % (self.config['ServerLogFile'],)
         print "Error Log File:                   %s" % (self.config['ErrorLogFile'],)
         print "PID File:                         %s" % (self.config['PIDFile'],)
@@ -405,10 +401,8 @@
     %(ServerLogFile)r,
     %(DirectoryService)r,
     %(DropBoxEnabled)r,
-    %(DropBoxName)r,
     %(DropBoxInheritedACLs)r,
     %(NotificationsEnabled)r,
-    %(NotificationCollectionName)r,
     %(ManholePort)d,
 )
 """ % self.config

Modified: CalendarServer/trunk/twistedcaldav/dropbox.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/dropbox.py	2006-12-06 05:49:30 UTC (rev 722)
+++ CalendarServer/trunk/twistedcaldav/dropbox.py	2006-12-06 06:35:01 UTC (rev 723)
@@ -33,16 +33,15 @@
     
     # These are all options that will be set from a .plist configuration file.
 
-    enabled = True                # Whether or not drop box functionaility is enabled.
-    dropboxName = "dropbox"       # Name of the collection in which drop boxes can be created.
-    inheritedACLs = True          # Whether or not ACLs set on a drop box collection are automatically
-                                  # inherited by child resources.
-                                  
-    notifications = True          # Whether to post notification messages into per-user notification collection.
-    notificationName = "notify"    # Name of the collection in which notifications will be stored.
+    enabled = True                     # Whether or not drop box functionaility is enabled.
+    dropboxName = "dropbox"            # Name of the collection in which drop boxes can be created.
+    inheritedACLs = True               # Whether or not ACLs set on a drop box collection are automatically
+                                       # inherited by child resources.
+    notifications = True               # Whether to post notification messages into per-user notification collection.
+    notificationName = "notifications" # Name of the collection in which notifications will be stored.
     
     @classmethod
-    def enable(clzz, enabled, dropboxName=None, inheritedACLs=None, notifications=None, notificationName=None):
+    def enable(clzz, enabled, inheritedACLs=None, notifications=None):
         """
         This method must be used to enable drop box support as it will setup live properties etc,
         and turn on the notification system. It must only be called once
@@ -54,14 +53,10 @@
         @param notificationName: C{str} containing the name of the collection used to store per-user notifications.
         """
         DropBox.enabled = enabled
-        if dropboxName:
-            DropBox.dropboxName = dropboxName
         if inheritedACLs:
             DropBox.inheritedACLs = inheritedACLs
         if notifications:
             DropBox.notifications = notifications
-        if notificationName:
-            DropBox.notificationName = notificationName
 
         if DropBox.enabled:
 

Modified: CalendarServer/trunk/twistedcaldav/repository.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/repository.py	2006-12-06 05:49:30 UTC (rev 722)
+++ CalendarServer/trunk/twistedcaldav/repository.py	2006-12-06 06:35:01 UTC (rev 723)
@@ -127,8 +127,8 @@
                 keyfile, certfile, onlyssl, port, sslport, maxsize,
                 quota, serverlogfile,
                 directoryservice,
-                dropbox, dropboxName, dropboxACLs,
-                notifications, notificationName,
+                dropbox, dropboxACLs,
+                notifications,
                 manhole):
     """
     Start the server using XML-based configuration details and supplied .plist based options.
@@ -175,7 +175,7 @@
             self.logObserver.stop()
     
     # Turn on drop box support before building the repository
-    DropBox.enable(dropbox, dropboxName, dropboxACLs, notifications, notificationName)
+    DropBox.enable(dropbox, dropboxACLs, notifications)
 
     dirname = directoryservice["type"]
     dirparams = directoryservice["params"]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061205/dcbee3dd/attachment.html