[CalendarServer-changes] [3720] CalDAVClientLibrary/trunk/src/protocol

source_changes at macosforge.org source_changes at macosforge.org
Mon Feb 23 20:09:27 PST 2009 

Revision: 3720
          http://trac.macosforge.org/projects/calendarserver/changeset/3720
Author:   cdaboo at apple.com
Date:     2009-02-23 20:09:21 -0800 (Mon, 23 Feb 2009)
Log Message:
-----------
Better printing for a bunch of new properties.

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/src/protocol/caldav/__init__.py
    CalDAVClientLibrary/trunk/src/protocol/webdav/__init__.py
    CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/davxml.py

Added Paths:
-----------
    CalDAVClientLibrary/trunk/src/protocol/caldav/definitions/csxml.py
    CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/csxml.py

Modified: CalDAVClientLibrary/trunk/src/protocol/caldav/__init__.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/caldav/__init__.py	2009-02-24 04:08:45 UTC (rev 3719)
+++ CalDAVClientLibrary/trunk/src/protocol/caldav/__init__.py	2009-02-24 04:09:21 UTC (rev 3720)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2007-2008 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2009 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 from protocol.webdav.propfindparser import PropFindParser
 from protocol.webdav.definitions import davxml
-from protocol.caldav.definitions import caldavxml
+from protocol.caldav.definitions import caldavxml, csxml
 
 PropFindParser.textProperties.add(caldavxml.calendar_description)
 PropFindParser.textProperties.add(caldavxml.calendar_timezone)
@@ -26,3 +26,5 @@
 PropFindParser.hrefListProperties.add(caldavxml.calendar_free_busy_set)
 PropFindParser.hrefProperties.add(caldavxml.schedule_outbox_URL)
 PropFindParser.hrefProperties.add(caldavxml.schedule_inbox_URL)
+PropFindParser.hrefProperties.add(csxml.calendar_proxy_read_for)
+PropFindParser.hrefProperties.add(csxml.calendar_proxy_write_for)

Added: CalDAVClientLibrary/trunk/src/protocol/caldav/definitions/csxml.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/caldav/definitions/csxml.py	                        (rev 0)
+++ CalDAVClientLibrary/trunk/src/protocol/caldav/definitions/csxml.py	2009-02-24 04:09:21 UTC (rev 3720)
@@ -0,0 +1,22 @@
+##
+# Copyright (c) 2007-2009 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from xml.etree.ElementTree import QName
+
+CSNamespace = "http://calendarserver.org/ns/"
+
+calendar_proxy_read_for    = QName(CSNamespace, "calendar-proxy-read-for")
+calendar_proxy_write_for   = QName(CSNamespace, "calendar-proxy-write-for")

Modified: CalDAVClientLibrary/trunk/src/protocol/webdav/__init__.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/__init__.py	2009-02-24 04:08:45 UTC (rev 3719)
+++ CalDAVClientLibrary/trunk/src/protocol/webdav/__init__.py	2009-02-24 04:09:21 UTC (rev 3720)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2007-2008 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2009 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 ##
 
 from protocol.webdav.propfindparser import PropFindParser
-from protocol.webdav.definitions import davxml
+from protocol.webdav.definitions import davxml, csxml
 
 PropFindParser.textProperties.add(davxml.creationdate)
 PropFindParser.textProperties.add(davxml.displayname)
@@ -24,9 +24,16 @@
 PropFindParser.textProperties.add(davxml.getcontenttype)
 PropFindParser.textProperties.add(davxml.getetag)
 PropFindParser.textProperties.add(davxml.getlastmodified)
+PropFindParser.textProperties.add(davxml.quota_available_bytes)
+PropFindParser.textProperties.add(davxml.quota_used_bytes)
 
+PropFindParser.hrefProperties.add(davxml.current_user_principal)
+PropFindParser.hrefProperties.add(davxml.owner)
+PropFindParser.hrefProperties.add(davxml.principal_URL)
+
 PropFindParser.hrefListProperties.add(davxml.principal_collection_set)
-PropFindParser.hrefProperties.add(davxml.principal_URL)
 PropFindParser.hrefListProperties.add(davxml.alternate_URI_set)
 PropFindParser.hrefListProperties.add(davxml.group_member_set)
 PropFindParser.hrefListProperties.add(davxml.group_membership)
+PropFindParser.hrefListProperties.add(csxml.expanded_group_member_set)
+PropFindParser.hrefListProperties.add(csxml.expanded_group_membership)

Added: CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/csxml.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/csxml.py	                        (rev 0)
+++ CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/csxml.py	2009-02-24 04:09:21 UTC (rev 3720)
@@ -0,0 +1,22 @@
+##
+# Copyright (c) 2007-2009 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from xml.etree.ElementTree import QName
+
+CSNamespace = "http://calendarserver.org/ns/"
+
+expanded_group_member_set    = QName(CSNamespace, "expanded-group-member-set")
+expanded_group_membership    = QName(CSNamespace, "expanded-group-membership")

Modified: CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/davxml.py
===================================================================
--- CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/davxml.py	2009-02-24 04:08:45 UTC (rev 3719)
+++ CalDAVClientLibrary/trunk/src/protocol/webdav/definitions/davxml.py	2009-02-24 04:09:21 UTC (rev 3720)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2007-2008 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2009 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -85,3 +85,8 @@
 principal_URL       = QName(DAVNamespace, "principal-URL")
 group_member_set    = QName(DAVNamespace, "group-member-set")
 group_membership    = QName(DAVNamespace, "group-membership")
+
+quota_available_bytes = QName(DAVNamespace, "quota-available-bytes")
+quota_used_bytes      = QName(DAVNamespace, "quota-used-bytes")
+
+current_user_principal = QName(DAVNamespace, "current-user-principal")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090223/53bcb79d/attachment-0001.html>

More information about the calendarserver-changes mailing list