<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12473] CalendarServer/trunk/txdav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12473">12473</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-29 19:41:32 -0800 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start calendar & contacts directory support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdav__init__py">CalendarServer/trunk/txdav/__init__.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalendarServer/trunk/txdav/who/</li>
<li><a href="#CalendarServertrunktxdavwho__init__py">CalendarServer/trunk/txdav/who/__init__.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoidirectorypy">CalendarServer/trunk/txdav/who/idirectory.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoxmlpy">CalendarServer/trunk/txdav/who/xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdav__init__py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/__init__.py (12472 => 12473)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/__init__.py        2014-01-30 02:38:31 UTC (rev 12472)
+++ CalendarServer/trunk/txdav/__init__.py        2014-01-30 03:41:32 UTC (rev 12473)
</span><span class="lines">@@ -16,5 +16,13 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> """
</span><del>-WebDAV support for Twisted.
</del><ins>+Calendar & contacts data store.
</ins><span class="cx"> """
</span><ins>+
+#
+# FIXME: 'txdav' should be renamed to 'datastore' and shoul not be
+# WebDAV-specific.
+#
+# (That means txdav.xml should be pulled out, for example, as that is
+# WebDAV-specific.)
+#
</ins></span></pre></div>
<a id="CalendarServertrunktxdavwho__init__py"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/who/__init__.py (0 => 12473)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/__init__.py         (rev 0)
+++ CalendarServer/trunk/txdav/who/__init__.py        2014-01-30 03:41:32 UTC (rev 12473)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+# -*- test-case-name: txdav.who -*-
+##
+# 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.
+##
+
+"""
+Calendar and contacts directory extentions to L{twext.who}.
+"""
</ins></span></pre></div>
<a id="CalendarServertrunktxdavwhoidirectorypy"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/who/idirectory.py (0 => 12473)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/idirectory.py         (rev 0)
+++ CalendarServer/trunk/txdav/who/idirectory.py        2014-01-30 03:41:32 UTC (rev 12473)
</span><span class="lines">@@ -0,0 +1,145 @@
</span><ins>+# -*- test-case-name: txdav.who.test -*-
+##
+# 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.
+##
+
+"""
+Calendar and contacts directory extentions to L{twext.who.idirectory}.
+"""
+
+__all__ = [
+]
+
+from twisted.python.constants import Names, NamedConstant
+
+from twext.who.idirectory import FieldName as BaseFieldName
+
+
+
+#
+# Data types
+#
+
+class RecordType(Names):
+ """
+ Constants for calendar and contacts directory record types.
+
+ @cvar location: Location record.
+ Represents a schedulable location (eg. a meeting room).
+
+ @cvar resource: Resource record.
+ Represents a schedulable resource (eg. a projector, conference line,
+ etc.).
+
+ @cvar address: Address record.
+ Represents a physical address (street address and/or geolocation).
+ """
+
+ location = NamedConstant()
+ location.description = u"location"
+
+ resource = NamedConstant()
+ resource.description = u"resource"
+
+ address = NamedConstant()
+ address.description = u"physical address"
+
+
+
+class FieldName(Names):
+ """
+ Constants for calendar and contacts directory record field names.
+
+ Fields as associated with either a single value or an iterable of values.
+
+ @cvar serviceNodeUID: For a calendar and contacts service with multiple
+ nodes, this denotes the node that the user's data resides on.
+ The associated value must be a L{unicode}.
+
+ @cvar loginAllowed: Determines whether a record can log in.
+ The associated value must be a L{bool}.
+
+ @cvar hasCalendars: Determines whether a record has calendar data.
+ The associated value must be a L{bool}.
+
+ @cvar hasContacts: Determines whether a record has contact data.
+ The associated value must be a L{bool}.
+
+ @cvar autoScheduleMode: Determines the auto-schedule mode for a record.
+ The associated value must be a L{NamedConstant}.
+
+ @cvar autoAcceptGroup: Contains the UID for a group record which contains
+ members for whom auto-accept will behave as "accept if free", even if
+ auto-accept is set to "manual".
+ The associated value must be a L{NamedConstant}.
+ """
+
+ serviceNodeUID = NamedConstant()
+ serviceNodeUID.description = u"service node UID"
+
+ loginAllowed = NamedConstant()
+ loginAllowed.description = u"login permitted"
+ loginAllowed.valueType = bool
+
+ hasCalendars = NamedConstant()
+ hasCalendars.description = u"has calendars"
+ hasCalendars.valueType = bool
+
+ hasContacts = NamedConstant()
+ hasContacts.description = u"has contacts"
+ hasCalendars.valueType = bool
+
+ autoScheduleMode = NamedConstant()
+ autoScheduleMode.description = u"auto-schedule mode"
+ autoScheduleMode.valueType = NamedConstant
+
+ autoAcceptGroup = NamedConstant()
+ autoAcceptGroup.description = u"auto-accept group"
+ autoAcceptGroup.valueType = BaseFieldName.valueType(BaseFieldName.uid)
+
+
+
+class AutoScheduleMode(Names):
+ """
+ Constants for automatic scheduling modes.
+
+ @cvar accept: Accept all invitations.
+
+ @cvar decline: Decline all invitations.
+
+ @cvar acceptIfFree: Accept invitations that do not conflict with a busy
+ time slot. Other invitations are left to be handled manually.
+
+ @cvar declineIfBusy: Decline invitations that conflict with a busy time
+ slot. Other invitations are left to be handled manually.
+ """
+
+ # default -> ?
+
+ # none -> ?
+
+ accept = NamedConstant()
+ accept.description = u"accept"
+
+ decline = NamedConstant()
+ decline.description = u"decline"
+
+ acceptIfFree = NamedConstant()
+ acceptIfFree.description = u"accept if free"
+
+ declineIfBusy = NamedConstant()
+ declineIfBusy.description = u"decline if busy"
+
+ # automatic -> ?
</ins></span></pre></div>
<a id="CalendarServertrunktxdavwhoxmlpy"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/who/xml.py (0 => 12473)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/xml.py         (rev 0)
+++ CalendarServer/trunk/txdav/who/xml.py        2014-01-30 03:41:32 UTC (rev 12473)
</span><span class="lines">@@ -0,0 +1,127 @@
</span><ins>+# -*- test-case-name: txdav.who -*-
+##
+# 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.xml}.
+"""
+
+__all__ = [
+ "DirectoryService",
+]
+
+from twisted.python.constants import Values, ValueConstant
+
+from twext.who.xml import DirectoryService as BaseDirectoryService
+from twext.who.util import ConstantsContainer
+
+from .idirectory import RecordType, FieldName
+
+
+
+#
+# Directory Service
+#
+
+class DirectoryService(BaseDirectoryService):
+ """
+ XML directory service with calendar and contacts attributes.
+ """
+
+ recordType = ConstantsContainer(
+ (BaseDirectoryService.recordType, RecordType)
+ )
+
+ fieldName = ConstantsContainer(
+ (BaseDirectoryService.fieldName, FieldName)
+ )
+
+
+
+#
+# XML constants
+#
+
+class Element(Values):
+ """
+ XML calendar and contacts element names.
+ """
+
+ # Field names
+
+ serviceNodeUID = ValueConstant(u"service-node")
+ serviceNodeUID.fieldName = FieldName.serviceNodeUID
+
+ loginAllowed = ValueConstant(u"login-allowed")
+ loginAllowed.fieldName = FieldName.loginAllowed
+
+ hasCalendars = ValueConstant(u"has-calendars")
+ hasCalendars.fieldName = FieldName.hasCalendars
+
+ hasContacts = ValueConstant(u"has-contacts")
+ hasContacts.fieldName = FieldName.hasContacts
+
+ autoScheduleMode = ValueConstant(u"auto-schedule-mode")
+ autoScheduleMode.fieldName = FieldName.autoScheduleMode
+
+ autoAcceptGroup = ValueConstant(u"auto-accept-group")
+ autoAcceptGroup.fieldName = FieldName.autoAcceptGroup
+
+
+
+class Attribute(Values):
+ """
+ XML calendar and contacts attribute names.
+ """
+
+
+
+class RecordTypeValue(Values):
+ """
+ XML attribute values for calendar and contacts record types.
+ """
+
+ location = ValueConstant(u"location")
+ location.fieldName = FieldName.location
+
+ resource = ValueConstant(u"resource")
+ resource.fieldName = FieldName.resource
+
+ address = ValueConstant(u"address")
+ address.fieldName = FieldName.address
+
+
+
+class AutoScheduleValue(Values):
+ """
+ XML attribute values for auto-schedule modes.
+ """
+ # default -> ?
+
+ # none -> ?
+
+ accept = ValueConstant(u"accept")
+
+ decline = ValueConstant(u"decline")
+
+ acceptIfFree = ValueConstant(u"accept-if-free")
+
+ declineIfBusy = ValueConstant(u"decline-if-busy")
+
+ # automatic -> ?
</ins></span></pre>
</div>
</div>
</body>
</html>