December 2006 - calendarserver-changes

[801] CalendarServer/branches/users/wsanchez/dropbox/
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 801 http://trac.macosforge.org/projects/calendarserver/changeset/801 Author: wsanchez(a)apple.com Date: 2006-12-11 21:22:23 -0800 (Mon, 11 Dec 2006) Log Message: ----------- Dropbox resource cleanup Added Paths: ----------- CalendarServer/branches/users/wsanchez/dropbox/ Copied: CalendarServer/branches/users/wsanchez/dropbox (from rev 800, CalendarServer/trunk)

1 0

[800] CalendarServer/branches/users/wsanchez/provisioning-2/
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 800 http://trac.macosforge.org/projects/calendarserver/changeset/800 Author: wsanchez(a)apple.com Date: 2006-12-11 21:21:32 -0800 (Mon, 11 Dec 2006) Log Message: ----------- merged Removed Paths: ------------- CalendarServer/branches/users/wsanchez/provisioning-2/

1 0

[799] CalendarServer/branches/users/wsanchez/provisioning/
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 799 http://trac.macosforge.org/projects/calendarserver/changeset/799 Author: wsanchez(a)apple.com Date: 2006-12-11 21:21:07 -0800 (Mon, 11 Dec 2006) Log Message: ----------- merged Removed Paths: ------------- CalendarServer/branches/users/wsanchez/provisioning/

1 0

[798] CalendarServer/trunk/bin/caldavd
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 798 http://trac.macosforge.org/projects/calendarserver/changeset/798 Author: tfitz(a)apple.com Date: 2006-12-11 19:10:47 -0800 (Mon, 11 Dec 2006) Log Message: ----------- Caldavd now uses ./run's method of finding the right python. Modified Paths: -------------- CalendarServer/trunk/bin/caldavd Modified: CalendarServer/trunk/bin/caldavd =================================================================== --- CalendarServer/trunk/bin/caldavd 2006-12-12 01:17:45 UTC (rev 797) +++ CalendarServer/trunk/bin/caldavd 2006-12-12 03:10:47 UTC (rev 798) @@ -24,10 +24,48 @@ configfile=""; twistdpath="$(type -p twistd)"; -python="$(type -p python2.5)"; +py_version () +{ + local python="$1"; shift + echo "$("${python}" -c "from distutils.sysconfig import get_python_version; print get_python_version()")"; +} -if [ "$?" != "0" ]; then - python="$(type -p python2.4)"; +try_python () +{ + local python="$1"; shift + + if [ -z "${python}" ]; then return 1; fi; + + if ! type "${python}" > /dev/null 2>&1; then return 1; fi; + local py_version="$(py_version "${python}")"; + if [ "${py_version/./}" -lt "24" ]; then return 1; fi; + + return 0; +} + +for v in "" "2.5" "2.4"; do + for p in \ + "${PYTHON:=}" \ + "python${v}" \ + "/usr/local/bin/python${v}" \ + "/usr/local/python/bin/python${v}" \ + "/usr/local/python${v}/bin/python${v}" \ + "/opt/bin/python${v}" \ + "/opt/python/bin/python${v}" \ + "/opt/python${v}/bin/python${v}" \ + "/Library/Frameworks/Python.framework/Versions/${v}/bin/python" \ + "/opt/local/bin/python${v}" \ + "/sw/bin/python${v}" \ + ; + do + if try_python "${p}"; then python="${p}"; break; fi; + done; + if [ -n "${python:-}" ]; then break; fi; +done; + +if [ -z "${python:-}" ]; then + echo "No suitable python found."; + exit 1; fi; usage ()

1 0

