<!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>[12572] CalendarServer/trunk/txdav/dps/service.py</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/12572">12572</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-02-05 09:45:05 -0800 (Wed, 05 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>service module is now obsolete</pre>

<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpsservicepy">CalendarServer/trunk/txdav/dps/service.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpsservicepy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/txdav/dps/service.py (12571 => 12572)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/service.py        2014-02-05 17:44:38 UTC (rev 12571)
+++ CalendarServer/trunk/txdav/dps/service.py        2014-02-05 17:45:05 UTC (rev 12572)
</span><span class="lines">@@ -1,174 +0,0 @@
</span><del>-##
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-# 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 &quot;AS IS&quot; 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 twext.who.directory import DirectoryService as BaseDirectoryService
-from twext.who.directory import DirectoryRecord as BaseDirectoryRecord
-from twext.who.util import ConstantsContainer
-import twext.who.idirectory
-import txdav.who.idirectory
-
-from zope.interface import implementer
-from twext.python.log import Logger
-
-from .commands import (
-    RecordWithShortNameCommand, RecordWithUIDCommand,
-    RecordWithGUIDCommand, RecordsWithRecordTypeCommand,
-    RecordsWithEmailAddressCommand
-)
-
-from twisted.internet import reactor
-from twisted.internet.defer import inlineCallbacks, returnValue
-from twisted.internet.protocol import ClientCreator
-from twisted.protocols import amp
-import cPickle as pickle
-
-log = Logger()
-
-
-@implementer(twext.who.idirectory.IDirectoryService)
-class DirectoryService(BaseDirectoryService):
-    &quot;&quot;&quot;
-    Client side of directory proxy
-    &quot;&quot;&quot;
-
-    recordType = ConstantsContainer(
-        (twext.who.idirectory.RecordType,
-         txdav.who.idirectory.RecordType)
-    )
-
-
-    def _dictToRecord(self, serializedFields):
-        &quot;&quot;&quot;
-        This to be replaced by something awesome
-        &quot;&quot;&quot;
-        if not serializedFields:
-            return None
-
-        fields = {}
-        for fieldName, value in serializedFields.iteritems():
-            try:
-                field = self.fieldName.lookupByName(fieldName)
-            except ValueError:
-                # unknown field
-                pass
-            else:
-                fields[field] = value
-        fields[self.fieldName.recordType] = self.recordType.user
-        return DirectoryRecord(self, fields)
-
-
-    def _processSingleRecord(self, result):
-        serializedFields = pickle.loads(result['fields'])
-        return self._dictToRecord(serializedFields)
-
-
-    def _processMultipleRecords(self, result):
-        serializedFieldsList = pickle.loads(result['fieldsList'])
-        results = []
-        for serializedFields in serializedFieldsList:
-            record = self._dictToRecord(serializedFields)
-            if record is not None:
-                results.append(record)
-        return results
-
-
-    @inlineCallbacks
-    def _getConnection(self):
-        # path = config.DirectoryProxy.SocketPath
-        path = &quot;data/Logs/state/directory-proxy.sock&quot;
-        if getattr(self, &quot;_connection&quot;, None) is None:
-            log.debug(&quot;Creating connection&quot;)
-            connection = (yield ClientCreator(reactor, amp.AMP).connectUNIX(path))
-            self._connection = connection
-        else:
-            log.debug(&quot;Already have connection&quot;)
-        returnValue(self._connection)
-
-
-    def recordWithShortName(self, recordType, shortName):
-
-        def _call(ampProto):
-            return ampProto.callRemote(
-                RecordWithShortNameCommand,
-                recordType=recordType.description.encode(&quot;utf-8&quot;),
-                shortName=shortName.encode(&quot;utf-8&quot;)
-            )
-
-        d = self._getConnection()
-        d.addCallback(_call)
-        d.addCallback(self._processSingleRecord)
-        return d
-
-
-    def recordWithUID(self, uid):
-
-        def _call(ampProto):
-            return ampProto.callRemote(
-                RecordWithUIDCommand,
-                uid=uid.encode(&quot;utf-8&quot;)
-            )
-
-        d = self._getConnection()
-        d.addCallback(_call)
-        d.addCallback(self._processSingleRecord)
-        return d
-
-
-    def recordWithGUID(self, guid):
-
-        def _call(ampProto):
-            return ampProto.callRemote(
-                RecordWithGUIDCommand,
-                guid=guid.encode(&quot;utf-8&quot;)
-            )
-
-        d = self._getConnection()
-        d.addCallback(_call)
-        d.addCallback(self._processSingleRecord)
-        return d
-
-
-    def recordsWithRecordType(self, recordType):
-
-        def _call(ampProto):
-            return ampProto.callRemote(
-                RecordsWithRecordTypeCommand,
-                recordType=recordType.description.encode(&quot;utf-8&quot;)
-            )
-
-        d = self._getConnection()
-        d.addCallback(_call)
-        d.addCallback(self._processMultipleRecords)
-        return d
-
-
-    def recordsWithEmailAddress(self, emailAddress):
-
-        def _call(ampProto):
-            return ampProto.callRemote(
-                RecordsWithEmailAddressCommand,
-                emailAddress=emailAddress
-            )
-
-        d = self._getConnection()
-        d.addCallback(_call)
-        d.addCallback(self._processMultipleRecords)
-        return d
-
-
-class DirectoryRecord(BaseDirectoryRecord):
-    pass
</del></span></pre>
</div>
</div>

</body>
</html>