[CalendarServer-changes] [2154] CalendarServer/branches/release/CalendarServer-1.2-dev

[source_changes at macosforge.org]

Revision: 2154
          http://trac.macosforge.org/projects/calendarserver/changeset/2154
Author:   wsanchez at apple.com
Date:     2008-02-18 13:29:17 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
Pull up r2151 from trunk. (Private events.)

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.2-dev/conf/caldavd-test.plist
    CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch
    CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/method/__init__.py

Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.2-dev/conf/caldavd-test.plist	2008-02-18 19:32:59 UTC (rev 2153)
+++ CalendarServer/branches/release/CalendarServer-1.2-dev/conf/caldavd-test.plist	2008-02-18 21:29:17 UTC (rev 2154)
@@ -330,7 +330,11 @@
   <key>EnableNotifications</key>
   <true/>
 
+  <!-- Private Events -->
+  <key>EnablePrivateEvents</key>
+  <true/>
 
+
   <!--
     Twisted
   -->

Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch	2008-02-18 19:32:59 UTC (rev 2153)
+++ CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch	2008-02-18 21:29:17 UTC (rev 2154)
@@ -11,7 +11,7 @@
  
  import random
  
-@@ -37,8 +39,14 @@
+@@ -37,8 +39,13 @@
  from twisted.web2.dav.test.util import serialize
  import twisted.web2.dav.test.util
  
@@ -22,8 +22,48 @@
 +    (dav_namespace, "quota-used-bytes"          ),
 +)
  
-+live_properties = [lookupElement(qname)() for qname in DAVResource.liveProperties if (qname[0] == dav_namespace) and qname not in dynamicLiveProperties]
 +
  #
  # See whether dead properties are available
  #
+@@ -49,6 +56,10 @@
+     """
+     PROPFIND, PROPPATCH requests
+     """
++
++    def liveProperties(self):
++        return [lookupElement(qname)() for qname in self.resource_class.liveProperties if (qname[0] == dav_namespace) and qname not in dynamicLiveProperties]
++
+     def test_PROPFIND_basic(self):
+         """
+         PROPFIND request
+@@ -85,7 +96,7 @@
+                             self.fail("PROPFIND failed (status %s) to locate live properties: %s"
+                                       % (status.code, properties))
+ 
+-                        properties_to_find = [p.qname() for p in live_properties]
++                        properties_to_find = [p.qname() for p in self.liveProperties()]
+ 
+                         for property in properties:
+                             qname = property.qname()
+@@ -102,7 +113,7 @@
+             else:
+                 self.fail("No response for URI /")
+ 
+-        query = davxml.PropertyFind(davxml.PropertyContainer(*live_properties))
++        query = davxml.PropertyFind(davxml.PropertyContainer(*self.liveProperties()))
+ 
+         request = SimpleRequest(self.site, "PROPFIND", "/")
+ 
+@@ -146,9 +157,9 @@
+                               % (status.code, properties))
+ 
+                 if which.name == "allprop":
+-                    properties_to_find = [p.qname() for p in live_properties if not p.hidden]
++                    properties_to_find = [p.qname() for p in self.liveProperties() if not p.hidden]
+                 else:
+-                    properties_to_find = [p.qname() for p in live_properties]
++                    properties_to_find = [p.qname() for p in self.liveProperties()]
+ 
+                 for property in properties:
+                     qname = property.qname()

Modified: CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/method/__init__.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/method/__init__.py	2008-02-18 19:32:59 UTC (rev 2153)
+++ CalendarServer/branches/release/CalendarServer-1.2-dev/twistedcaldav/method/__init__.py	2008-02-18 21:29:17 UTC (rev 2154)
@@ -26,6 +26,7 @@
 __all__ = [
     "copymove",
     "delete",
+    "get",
     "mkcalendar",
     "mkcol",
     "put",

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