[CalendarServer-changes] [2592] CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav

[source_changes at macosforge.org]

Revision: 2592
          http://trac.macosforge.org/projects/calendarserver/changeset/2592
Author:   cdaboo at apple.com
Date:     2008-06-18 10:03:02 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
Property store class is now a hard-coded config option.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/config.py
    CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/extensions.py
    CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/root.py
    CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/static.py

Modified: CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/config.py	2008-06-18 16:38:11 UTC (rev 2591)
+++ CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/config.py	2008-06-18 17:03:02 UTC (rev 2592)
@@ -227,6 +227,11 @@
         self.setDefaults(defaults)
         self._data = copy.deepcopy(self._defaults)
         self._configFile = None
+        
+        from twistedcaldav.sqlprops import sqlPropertyStore
+        self.PropertyStoreClass = sqlPropertyStore
+        #from twistedcaldav.extensions import CachingXattrPropertyStore
+        #self.PropertyStoreClass = CachingXattrPropertyStore
 
     def __str__(self):
         return str(self._data)

Modified: CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/extensions.py	2008-06-18 16:38:11 UTC (rev 2591)
+++ CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/extensions.py	2008-06-18 17:03:02 UTC (rev 2592)
@@ -52,7 +52,6 @@
 from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.directory.sudo import SudoDirectoryService
 from twistedcaldav.log import Logger, LoggingMixIn
-from twistedcaldav.sqlprops import sqlPropertyStore
 from twistedcaldav.util import submodule, Alternator, printTracebacks
 
 log = Logger()
@@ -452,8 +451,8 @@
 
     def deadProperties(self):
         if not hasattr(self, "_dead_properties"):
-            self._dead_properties = sqlPropertyStore(self)
-            #self._dead_properties = CachingXattrPropertyStore(self)
+            from twistedcaldav.config import config
+            self._dead_properties = config.PropertyStoreClass(self)
         return self._dead_properties
 
     def readProperty(self, property, request):

Modified: CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/root.py
===================================================================
--- CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/root.py	2008-06-18 16:38:11 UTC (rev 2591)
+++ CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/root.py	2008-06-18 17:03:02 UTC (rev 2592)
@@ -23,7 +23,7 @@
 from twisted.web2.http import HTTPError
 from twisted.web2.auth.wrapper import UnauthorizedResponse
 
-from twistedcaldav.extensions import DAVFile, CachingXattrPropertyStore
+from twistedcaldav.extensions import DAVFile
 from twistedcaldav.config import config
 from twistedcaldav.cache import _CachedResponseResource
 from twistedcaldav.cache import MemcacheResponseCache, MemcacheChangeNotifier
@@ -31,7 +31,6 @@
 from twistedcaldav.log import Logger
 from twistedcaldav.static import CalendarHomeFile
 from twistedcaldav.directory.principal import DirectoryPrincipalResource
-from twistedcaldav.sqlprops import sqlPropertyStore
 from twistedcaldav.static import CalDAVFile
 
 log = Logger()
@@ -72,8 +71,7 @@
 
     def deadProperties(self):
         if not hasattr(self, '_dead_properties'):
-            self._dead_properties = sqlPropertyStore(self)
-            #self._dead_properties = CachingXattrPropertyStore(self)
+            self._dead_properties = config.PropertyStoreClass(self)
 
         return self._dead_properties
 

Modified: CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/static.py	2008-06-18 16:38:11 UTC (rev 2591)
+++ CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/static.py	2008-06-18 17:03:02 UTC (rev 2592)
@@ -55,7 +55,6 @@
 from twistedcaldav.caldavxml import caldav_namespace
 from twistedcaldav.config import config
 from twistedcaldav.extensions import DAVFile
-from twistedcaldav.extensions import CachingXattrPropertyStore
 from twistedcaldav.ical import Component as iComponent
 from twistedcaldav.ical import Property as iProperty
 from twistedcaldav.index import Index, IndexSchedule
@@ -69,7 +68,6 @@
 from twistedcaldav.directory.calendar import DirectoryCalendarHomeResource
 from twistedcaldav.directory.resource import AutoProvisioningResourceMixIn
 from twistedcaldav.log import Logger
-from twistedcaldav.sqlprops import sqlPropertyStore
 from twistedcaldav.timezoneservice import TimezoneServiceResource
 
 from twistedcaldav.cache import DisabledCacheNotifier, PropfindCacheMixin
@@ -88,8 +86,7 @@
 
     def deadProperties(self):
         if not hasattr(self, "_dead_properties"):
-            self._dead_properties = sqlPropertyStore(self)
-            #self._dead_properties = CachingXattrPropertyStore(self)
+            self._dead_properties = config.PropertyStoreClass(self)
 
         return self._dead_properties
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080618/8cfda461/attachment.htm