[CalendarServer-changes] [2680] CalendarServer/branches/users/sagen/xmpp/twistedcaldav

source_changes at macosforge.org source_changes at macosforge.org
Fri Jul 11 08:56:23 PDT 2008


Revision: 2680
          http://trac.macosforge.org/projects/calendarserver/changeset/2680
Author:   sagen at apple.com
Date:     2008-07-11 08:56:23 -0700 (Fri, 11 Jul 2008)
Log Message:
-----------
Getting rid of the node and notify properties, just sticking witn xmpp-uri

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/xmpp/twistedcaldav/customxml.py
    CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py
    CalendarServer/branches/users/sagen/xmpp/twistedcaldav/static.py

Modified: CalendarServer/branches/users/sagen/xmpp/twistedcaldav/customxml.py
===================================================================
--- CalendarServer/branches/users/sagen/xmpp/twistedcaldav/customxml.py	2008-07-11 14:44:49 UTC (rev 2679)
+++ CalendarServer/branches/users/sagen/xmpp/twistedcaldav/customxml.py	2008-07-11 15:56:23 UTC (rev 2680)
@@ -29,8 +29,6 @@
 from twistedcaldav.ical import Component as iComponent
 
 calendarserver_namespace = "http://calendarserver.org/ns/"
-pubsubnode_namespace = "urn:ietf:params:xml:ns:webdav-event:prop:node"
-pubsubnotify_namespace = "urn:ietf:params:xml:ns:webdav-event:prop:notify"
 
 calendarserver_proxy_compliance = (
     "calendar-proxy",
@@ -246,43 +244,6 @@
     namespace = calendarserver_namespace
     name = "utc-offset"
 
-class PubSubNotifyProperty (davxml.WebDAVTextElement):
-    """
-    A calendarhomefile property to indicate whether pubsub notifications are
-    published for the resource.
-    (http://tools.ietf.org/draft/draft-hildebrand-webdav-notify/draft-hildebrand-webdav-notify-00.txt)
-    """
-    namespace = pubsubnotify_namespace
-    name = "notify"
-
-class PubSubNodeProperty (davxml.WebDAVElement):
-    """
-    A calendarhomefile property to indicate the pubsub service and node to
-    subscribe to for notifications.
-    (http://tools.ietf.org/draft/draft-hildebrand-webdav-notify/draft-hildebrand-webdav-notify-00.txt)
-    """
-    namespace = pubsubnode_namespace
-    name = "node"
-
-    allowed_children = {
-        (pubsubnode_namespace, "service"): (0, 1),
-        (pubsubnode_namespace, "nodeid"): (0, 1),
-    }
-
-class PubSubNodeId (davxml.WebDAVTextElement):
-    """
-    A pubsub node path
-    """
-    namespace = pubsubnode_namespace
-    name = "nodeid"
-
-class PubSubService (davxml.WebDAVTextElement):
-    """
-    A pubsub service name
-    """
-    namespace = pubsubnode_namespace
-    name = "service"
-
 class PubSubXMPPURIProperty (davxml.WebDAVTextElement):
     """
     A calendarhomefile property to indicate the pubsub XMPP URI to subscribe to

Modified: CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py
===================================================================
--- CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py	2008-07-11 14:44:49 UTC (rev 2679)
+++ CalendarServer/branches/users/sagen/xmpp/twistedcaldav/notify.py	2008-07-11 15:56:23 UTC (rev 2680)
@@ -33,6 +33,7 @@
 """
 
 # TODO: bindAddress to local
+# TODO: add CalDAVTester test for examining new xmpp-uri property
 
 import os
 from twisted.internet import reactor, protocol

Modified: CalendarServer/branches/users/sagen/xmpp/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/users/sagen/xmpp/twistedcaldav/static.py	2008-07-11 14:44:49 UTC (rev 2679)
+++ CalendarServer/branches/users/sagen/xmpp/twistedcaldav/static.py	2008-07-11 15:56:23 UTC (rev 2680)
@@ -564,8 +564,6 @@
 
     liveProperties = CalDAVFile.liveProperties + (
         (customxml.calendarserver_namespace, "xmpp-uri"),
-        (customxml.pubsubnode_namespace, "node"),
-        (customxml.pubsubnotify_namespace, "notify"),
     )
 
     def __init__(self, path, parent, record):
@@ -625,21 +623,6 @@
             else:
                 return succeed(customxml.PubSubXMPPURIProperty())
 
-        if qname == (customxml.pubsubnode_namespace, "node"):
-            pubSubConfiguration = getPubSubConfiguration(config)
-            if pubSubConfiguration['enabled']:
-                return succeed(customxml.PubSubNodeProperty(
-                    customxml.PubSubService(pubSubConfiguration['service']),
-                    customxml.PubSubNodeId(getPubSubPath(self.url(),
-                        pubSubConfiguration))))
-            else:
-                return succeed(customxml.PubSubNodeProperty())
-
-        elif qname == (customxml.pubsubnotify_namespace, "notify"):
-            pubSubConfiguration = getPubSubConfiguration()
-            return succeed(customxml.PubSubNotifyProperty("true" if
-                pubSubConfiguration['enabled'] else "false"))
-
         return super(CalendarHomeFile, self).readProperty(property, request)
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080711/b33a43b0/attachment.html 


More information about the calendarserver-changes mailing list