[797] CalendarServer/trunk/twistedcaldav/static.py
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 797 http://trac.macosforge.org/projects/calendarserver/changeset/797 Author: wsanchez(a)apple.com Date: 2006-12-11 17:17:45 -0800 (Mon, 11 Dec 2006) Log Message: ----------- musical chairs Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-12 01:03:45 UTC (rev 796) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-12 01:17:45 UTC (rev 797) @@ -366,46 +366,6 @@ _checkParents = deferredGenerator(_checkParents) -class ScheduleFile (CalDAVFile): - def __init__(self, path, parent): - super(ScheduleFile, self).__init__(path, principalCollections=parent.principalCollections()) - self._parent = parent - - def provision(self): - provisionFile(self, self._parent) - - def locateChild(self, path, segments): - self.provision() - return super(ScheduleFile, self).locateChild(path, segments) - - def createSimilarFile(self, path): - if path == self.fp.path: - return self - else: - return CalDAVFile(path, principalCollections=self.principalCollections()) - - def index(self): - """ - Obtains the index for an schedule collection resource. - @return: the index object for this resource. - @raise AssertionError: if this resource is not a calendar collection - resource. - """ - return IndexSchedule(self) - - def http_COPY (self, request): return responsecode.FORBIDDEN - def http_MOVE (self, request): return responsecode.FORBIDDEN - def http_DELETE (self, request): return responsecode.FORBIDDEN - def http_MKCOL (self, request): return responsecode.FORBIDDEN - def http_MKCALENDAR (self, request): return responsecode.FORBIDDEN - - ## - # ACL - ## - - def supportedPrivileges(self, request): - return succeed(schedulePrivilegeSet) - class CalendarHomeProvisioningFile (DirectoryCalendarHomeProvisioningResource, DAVFile): """ Resource which provisions calendar home collections as needed. @@ -503,6 +463,46 @@ return super(CalendarHomeFile, self).getChild(name) +class ScheduleFile (CalDAVFile): + def __init__(self, path, parent): + super(ScheduleFile, self).__init__(path, principalCollections=parent.principalCollections()) + self._parent = parent + + def provision(self): + provisionFile(self, self._parent) + + def locateChild(self, path, segments): + self.provision() + return super(ScheduleFile, self).locateChild(path, segments) + + def createSimilarFile(self, path): + if path == self.fp.path: + return self + else: + return CalDAVFile(path, principalCollections=self.principalCollections()) + + def index(self): + """ + Obtains the index for an schedule collection resource. + @return: the index object for this resource. + @raise AssertionError: if this resource is not a calendar collection + resource. + """ + return IndexSchedule(self) + + def http_COPY (self, request): return responsecode.FORBIDDEN + def http_MOVE (self, request): return responsecode.FORBIDDEN + def http_DELETE (self, request): return responsecode.FORBIDDEN + def http_MKCOL (self, request): return responsecode.FORBIDDEN + def http_MKCALENDAR (self, request): return responsecode.FORBIDDEN + + ## + # ACL + ## + + def supportedPrivileges(self, request): + return succeed(schedulePrivilegeSet) + class ScheduleInboxFile (ScheduleInboxResource, ScheduleFile): """ Calendar scheduling inbox collection resource.

1 0

[796] CalendarServer/trunk/twistedcaldav/tap.py
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 796 http://trac.macosforge.org/projects/calendarserver/changeset/796 Author: wsanchez(a)apple.com Date: 2006-12-11 17:03:45 -0800 (Mon, 11 Dec 2006) Log Message: ----------- DAV:all's privileges don't need to be protected; there are valid reasons to want to remove access for DAV:all via ACP. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2006-12-12 01:01:37 UTC (rev 795) +++ CalendarServer/trunk/twistedcaldav/tap.py 2006-12-12 01:03:45 UTC (rev 796) @@ -124,7 +124,6 @@ davxml.ACE( davxml.Principal(davxml.All()), davxml.Grant(davxml.Privilege(davxml.Read())), - davxml.Protected(), ), ]

1 0

