[CalendarServer-changes] [12934] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools

[source_changes at macosforge.org]

Revision: 12934
          http://trac.calendarserver.org//changeset/12934
Author:   sagen at apple.com
Date:     2014-03-17 16:43:49 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
Remove more uses of getDirectory()

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/calverify.py
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/migrate.py
    CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/calverify.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/calverify.py	2014-03-17 20:57:56 UTC (rev 12933)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/calverify.py	2014-03-17 23:43:49 UTC (rev 12934)
@@ -80,7 +80,6 @@
 from calendarserver.tools.cmdline import utilityMain, WorkerService
 
 from calendarserver.tools import tables
-from calendarserver.tools.util import getDirectory
 
 log = Logger()
 
@@ -396,7 +395,7 @@
         self.output = output
         self.reactor = reactor
         self.config = config
-        self._directory = None
+        self._directory = store.directoryService()
 
         self.cuaCache = {}
 
@@ -427,11 +426,8 @@
 
     def directoryService(self):
         """
-        Get an appropriate directory service for this L{CalVerifyService}'s
-        configuration, creating one first if necessary.
+        Return the directory service
         """
-        if self._directory is None:
-            self._directory = getDirectory(self.config)
         return self._directory
 
 

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/migrate.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/migrate.py	2014-03-17 20:57:56 UTC (rev 12933)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/migrate.py	2014-03-17 23:43:49 UTC (rev 12934)
@@ -33,8 +33,9 @@
 from twistedcaldav.config import ConfigurationError
 from twistedcaldav.upgrade import upgradeData
 
-from calendarserver.tools.util import loadConfig, getDirectory
+from calendarserver.tools.util import loadConfig
 
+
 def usage(e=None):
     if e:
         print(e)
@@ -81,7 +82,6 @@
 
     try:
         config = loadConfig(configFileName)
-        config.directory = getDirectory()
     except ConfigurationError, e:
         sys.stdout.write("%s\n" % (e,))
         sys.exit(1)
@@ -90,7 +90,7 @@
 
     if profiling:
         import cProfile
-        cProfile.runctx("upgradeData(c)", globals(), {"c" : config}, "/tmp/upgrade.prof")
+        cProfile.runctx("upgradeData(c)", globals(), {"c": config}, "/tmp/upgrade.prof")
     else:
         upgradeData(config)
 

Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py	2014-03-17 20:57:56 UTC (rev 12933)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py	2014-03-17 23:43:49 UTC (rev 12934)
@@ -35,7 +35,8 @@
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 
 from calendarserver.platform.darwin.od import dsattributes
-from calendarserver.tools.util import loadConfig, getDirectory, setupMemcached, checkDirectory
+from calendarserver.tools.util import loadConfig, setupMemcached, checkDirectory
+from txdav.who.util import directoryFromConfig
 
 log = Logger()
 
@@ -141,17 +142,18 @@
         os.umask(config.umask)
 
         # Configure memcached client settings prior to setting up resource
-        # hierarchy (in getDirectory)
+        # hierarchy
         setupMemcached(config)
 
         try:
-            config.directory = getDirectory()
+            config.directory = directoryFromConfig(config)
         except DirectoryError, e:
             abort(e)
 
     except ConfigurationError, e:
         abort(e)
 
+    # FIXME: this all has to change:
     # Find the opendirectory service
     userService = config.directory.serviceForRecordType("users")
     resourceService = config.directory.serviceForRecordType("resources")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140317/b728e944/attachment-0001.html>