<!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>[15409] CalendarServer/trunk</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/15409">15409</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-21 13:27:08 -0800 (Mon, 21 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Config clean-up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolstestdeprovisioncaldavdplist">CalendarServer/trunk/calendarserver/tools/test/deprovision/caldavd.plist</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstestgatewaycaldavdplist">CalendarServer/trunk/calendarserver/tools/test/gateway/caldavd.plist</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstestprincipalscaldavdplist">CalendarServer/trunk/calendarserver/tools/test/principals/caldavd.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdappleplist">CalendarServer/trunk/conf/caldavd-apple.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdstdconfigplist">CalendarServer/trunk/conf/caldavd-stdconfig.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtestpodAplist">CalendarServer/trunk/conf/caldavd-test-podA.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtestpodBplist">CalendarServer/trunk/conf/caldavd-test-podB.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtests2splist">CalendarServer/trunk/conf/caldavd-test-s2s.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtestplist">CalendarServer/trunk/conf/caldavd-test.plist</a></li>
<li><a href="#CalendarServertrunkconfcaldavdplist">CalendarServer/trunk/conf/caldavd.plist</a></li>
<li><a href="#CalendarServertrunkconfresourcescaldavdresourcesplist">CalendarServer/trunk/conf/resources/caldavd-resources.plist</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdumpconfigpy">CalendarServer/trunk/twistedcaldav/dumpconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_dumpconfigpy">CalendarServer/trunk/twistedcaldav/test/test_dumpconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretestutilpy">CalendarServer/trunk/txdav/common/datastore/test/util.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_utilpy">CalendarServer/trunk/txdav/who/test/test_util.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoutilpy">CalendarServer/trunk/txdav/who/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolstestdeprovisioncaldavdplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/deprovision/caldavd.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/deprovision/caldavd.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/calendarserver/tools/test/deprovision/caldavd.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> <key>DirectoryService</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> <key>Enabled</key>
</span><span class="cx"> <true/>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -162,24 +162,7 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Open Directory Service (Mac OS X) -->
</del><span class="cx"> <!--
</span><del>- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- <key>cacheTimeout</key>
- <integer>30</integer>
- </dict>
- </dict>
- -->
-
- <!--
</del><span class="cx"> Augment service
</span><span class="cx">
</span><span class="cx"> Augments for the directory service records to add calendar specific attributes.
</span><span class="lines">@@ -190,8 +173,10 @@
</span><span class="cx"> <!-- XML File Augment Service -->
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -202,38 +187,6 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Sqlite Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentSqliteDB</string>
-
- <key>params</key>
- <dict>
- <key>dbpath</key>
- <string>/etc/caldavd/augments.sqlite</string>
- </dict>
- </dict>
- -->
-
- <!-- PostgreSQL Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentPostgreSQLDB</string>
-
- <key>params</key>
- <dict>
- <key>host</key>
- <string>localhost</string>
- <key>database</key>
- <string>augments</string>
- </dict>
- </dict>
- -->
-
</del><span class="cx"> <!-- Sqlite ProxyDB Service -->
</span><span class="cx"> <key>ProxyDBService</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstestgatewaycaldavdplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/gateway/caldavd.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/gateway/caldavd.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/calendarserver/tools/test/gateway/caldavd.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> <key>DirectoryService</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> <key>Enabled</key>
</span><span class="cx"> <true/>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -175,24 +175,7 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Open Directory Service (Mac OS X) -->
</del><span class="cx"> <!--
</span><del>- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- <key>cacheTimeout</key>
- <integer>30</integer>
- </dict>
- </dict>
- -->
-
- <!--
</del><span class="cx"> Augment service
</span><span class="cx">
</span><span class="cx"> Augments for the directory service records to add calendar specific attributes.
</span><span class="lines">@@ -203,8 +186,10 @@
</span><span class="cx"> <!-- XML File Augment Service -->
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -215,38 +200,6 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Sqlite Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentSqliteDB</string>
-
- <key>params</key>
- <dict>
- <key>dbpath</key>
- <string>/etc/caldavd/augments.sqlite</string>
- </dict>
- </dict>
- -->
-
- <!-- PostgreSQL Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentPostgreSQLDB</string>
-
- <key>params</key>
- <dict>
- <key>host</key>
- <string>localhost</string>
- <key>database</key>
- <string>augments</string>
- </dict>
- </dict>
- -->
-
</del><span class="cx"> <!-- Sqlite ProxyDB Service -->
</span><span class="cx"> <key>ProxyDBService</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstestprincipalscaldavdplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/principals/caldavd.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/principals/caldavd.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/calendarserver/tools/test/principals/caldavd.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> <key>DirectoryService</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> <key>Enabled</key>
</span><span class="cx"> <true/>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -167,24 +167,7 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Open Directory Service (Mac OS X) -->
</del><span class="cx"> <!--
</span><del>- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- <key>cacheTimeout</key>
- <integer>30</integer>
- </dict>
- </dict>
- -->
-
- <!--
</del><span class="cx"> Augment service
</span><span class="cx">
</span><span class="cx"> Augments for the directory service records to add calendar specific attributes.
</span><span class="lines">@@ -195,8 +178,10 @@
</span><span class="cx"> <!-- XML File Augment Service -->
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -207,38 +192,6 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Sqlite Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentSqliteDB</string>
-
- <key>params</key>
- <dict>
- <key>dbpath</key>
- <string>/etc/caldavd/augments.sqlite</string>
- </dict>
- </dict>
- -->
-
- <!-- PostgreSQL Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentPostgreSQLDB</string>
-
- <key>params</key>
- <dict>
- <key>host</key>
- <string>localhost</string>
- <key>database</key>
- <string>augments</string>
- </dict>
- </dict>
- -->
-
</del><span class="cx"> <!-- Sqlite ProxyDB Service -->
</span><span class="cx"> <key>ProxyDBService</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-apple.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-apple.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/conf/caldavd-apple.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -543,8 +543,10 @@
</span><span class="cx"> <!-- Directory searching -->
</span><span class="cx"> <key>DirectoryAddressBook</key>
</span><span class="cx"> <dict>
</span><del>- <key>Enabled</key>
- <true/>
</del><ins>+ <key>Enabled</key>
+ <true/>
+ <key>type</key>
+ <string>opendirectory</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>queryUserRecords</key>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdstdconfigplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-stdconfig.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-stdconfig.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/conf/caldavd-stdconfig.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8"?>
</span><ins>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</ins><span class="cx">
</span><span class="cx"> <!--
</span><span class="cx"> Copyright (c) 2006-2015 Apple Inc. All rights reserved.
</span><span class="lines">@@ -16,7 +17,6 @@
</span><span class="cx"> limitations under the License.
</span><span class="cx"> -->
</span><span class="cx">
</span><del>-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</del><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- Public network address information
</span><span class="lines">@@ -405,8 +405,11 @@
</span><span class="cx">
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
+
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -1075,7 +1078,7 @@
</span><span class="cx"> <true/>
</span><span class="cx">
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.opendirectorybacker.OpenDirectoryBackingService</string>
</del><ins>+ <string>opendirectory</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtestpodAplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test-podA.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test-podA.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/conf/caldavd-test-podA.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -82,8 +82,10 @@
</span><span class="cx"> <!-- XML File Augment Service -->
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtestpodBplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test-podB.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test-podB.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/conf/caldavd-test-podB.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -82,8 +82,10 @@
</span><span class="cx"> <!-- XML File Augment Service -->
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtests2splist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test-s2s.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test-s2s.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/conf/caldavd-test-s2s.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> <key>DirectoryService</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> <key>Enabled</key>
</span><span class="cx"> <true/>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -82,8 +82,10 @@
</span><span class="cx"> <!-- XML File Augment Service -->
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtestplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -329,8 +329,10 @@
</span><span class="cx"> <!-- XML File Augment Service -->
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -341,38 +343,6 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Sqlite Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentSqliteDB</string>
-
- <key>params</key>
- <dict>
- <key>dbpath</key>
- <string>./conf/auth/augments.sqlite</string>
- </dict>
- </dict>
- -->
-
- <!-- PostgreSQL Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentPostgreSQLDB</string>
-
- <key>params</key>
- <dict>
- <key>host</key>
- <string>localhost</string>
- <key>database</key>
- <string>augments</string>
- </dict>
- </dict>
- -->
-
</del><span class="cx"> <key>ProxyLoadFromFile</key>
</span><span class="cx"> <string>./conf/auth/proxies-test.xml</string>
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/conf/caldavd.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> <key>DirectoryService</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -185,23 +185,6 @@
</span><span class="cx"> <string>accounts.xml</string>
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><del>-
- <!-- Open Directory Service (Mac OS X) -->
- <!--
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- <key>cacheTimeout</key>
- <integer>30</integer>
- </dict>
- </dict>
- -->
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> <!--
</span></span></pre></div>
<a id="CalendarServertrunkconfresourcescaldavdresourcesplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/resources/caldavd-resources.plist (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/resources/caldavd-resources.plist 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/conf/resources/caldavd-resources.plist 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> <key>DirectoryService</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> <key>Enabled</key>
</span><span class="cx"> <true/>
</span><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -145,24 +145,7 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Open Directory Service (Mac OS X) -->
</del><span class="cx"> <!--
</span><del>- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- <key>cacheTimeout</key>
- <integer>30</integer>
- </dict>
- </dict>
- -->
-
- <!--
</del><span class="cx"> Augment service
</span><span class="cx">
</span><span class="cx"> Augments for the directory service records to add calendar specific attributes.
</span><span class="lines">@@ -173,8 +156,10 @@
</span><span class="cx"> <!-- XML File Augment Service -->
</span><span class="cx"> <key>AugmentService</key>
</span><span class="cx"> <dict>
</span><ins>+ <key>Enabled</key>
+ <true/>
</ins><span class="cx"> <key>type</key>
</span><del>- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
</del><ins>+ <string>xml</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -185,38 +170,6 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><del>- <!-- Sqlite Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentSqliteDB</string>
-
- <key>params</key>
- <dict>
- <key>dbpath</key>
- <string>/etc/caldavd/augments.sqlite</string>
- </dict>
- </dict>
- -->
-
- <!-- PostgreSQL Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentPostgreSQLDB</string>
-
- <key>params</key>
- <dict>
- <key>host</key>
- <string>localhost</string>
- <key>database</key>
- <string>augments</string>
- </dict>
- </dict>
- -->
-
</del><span class="cx"> <!-- Sqlite ProxyDB Service -->
</span><span class="cx"> <key>ProxyDBService</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdumpconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/dumpconfig.py (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/dumpconfig.py 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/twistedcaldav/dumpconfig.py 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -23,6 +23,25 @@
</span><span class="cx"> import re
</span><span class="cx"> import textwrap
</span><span class="cx">
</span><ins>+COPYRIGHT = """
+<!--
+ Copyright (c) 2006-2015 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.
+ -->
+"""
+
+
</ins><span class="cx"> def parseConfigItem(item):
</span><span class="cx"> """
</span><span class="cx"> Read the definition of a "DEFAULT_*" value from the stdconfig.py file so that we get
</span><span class="lines">@@ -244,6 +263,7 @@
</span><span class="cx"> pathOrFile = open(pathOrFile, "w")
</span><span class="cx"> didOpen = 1
</span><span class="cx"> writer = OrderedPlistWriter(pathOrFile)
</span><ins>+ writer.writeln(COPYRIGHT)
</ins><span class="cx"> writer.writeln("<plist version=\"1.0\">")
</span><span class="cx"> writer.writeValue(rootObject)
</span><span class="cx"> writer.writeln("</plist>")
</span><span class="lines">@@ -264,8 +284,26 @@
</span><span class="cx"> writeOrderedPlist(rootObject, f)
</span><span class="cx"> return f.getvalue()
</span><span class="cx">
</span><del>-if __name__ == '__main__':
</del><span class="cx">
</span><ins>+
+def writeStdConfig(data):
+ """
+ Write the actual plist data to conf/caldavd-stdconfig.plist.
+
+ @param data: plist data
+ @type data: L{str}
+ """
+
+ with open(os.path.join(os.path.dirname(os.path.dirname(__file__)), "conf", "caldavd-stdconfig.plist"), "w") as f:
+ f.write(data)
+
+
+
+def dumpConfig():
+ """
+ Dump the full stdconfig to a string.
+ """
+
</ins><span class="cx"> # Generate a set of serialized JSON objects for the *_PARAMS config items
</span><span class="cx"> maps = {
</span><span class="cx"> "DEFAULT_SERVICE_PARAMS": "",
</span><span class="lines">@@ -281,4 +319,11 @@
</span><span class="cx"> # Generate the plist for the default config, substituting for the *_PARAMS items
</span><span class="cx"> lines = parseConfigItem("DEFAULT_CONFIG")
</span><span class="cx"> j = processConfig(lines, with_comments=True, verbose=False, substitutions=maps)
</span><del>- print(writeOrderedPlistToString(j))
</del><ins>+ return writeOrderedPlistToString(j)
+
+
+if __name__ == '__main__':
+
+ data = dumpConfig()
+ writeStdConfig(data)
+ print(data)
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -116,27 +116,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DEFAULT_AUGMENT_PARAMS = {
</span><del>- "twistedcaldav.directory.augment.AugmentXMLDB": {
</del><ins>+ "xml": {
</ins><span class="cx"> "xmlFiles": ["augments.xml"],
</span><span class="cx"> "statSeconds": 15,
</span><span class="cx"> },
</span><del>- "twistedcaldav.directory.augment.AugmentSqliteDB": {
- "dbpath": "augments.sqlite",
- },
- "twistedcaldav.directory.augment.AugmentPostgreSQLDB": {
- "host": "localhost",
- "database": "augments",
- "user": "",
- "password": "",
- },
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> DEFAULT_DIRECTORY_ADDRESSBOOK_PARAMS = {
</span><del>- "twistedcaldav.directory.xmlfile.XMLDirectoryService": {
- "xmlFile": "/etc/carddavd/accounts.xml",
- },
- "twistedcaldav.directory.opendirectorybacker.OpenDirectoryBackingService": {
</del><ins>+ "opendirectory": {
</ins><span class="cx"> "queryPeopleRecords": True,
</span><span class="cx"> "peopleNode": "/Search/Contacts",
</span><span class="cx"> "queryUserRecords": True,
</span><span class="lines">@@ -354,8 +342,9 @@
</span><span class="cx"> # Augments for the directory service records to add calendar specific attributes.
</span><span class="cx"> #
</span><span class="cx"> "AugmentService": {
</span><del>- "type": "twistedcaldav.directory.augment.AugmentXMLDB",
- "params": DEFAULT_AUGMENT_PARAMS["twistedcaldav.directory.augment.AugmentXMLDB"],
</del><ins>+ "Enabled": True,
+ "type": "xml",
+ "params": DEFAULT_AUGMENT_PARAMS["xml"],
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> #
</span><span class="lines">@@ -661,8 +650,8 @@
</span><span class="cx"> # CardDAV Features
</span><span class="cx"> "DirectoryAddressBook": {
</span><span class="cx"> "Enabled": True,
</span><del>- "type": "twistedcaldav.directory.opendirectorybacker.OpenDirectoryBackingService",
- "params": DEFAULT_DIRECTORY_ADDRESSBOOK_PARAMS["twistedcaldav.directory.opendirectorybacker.OpenDirectoryBackingService"],
</del><ins>+ "type": "opendirectory",
+ "params": DEFAULT_DIRECTORY_ADDRESSBOOK_PARAMS["opendirectory"],
</ins><span class="cx"> "name": "directory",
</span><span class="cx"> "MaxQueryResults": 1000,
</span><span class="cx"> },
</span><span class="lines">@@ -1500,21 +1489,22 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _postUpdateAugmentService(configDict, reloading=False):
</span><del>- if configDict.AugmentService.type in DEFAULT_AUGMENT_PARAMS:
- for param in tuple(configDict.AugmentService.params):
- if param not in DEFAULT_AUGMENT_PARAMS[configDict.AugmentService.type]:
- log.warn("Parameter {p} is not supported by service {t}", p=param, t=configDict.AugmentService.type)
- del configDict.AugmentService.params[param]
</del><ins>+ if configDict.AugmentService.Enabled:
+ if configDict.AugmentService.type in DEFAULT_AUGMENT_PARAMS:
+ for param in tuple(configDict.AugmentService.params):
+ if param not in DEFAULT_AUGMENT_PARAMS[configDict.AugmentService.type]:
+ log.warn("Parameter {p} is not supported by service {t}", p=param, t=configDict.AugmentService.type)
+ del configDict.AugmentService.params[param]
</ins><span class="cx">
</span><del>- # Upgrading augments.xml must be done prior to using the store/directory
- if configDict.AugmentService.type == "twistedcaldav.directory.augment.AugmentXMLDB":
- for fileName in configDict.AugmentService.params.xmlFiles:
- if fileName[0] not in ("/", "."):
- fileName = os.path.join(configDict.DataRoot, fileName)
- filePath = FilePath(fileName)
- if filePath.exists():
- from twistedcaldav.upgrade import upgradeAugmentsXML
- upgradeAugmentsXML(filePath)
</del><ins>+ # Upgrading augments.xml must be done prior to using the store/directory
+ if configDict.AugmentService.type == "xml":
+ for fileName in configDict.AugmentService.params.xmlFiles:
+ if fileName[0] not in ("/", "."):
+ fileName = os.path.join(configDict.DataRoot, fileName)
+ filePath = FilePath(fileName)
+ if filePath.exists():
+ from twistedcaldav.upgrade import upgradeAugmentsXML
+ upgradeAugmentsXML(filePath)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_dumpconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_dumpconfig.py (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_dumpconfig.py 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/twistedcaldav/test/test_dumpconfig.py 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -14,10 +14,12 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-from unittest.case import TestCase
-from twistedcaldav.dumpconfig import parseConfigItem, processConfig, \
- writeOrderedPlistToString
</del><span class="cx"> from collections import OrderedDict
</span><ins>+from difflib import unified_diff
+from twistedcaldav.dumpconfig import parseConfigItem, dumpConfig, \
+ writeOrderedPlistToString, COPYRIGHT
+from unittest.case import TestCase
+import os
</ins><span class="cx">
</span><span class="cx"> class TestDumpConfig (TestCase):
</span><span class="cx">
</span><span class="lines">@@ -54,6 +56,7 @@
</span><span class="cx"> plist = writeOrderedPlistToString(data)
</span><span class="cx"> self.assertEqual(plist, """<?xml version="1.0" encoding="UTF-8"?>
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><ins>+{copyright}
</ins><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><span class="cx"> \t<key>KeyB</key>
</span><span class="lines">@@ -72,7 +75,7 @@
</span><span class="cx"> \t<string>5</string>
</span><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span><del>-""")
</del><ins>+""".format(copyright=COPYRIGHT))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_plistWithComments(self):
</span><span class="lines">@@ -92,6 +95,7 @@
</span><span class="cx"> plist = writeOrderedPlistToString(data)
</span><span class="cx"> self.assertEqual(plist, """<?xml version="1.0" encoding="UTF-8"?>
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><ins>+{copyright}
</ins><span class="cx"> <plist version="1.0">
</span><span class="cx"> <dict>
</span><span class="cx"> \t<!-- All about KeyB -->
</span><span class="lines">@@ -109,7 +113,7 @@
</span><span class="cx"> \t<string>3</string>
</span><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span><del>-""")
</del><ins>+""".format(copyright=COPYRIGHT))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_fullPlistDump(self):
</span><span class="lines">@@ -117,19 +121,10 @@
</span><span class="cx"> Make sure a full dump of DEFAULT_CONFIG works
</span><span class="cx"> """
</span><span class="cx">
</span><del>- maps = {
- "DEFAULT_SERVICE_PARAMS": "",
- "DEFAULT_RESOURCE_PARAMS": "",
- "DEFAULT_AUGMENT_PARAMS": "",
- "DEFAULT_DIRECTORY_ADDRESSBOOK_PARAMS": "",
- }
-
- for item in maps.keys():
- lines = parseConfigItem(item)
- maps[item] = processConfig(lines, with_comments=True, verbose=False)
-
- # Generate the plist for the default config, substituting for the *_PARAMS items
- lines = parseConfigItem("DEFAULT_CONFIG")
- j = processConfig(lines, with_comments=True, verbose=False, substitutions=maps)
- result = writeOrderedPlistToString(j)
</del><ins>+ result = dumpConfig()
</ins><span class="cx"> self.assertIn('<plist version="1.0">', result)
</span><ins>+
+ # Check that caldavd-stdconfig.plist matches
+ with open(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "conf", "caldavd-stdconfig.plist")) as f:
+ actual = f.read()
+ self.assertEqual(result, actual, msg="\n".join(unified_diff(result.splitlines(), actual.splitlines())))
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/upgrade.py 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -991,8 +991,11 @@
</span><span class="cx"> # Fetch the autoSchedule assignments from resourceinfo.sqlite and store
</span><span class="cx"> # the values in augments
</span><span class="cx"> augmentService = None
</span><del>- if config.AugmentService.type:
- augmentClass = namedClass(config.AugmentService.type)
</del><ins>+ if config.AugmentService.Enabled:
+ serviceClass = {
+ "xml": "twistedcaldav.directory.augment.AugmentXMLDB",
+ }
+ augmentClass = namedClass(serviceClass[config.AugmentService.type])
</ins><span class="cx"> try:
</span><span class="cx"> augmentService = augmentClass(**config.AugmentService.params)
</span><span class="cx"> except:
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/util.py 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -753,7 +753,8 @@
</span><span class="cx"> )
</span><span class="cx"> augmentServiceInfo = ConfigDict(
</span><span class="cx"> {
</span><del>- "type": "twistedcaldav.directory.augment.AugmentXMLDB",
</del><ins>+ "Enabled": True,
+ "type": "xml",
</ins><span class="cx"> "params": {
</span><span class="cx"> "xmlFiles": ["augments.xml", ],
</span><span class="cx"> "statSeconds": 15,
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_util.py (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_util.py 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/txdav/who/test/test_util.py 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> },
</span><span class="cx"> "DirectoryService": {
</span><span class="cx"> "Enabled": True,
</span><del>- "type": "XML",
</del><ins>+ "type": "xml",
</ins><span class="cx"> "params": {
</span><span class="cx"> "xmlFile": "accounts.xml",
</span><span class="cx"> "recordTypes": ["users", "groups"],
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> },
</span><span class="cx"> "ResourceService": {
</span><span class="cx"> "Enabled": True,
</span><del>- "type": "XML",
</del><ins>+ "type": "xml",
</ins><span class="cx"> "params": {
</span><span class="cx"> "xmlFile": "resources.xml",
</span><span class="cx"> "recordTypes": ["locations", "resources", "addresses"],
</span><span class="lines">@@ -100,8 +100,7 @@
</span><span class="cx"> },
</span><span class="cx"> "AugmentService": {
</span><span class="cx"> "Enabled": True,
</span><del>- # FIXME: This still uses an actual class name:
- "type": "twistedcaldav.directory.augment.AugmentXMLDB",
</del><ins>+ "type": "xml",
</ins><span class="cx"> "params": {
</span><span class="cx"> "xmlFiles": ["augments.xml"],
</span><span class="cx"> },
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/util.py (15408 => 15409)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/util.py 2015-12-19 15:01:41 UTC (rev 15408)
+++ CalendarServer/trunk/txdav/who/util.py 2015-12-21 21:27:08 UTC (rev 15409)
</span><span class="lines">@@ -240,14 +240,18 @@
</span><span class="cx"> #
</span><span class="cx"> # Setup the Augment Service
</span><span class="cx"> #
</span><del>- if augmentServiceInfo.type:
</del><ins>+ if augmentServiceInfo.Enabled:
+ serviceClass = {
+ "xml": "twistedcaldav.directory.augment.AugmentXMLDB",
+ }
+
</ins><span class="cx"> for augmentFile in augmentServiceInfo.params.xmlFiles:
</span><span class="cx"> augmentFile = fullServerPath(dataRoot, augmentFile)
</span><span class="cx"> augmentFilePath = FilePath(augmentFile)
</span><span class="cx"> if not augmentFilePath.exists():
</span><span class="cx"> augmentFilePath.setContent(DEFAULT_AUGMENT_CONTENT)
</span><span class="cx">
</span><del>- augmentClass = namedClass(augmentServiceInfo.type)
</del><ins>+ augmentClass = namedClass(serviceClass[augmentServiceInfo.type])
</ins><span class="cx"> log.info(
</span><span class="cx"> "Configuring augment service of type: {augmentClass}",
</span><span class="cx"> augmentClass=augmentClass
</span></span></pre>
</div>
</div>
</body>
</html>