[CalendarServer-changes] [199] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 199
          http://trac.macosforge.org/projects/collaboration/changeset/199
Author:   wsanchez at apple.com
Date:     2006-09-26 11:03:09 -0700 (Tue, 26 Sep 2006)

Log Message:
-----------
Get rid of CalendarPrincipalProvisioningResource.

Modified Paths:
--------------
    CalendarServer/trunk/conf/repository-static.xml
    CalendarServer/trunk/twistedcaldav/repository.py
    CalendarServer/trunk/twistedcaldav/static.py

Modified: CalendarServer/trunk/conf/repository-static.xml
===================================================================
--- CalendarServer/trunk/conf/repository-static.xml	2006-09-26 14:28:55 UTC (rev 198)
+++ CalendarServer/trunk/conf/repository-static.xml	2006-09-26 18:03:09 UTC (rev 199)
@@ -40,7 +40,7 @@
       </properties>
       <members>
         <collection name="principals">
-          <pytype>CalendarPrincipalProvisioningResource</pytype>
+          <pytype>CalDAVFile</pytype>
           <properties>
             <acl>
               <ace>
@@ -122,7 +122,6 @@
       <pswd>admin</pswd>
       <name>Super User</name>
     </user>
-    <!--
     <user repeat='99'>
       <uid>user%02d</uid>
       <pswd>user%02d</pswd>
@@ -158,7 +157,6 @@
       </acl>
       <autorespond/>
     </user>
-     -->
   </accounts>
 
 </repository>

Modified: CalendarServer/trunk/twistedcaldav/repository.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/repository.py	2006-09-26 14:28:55 UTC (rev 198)
+++ CalendarServer/trunk/twistedcaldav/repository.py	2006-09-26 18:03:09 UTC (rev 199)
@@ -42,7 +42,6 @@
 from twistedcaldav.resource import CalDAVResource
 from twistedcaldav.static import CalDAVFile, CalendarHomeFile, CalendarPrincipalFile
 from twistedcaldav.static import CalendarHomeProvisioningFile
-from twistedcaldav.static import CalendarPrincipalProvisioningResource
 from twistedcaldav.static import CalendarUserPrincipalProvisioningResource
 
 import os
@@ -105,7 +104,6 @@
 classMap = {
     "DAVFile":                                        DAVFile,
     "CalDAVFile":                                     CalDAVFile,
-    "CalendarPrincipalProvisioningResource":          CalendarPrincipalProvisioningResource,
     "CalendarUserPrincipalProvisioningResource":      CalendarUserPrincipalProvisioningResource,
     "CalendarPrincipalFile":                          CalendarPrincipalFile,
     "CalendarHomeProvisioningFile":                   CalendarHomeProvisioningFile,
@@ -117,7 +115,6 @@
 }
 
 urld = [
-    "CalendarPrincipalProvisioningResource",
     "CalendarUserPrincipalProvisioningResource",
     "DirectoryPrincipalProvisioningResource",
     "DirectoryUserPrincipalProvisioningResource",

Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py	2006-09-26 14:28:55 UTC (rev 198)
+++ CalendarServer/trunk/twistedcaldav/static.py	2006-09-26 18:03:09 UTC (rev 199)
@@ -28,7 +28,6 @@
     "CalendarHomeProvisioningFile",
     "CalendarPrincipalFile",
     "CalendarUserPrincipalProvisioningResource",
-    "CalendarPrincipalProvisioningResource",
 ]
 
 import os
@@ -954,51 +953,6 @@
     def http_MKCOL      (self, request): return responsecode.FORBIDDEN
     def http_MKCALENDAR (self, request): return responsecode.FORBIDDEN
 
-class CalendarPrincipalProvisioningResource (DAVFile):
-    """
-    L{DAVFile} resource which provisions calendar principal resources as needed.
-    """
-    def __init__(self, path, url):
-        """
-        @param path: the path to the file which will back the resource.
-        @param url: the primary URL for the resource.  Provisioned child
-            resources will use a URL based on C{url} as their primary URLs.
-        """
-        super(CalendarPrincipalProvisioningResource, self).__init__(path)
-
-        assert self.exists(), "%s should exist" % (self,)
-        assert self.isCollection(), "%s should be a collection" % (self,)
-
-        # FIXME: I don't think we need this anymore nwo that we have static & OD repository builders.
-        # Create children
-        for name, clazz in (
-            ("users/" , CalendarUserPrincipalProvisioningResource),
-        ):
-            child_fp = self.fp.child(name)
-            if not child_fp.exists(): child_fp.makedirs()
-            principalCollection = clazz(child_fp.path, joinURL(url, name))
-            self.putChild(name, principalCollection)
-
-    def initialize(self, homeuri, home):
-        """
-        May be called during repository account initialization.
-        This implementation does nothing.
-        
-        @param homeuri: C{str} uri of the calendar home root.
-        @param home: L{DAVFile} of the calendar home root.
-        """
-        pass
-    
-    def createSimilarFile(self, path):
-        return DAVFile(path)
-
-    def render(self, request):
-        return StatusResponse(
-            responsecode.OK,
-            "This collection contains principal resources",
-            title=self.displayName()
-        )
-
 ##
 # Utilities
 ##

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060926/35579310/attachment.html