[CalendarServer-changes] [4736] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4736
          http://trac.macosforge.org/projects/calendarserver/changeset/4736
Author:   sagen at apple.com
Date:     2009-11-10 14:36:26 -0800 (Tue, 10 Nov 2009)
Log Message:
-----------
Remove references to PythonDirectory

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2009-11-10 21:23:42 UTC (rev 4735)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2009-11-10 22:36:26 UTC (rev 4736)
@@ -1097,7 +1097,7 @@
     def deleteStaleSocketFiles(self):
         
         # Check all socket files we use.
-        for checkSocket in [config.ControlSocket, config.GlobalStatsSocket, config.PythonDirector.ControlSocket] :
+        for checkSocket in [config.ControlSocket, config.GlobalStatsSocket] :
     
             # See if the file exists.
             if (os.path.exists(checkSocket)):

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2009-11-10 21:23:42 UTC (rev 4735)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2009-11-10 22:36:26 UTC (rev 4736)
@@ -685,22 +685,6 @@
     </dict>
 
 
-    <!--
-        Python Director
-      -->
-
-    <key>PythonDirector</key>
-    <dict>
-      <key>pydir</key>
-      <string>../pydirector-1.0.0/pydir.py</string>
-
-      <key>ConfigFile</key>
-      <string>conf/pydir.xml</string>
-
-      <key>ControlSocket</key>
-      <string>logs/caldavd-pydir.sock</string>
-    </dict>
-
     <key>Localization</key>
     <dict>
       <key>LocalesDirectory</key>

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2009-11-10 21:23:42 UTC (rev 4735)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2009-11-10 22:36:26 UTC (rev 4736)
@@ -346,13 +346,6 @@
         "reactor": "select",
     },
 
-    # Python Director
-    "PythonDirector": {
-        "pydir": "/usr/share/caldavd/bin/pydir.py",
-        "ConfigFile": "/etc/caldavd/pydir.xml",
-        "ControlSocket": "/var/run/caldavd-pydir.sock",
-    },
-
     # Umask
     "umask": 0027,
 
@@ -703,13 +696,6 @@
         elif key in renamedOptions:
             renamed(key, renamedOptions[key])
 
-#       elif key == "pydirConfig":
-#           deprecated(key, "PythonDirector -> pydir")
-#           if "PythonDirector" not in cleanDict:
-#               cleanDict["PythonDirector"] = {}
-#           cleanDict["PythonDirector"]["ConfigFile"] = cleanDict["pydirConfig"]
-#           del cleanDict["pydirConfig"]
-
         else:
             unknown(key,)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091110/1bb0b7e2/attachment-0001.html>