[795] CalendarServer/trunk/twistedcaldav/directory/sqldb.py
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 795 http://trac.macosforge.org/projects/calendarserver/changeset/795 Author: wsanchez(a)apple.com Date: 2006-12-11 17:01:37 -0800 (Mon, 11 Dec 2006) Log Message: ----------- Fix broken __repr__ Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/sqldb.py Modified: CalendarServer/trunk/twistedcaldav/directory/sqldb.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/sqldb.py 2006-12-11 23:38:57 UTC (rev 794) +++ CalendarServer/trunk/twistedcaldav/directory/sqldb.py 2006-12-12 01:01:37 UTC (rev 795) @@ -261,9 +261,9 @@ realmName = property(lambda self: self.manager.realmName) def __repr__(self): - return "<%s %r: %r>" % (self.__class__.__name__, self.realmName, self.xmlFile) + return "<%s %r: %r>" % (self.__class__.__name__, self.realmName, self.manager.dbpath) - def __init__(self, dbParentPath, xmlFile = None): + def __init__(self, dbParentPath, xmlFile=None): super(SQLDirectoryService, self).__init__() if type(dbParentPath) is str:

1 0

[794] CalendarServer/trunk/twistedcaldav/static.py
by source_changes＠macosforge.org 11 Dec '06

11 Dec '06

Revision: 794 http://trac.macosforge.org/projects/calendarserver/changeset/794 Author: wsanchez(a)apple.com Date: 2006-12-11 15:38:57 -0800 (Mon, 11 Dec 2006) Log Message: ----------- musical chairs Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-11 21:55:57 UTC (rev 793) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-11 23:38:57 UTC (rev 794) @@ -22,11 +22,11 @@ __all__ = [ "CalDAVFile", - "ScheduleInboxFile", - "ScheduleOutboxFile", "CalendarHomeFile", "CalendarHomeProvisioningFile", "CalendarPrincipalCollectionFile", + "ScheduleInboxFile", + "ScheduleOutboxFile", ] import os @@ -406,29 +406,6 @@ def supportedPrivileges(self, request): return succeed(schedulePrivilegeSet) -class ScheduleInboxFile (ScheduleInboxResource, ScheduleFile): - """ - Calendar scheduling inbox collection resource. - """ - def provision(self): - if provisionFile(self, self._parent): - # FIXME: This should probably be a directory record option that - # maps to the property value directly without the need to store one. - if self._parent.record.recordType == "resource": - # Resources should have autorespond turned on by default, - # since they typically don't have someone responding for them. - self.writeDeadProperty(customxml.TwistedScheduleAutoRespond()) - - def __repr__(self): - return "<%s (calendar inbox collection): %s>" % (self.__class__.__name__, self.fp.path) - -class ScheduleOutboxFile (ScheduleOutboxResource, ScheduleFile): - """ - Calendar scheduling outbox collection resource. - """ - def __repr__(self): - return "<%s (calendar outbox collection): %s>" % (self.__class__.__name__, self.fp.path) - class CalendarHomeProvisioningFile (DirectoryCalendarHomeProvisioningResource, DAVFile): """ Resource which provisions calendar home collections as needed. @@ -526,6 +503,29 @@ return super(CalendarHomeFile, self).getChild(name) +class ScheduleInboxFile (ScheduleInboxResource, ScheduleFile): + """ + Calendar scheduling inbox collection resource. + """ + def provision(self): + if provisionFile(self, self._parent): + # FIXME: This should probably be a directory record option that + # maps to the property value directly without the need to store one. + if self._parent.record.recordType == "resource": + # Resources should have autorespond turned on by default, + # since they typically don't have someone responding for them. + self.writeDeadProperty(customxml.TwistedScheduleAutoRespond()) + + def __repr__(self): + return "<%s (calendar inbox collection): %s>" % (self.__class__.__name__, self.fp.path) + +class ScheduleOutboxFile (ScheduleOutboxResource, ScheduleFile): + """ + Calendar scheduling outbox collection resource. + """ + def __repr__(self): + return "<%s (calendar outbox collection): %s>" % (self.__class__.__name__, self.fp.path) + ## # Utilities ##

