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

[source_changes at macosforge.org]

Revision: 3291
          http://trac.macosforge.org/projects/calendarserver/changeset/3291
Author:   wsanchez at apple.com
Date:     2008-10-30 17:47:28 -0700 (Thu, 30 Oct 2008)
Log Message:
-----------
Use config.defaultConfigFile instead of hard-coding the value elsewhere.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/mail.py
    CalendarServer/trunk/twistedcaldav/notify.py
    CalendarServer/trunk/twistedcaldav/tap.py

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2008-10-31 00:26:52 UTC (rev 3290)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2008-10-31 00:47:28 UTC (rev 3291)
@@ -36,7 +36,7 @@
 from twisted.web2.http_headers import MimeType
 
 from twistedcaldav import ical, caldavxml
-from twistedcaldav.config import config, parseConfig, defaultConfig
+from twistedcaldav.config import config, parseConfig, defaultConfig, defaultConfigFile
 from twistedcaldav.ical import Property
 from twistedcaldav.log import Logger, LoggingMixIn
 from twistedcaldav.resource import CalDAVResource
@@ -66,7 +66,7 @@
 
 class MailGatewayOptions(Options):
     optParameters = [[
-        "config", "f", "/etc/caldavd/caldavd.plist", "Path to configuration file."
+        "config", "f", defaultConfigFile, "Path to configuration file."
     ]]
 
     def __init__(self, *args, **kwargs):

Modified: CalendarServer/trunk/twistedcaldav/notify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notify.py	2008-10-31 00:26:52 UTC (rev 3290)
+++ CalendarServer/trunk/twistedcaldav/notify.py	2008-10-31 00:47:28 UTC (rev 3291)
@@ -49,7 +49,7 @@
 from twisted.words.protocols.jabber.xmlstream import IQ
 from twisted.words.xish import domish
 from twistedcaldav.log import LoggingMixIn
-from twistedcaldav.config import config, parseConfig, defaultConfig
+from twistedcaldav.config import config, parseConfig, defaultConfig, defaultConfigFile
 from twistedcaldav.memcacher import Memcacher
 from twistedcaldav import memcachepool
 from zope.interface import Interface, implements
@@ -1184,7 +1184,7 @@
 
 class NotificationOptions(Options):
     optParameters = [[
-        "config", "f", "/etc/caldavd/caldavd.plist", "Path to configuration file."
+        "config", "f", defaultConfigFile, "Path to configuration file."
     ]]
 
     def __init__(self, *args, **kwargs):

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2008-10-31 00:26:52 UTC (rev 3290)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2008-10-31 00:47:28 UTC (rev 3291)
@@ -43,7 +43,7 @@
 from twistedcaldav.accesslog import RotatingFileAccessLoggingObserver
 from twistedcaldav.accesslog import AMPCommonAccessLoggingObserver
 from twistedcaldav.cluster import makeService_Combined, makeService_Master
-from twistedcaldav.config import config, parseConfig, defaultConfig, ConfigurationError
+from twistedcaldav.config import config, parseConfig, defaultConfig, defaultConfigFile, ConfigurationError
 from twistedcaldav.root import RootResource
 from twistedcaldav.resource import CalDAVResource
 from twistedcaldav.directory.digest import QopDigestCredentialFactory
@@ -84,7 +84,7 @@
 
 class CalDAVOptions(Options):
     optParameters = [[
-        "config", "f", "/etc/caldavd/caldavd.plist", "Path to configuration file."
+        "config", "f", defaultConfigFile, "Path to configuration file."
     ]]
 
     zsh_actions = {"config" : "_files -g '*.plist'"}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081030/de0131f4/attachment.html>