[CalendarServer-changes] [13569] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 13569
          http://trac.calendarserver.org//changeset/13569
Author:   sagen at apple.com
Date:     2014-05-29 18:36:28 -0700 (Thu, 29 May 2014)
Log Message:
-----------
Adds a calendar specific OD service which knows about locations and resources

Modified Paths:
--------------
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/txdav/who/util.py

Added Paths:
-----------
    CalendarServer/trunk/txdav/who/opendirectory.py

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2014-05-30 01:35:10 UTC (rev 13568)
+++ CalendarServer/trunk/requirements-stable.txt	2014-05-30 01:36:28 UTC (rev 13569)
@@ -5,7 +5,7 @@
 # For CalendarServer development, don't try to get these projects from PyPI; use svn.
 
 -e .
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13554#egg=twextpy
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13568#egg=twextpy
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13420#egg=pycalendar
 

Added: CalendarServer/trunk/txdav/who/opendirectory.py
===================================================================
--- CalendarServer/trunk/txdav/who/opendirectory.py	                        (rev 0)
+++ CalendarServer/trunk/txdav/who/opendirectory.py	2014-05-30 01:36:28 UTC (rev 13569)
@@ -0,0 +1,38 @@
+# -*- test-case-name: txdav.who.test.test_xml -*-
+##
+# Copyright (c) 2014 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 __future__ import print_function
+from __future__ import absolute_import
+
+"""
+Calendar and contacts directory extentions to L{twext.who.opendirectory}.
+"""
+
+__all__ = [
+    "DirectoryService",
+]
+
+from twext.who.opendirectory import DirectoryService
+
+
+
+# Hoorj OMG haxx
+from twext.who.opendirectory._constants import ODRecordType as _ODRecordType
+from .idirectory import RecordType as _CSRecordType
+
+_ODRecordType.location.recordType = _CSRecordType.location
+_ODRecordType.resource.recordType = _CSRecordType.resource

Modified: CalendarServer/trunk/txdav/who/util.py
===================================================================
--- CalendarServer/trunk/txdav/who/util.py	2014-05-30 01:35:10 UTC (rev 13568)
+++ CalendarServer/trunk/txdav/who/util.py	2014-05-30 01:36:28 UTC (rev 13569)
@@ -115,7 +115,7 @@
             directory = XMLDirectoryService(fp)
 
         elif "opendirectory" in directoryType:
-            from twext.who.opendirectory import (
+            from txdav.who.opendirectory import (
                 DirectoryService as ODDirectoryService
             )
             # We don't want system accounts returned in lookups, so tell
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140529/4196398e/attachment-0001.html>