1 0

[793] CalendarServer/trunk/twistedcaldav/directory/directory.py
by source_changes＠macosforge.org 11 Dec '06

11 Dec '06

Revision: 793 http://trac.macosforge.org/projects/calendarserver/changeset/793 Author: cdaboo(a)apple.com Date: 2006-12-11 13:55:57 -0800 (Mon, 11 Dec 2006) Log Message: ----------- Fix log messages. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/directory.py Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/directory.py 2006-12-11 21:54:00 UTC (rev 792) +++ CalendarServer/trunk/twistedcaldav/directory/directory.py 2006-12-11 21:55:57 UTC (rev 793) @@ -56,10 +56,10 @@ assert self.baseGUID, "Class %s must provide a baseGUID attribute" % (self.__class__.__name__,) if realmName is None: - log.err("Directory service %s has no realm name or GUID; generated service GUID will not be unique.") + log.err("Directory service %s has no realm name or GUID; generated service GUID will not be unique." % (self,)) realmName = "" else: - log.err("Directory service %s has no GUID; generating service GUID from realm name.") + log.err("Directory service %s has no GUID; generating service GUID from realm name." % (self,)) self._guid = uuidFromName(self.baseGUID, realmName)

1 0

[792] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 11 Dec '06

11 Dec '06

Revision: 792 http://trac.macosforge.org/projects/calendarserver/changeset/792 Author: cdaboo(a)apple.com Date: 2006-12-11 13:54:00 -0800 (Mon, 11 Dec 2006) Log Message: ----------- Fix and clean dropbox provisioning. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/config.py CalendarServer/trunk/twistedcaldav/dropbox.py CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2006-12-11 20:42:10 UTC (rev 791) +++ CalendarServer/trunk/twistedcaldav/config.py 2006-12-11 21:54:00 UTC (rev 792) @@ -30,12 +30,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, Modified: CalendarServer/trunk/twistedcaldav/dropbox.py =================================================================== --- CalendarServer/trunk/twistedcaldav/dropbox.py 2006-12-11 20:42:10 UTC (rev 791) +++ CalendarServer/trunk/twistedcaldav/dropbox.py 2006-12-11 21:54:00 UTC (rev 792) @@ -41,20 +41,15 @@ notificationName = "notifications" # Name of the collection in which notifications will be stored. @classmethod - def enable(clzz, enabled, inheritedACLs=None, notifications=None): + def enable(clzz, enabled, 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 @param enable: C{True} if drop box feature is enabled, C{False} otherwise - @param dropboxName: C{str} containing the name of the drop box home collection - @param inheritedACLs: C{True} if ACLs on drop boxes should be inherited by their contents, C{False} otehrwise. @param notifications: C{True} if automatic notifications are to be sent when a drop box changes, C{False} otherwise. - @param notificationName: C{str} containing the name of the collection used to store per-user notifications. """ DropBox.enabled = enabled - if inheritedACLs: - DropBox.inheritedACLs = inheritedACLs if notifications: DropBox.notifications = notifications Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2006-12-11 20:42:10 UTC (rev 791) +++ CalendarServer/trunk/twistedcaldav/tap.py 2006-12-11 21:54:00 UTC (rev 792) @@ -41,6 +41,7 @@ from twisted.web2.server import Site from twistedcaldav.config import config, parseConfig +from twistedcaldav.dropbox import DropBox from twistedcaldav.logging import RotatingFileAccessLoggingObserver from twistedcaldav.root import RootResource from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource @@ -83,6 +84,11 @@ def makeService(self, options): # + # Turn on drop box support before setting up the repository + # + DropBox.enable(config.DropBoxEnabled, config.NotificationsEnabled) + + # # Setup the Directory #

1 0