Revision: 3629 http://trac.macosforge.org/projects/calendarserver/changeset/3629 Author: cdaboo@apple.com Date: 2009-01-31 19:03:25 -0800 (Sat, 31 Jan 2009) Log Message: ----------- Merged forward from trunk. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/calendarserver/tap/caldav.py Modified: CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/calendarserver/tap/caldav.py =================================================================== --- CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/calendarserver/tap/caldav.py 2009-02-01 03:01:26 UTC (rev 3628) +++ CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/calendarserver/tap/caldav.py 2009-02-01 03:03:25 UTC (rev 3629) @@ -1,5 +1,5 @@ ## -# Copyright (c) 2005-2008 Apple Inc. All rights reserved. +# Copyright (c) 2005-2009 Apple Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -507,12 +507,13 @@ # # IMIP delivery resource # - self.log_info("Setting up iMIP inbox resource: %r" - % (self.imipResourceClass,)) + if config.Scheduling.iMIP.Enabled: + self.log_info("Setting up iMIP inbox resource: %r" + % (self.imipResourceClass,)) + + imipInbox = self.imipResourceClass(root) + root.putChild("inbox", imipInbox) - imipInbox = self.imipResourceClass(root) - root.putChild("inbox", imipInbox) - # # Configure ancillary data #