<!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>[14408] CalendarServer/branches/users/cdaboo/pod2pod-migration</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/14408">14408</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-12 14:10:41 -0800 (Thu, 12 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge from trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationbin_buildsh">CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/_build.sh</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationbincaldavd">CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/caldavd</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationbinpackage">CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/package</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationrequirementsdevtxt">CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-dev.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationrequirementsstabletxt">CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-stable.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationsupportApplemake">CalendarServer/branches/users/cdaboo/pod2pod-migration/support/Apple.make</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavconfigpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/config.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavmethodreport_sync_collectionpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/method/report_sync_collection.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavresourcepy">CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavstdconfigpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavtesttest_configpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_config.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavtesttest_resourcepy">CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_resource.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigration">CalendarServer/branches/users/cdaboo/pod2pod-migration/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboopod2podmigration"></a>
<div class="propset"><h4>Property changes: CalendarServer/branches/users/cdaboo/pod2pod-migration</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes-2:13657
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx">/CalendarServer/trunk:14338-14388
</span><span class="cx"> + /CalDAVTester/trunk:11193-11198
</span><span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes-2:13657
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx">/CalendarServer/trunk:14338-14407
</span><a id="CalendarServerbranchesuserscdaboopod2podmigrationbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/_build.sh (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/_build.sh 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/_build.sh 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -374,7 +374,6 @@
</span><span class="cx"> mkdir -p "${dep_sources}";
</span><span class="cx">
</span><span class="cx"> local srcdir="${dep_sources}/${path}";
</span><del>- # local dstroot="${srcdir}/_root";
</del><span class="cx"> local dstroot="${dev_roots}/${name}";
</span><span class="cx">
</span><span class="cx"> www_get ${f_hash} "${name}" "${srcdir}" "${uri}";
</span><span class="lines">@@ -385,7 +384,7 @@
</span><span class="cx"> export CPPFLAGS="-I${dstroot}/include ${CPPFLAGS:-} ";
</span><span class="cx"> export LDFLAGS="-L${dstroot}/lib -L${dstroot}/lib64 ${LDFLAGS:-} ";
</span><span class="cx"> export DYLD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:${DYLD_LIBRARY_PATH:-}";
</span><del>- export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
</del><ins>+ export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
</ins><span class="cx">
</span><span class="cx"> if "${do_setup}"; then
</span><span class="cx"> if "${force_setup}"; then
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationbincaldavd"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/caldavd (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/caldavd 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/caldavd 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-for v in "2.7" "2.6" "2.5" ""; do
</del><ins>+for v in "2.7" ""; do
</ins><span class="cx"> for p in \
</span><span class="cx"> "${PYTHON:=}" \
</span><span class="cx"> "python${v}" \
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationbinpackage"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/package (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/package 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/package 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -109,19 +109,39 @@
</span><span class="cx"> dev_roots="${destination}/roots";
</span><span class="cx"> py_virtualenv="${destination}/virtualenv";
</span><span class="cx"> py_bindir="${py_virtualenv}/bin";
</span><ins>+ py_ve_tools="${dev_home}/ve_tools";
</ins><span class="cx">
</span><ins>+ if [ ! -d "${py_virtualenv}" ]; then
+ bootstrap_virtualenv;
+ "${bootstrap_python}" -m virtualenv \
+ --always-copy \
+ --no-setuptools \
+ "${py_virtualenv}";
+ fi;
+
</ins><span class="cx"> c_dependencies;
</span><span class="cx"> py_dependencies;
</span><span class="cx">
</span><span class="cx"> install -d "${destination}/bin";
</span><span class="cx">
</span><del>- (
- cd "${destination}/bin" && \
- find ../virtualenv/bin \
- '(' -name 'caldavd' -o -name 'calendarserver_*' -o -name 'python' ')' \
- -exec ln -fs '{}' . ';';
- );
</del><ins>+ cd "${destination}/bin";
</ins><span class="cx">
</span><ins>+ find ../virtualenv/bin \
+ '(' -name 'caldavd' -o -name 'calendarserver_*' -o -name 'python' ')' \
+ -exec ln -fs '{}' . ';' \
+ ;
+
+ for executable in \
+ "memcached/bin/memcached" \
+ "openssl/bin/openssl" \
+ "PostgreSQL/bin/psql" \
+ "PostgreSQL/bin/pg_dump" \
+ "PostgreSQL/bin/pg_dumpall" \
+ "PostgreSQL/bin/pg_restore" \
+ ; do
+ ln -s "../roots/${executable}" .;
+ done;
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-dev.txt (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-dev.txt 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-dev.txt 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14383#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14406#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-stable.txt (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-stable.txt 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-stable.txt 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14351#egg=twextpy
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14404#egg=twextpy
</ins><span class="cx"> cffi==0.8.6
</span><span class="cx"> pycparser==2.10
</span><span class="cx"> #twisted
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationsupportApplemake"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/support/Apple.make (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/support/Apple.make 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/support/Apple.make 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -144,10 +144,6 @@
</span><span class="cx"> $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)";
</span><span class="cx"> $(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist";
</span><span class="cx">
</span><del>-# install:: install-logdir-omg-hack-ew
-# install-logdir-omg-hack-ew::
-# $(_v) $(INSTALL_DIRECTORY) -o "$(CS_USER)" -g "$(CS_GROUP)" -m 0755 "$(DSTROOT)$(VARDIR)/log$(CALDAVDSUBDIR)";
-
</del><span class="cx"> install:: install-commands
</span><span class="cx"> install-commands::
</span><span class="cx"> @echo "Installing links to executables...";
</span><span class="lines">@@ -213,17 +209,3 @@
</span><span class="cx"> @echo "Copying source for $(Project) to build directory...";
</span><span class="cx"> $(_v) $(MKDIR) -p "$@";
</span><span class="cx"> $(_v) cp -a "$(Sources)/" "$@/";
</span><del>-
-#
-# Open Source Hooey
-#
-
-OSV = $(USRDIR)/local/OpenSourceVersions
-OSL = $(USRDIR)/local/OpenSourceLicenses
-
-#install:: install-ossfiles
-install-ossfiles::
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSV)";
- $(_v) $(INSTALL_FILE) "$(Sources)/$(ProjectName).plist" "$(DSTROOT)/$(OSV)/$(ProjectName).plist";
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSL)";
- $(_v) $(INSTALL_FILE) "$(BuildDirectory)/$(Project)/LICENSE" "$(DSTROOT)/$(OSL)/$(ProjectName).txt";
</del></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/config.py (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/config.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/config.py 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -22,8 +22,9 @@
</span><span class="cx"> "config",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+import copy
+import hashlib
</ins><span class="cx"> import os
</span><del>-import copy
</del><span class="cx">
</span><span class="cx"> class ConfigurationError(RuntimeError):
</span><span class="cx"> """
</span><span class="lines">@@ -262,6 +263,7 @@
</span><span class="cx">
</span><span class="cx"> self._updating = False
</span><span class="cx"> self._dirty = False
</span><ins>+ self._cachedSyncToken = None
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def load(self, configFile):
</span><span class="lines">@@ -297,9 +299,89 @@
</span><span class="cx"> def reset(self):
</span><span class="cx"> self._data = ConfigDict(copy.deepcopy(self._provider.getDefaults()))
</span><span class="cx"> self._dirty = True
</span><ins>+ self._syncTokenKeys = []
+ self._cachedSyncToken = None
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def getKeyPath(self, keyPath):
+ """
+ Allows the getting of arbitrary nested dictionary keys via a single
+ dot-separated string. For example, getKeyPath(self, "foo.bar.baz")
+ would fetch parent["foo"]["bar"]["baz"]. If any of the keys don't
+ exist, None is returned instead.
+
+ @param keyPath: a dot-delimited string specifying the path of keys to
+ traverse
+ @type keyPath: C{str}
+ @return: the value at keyPath
+ """
+ parent = self
+ parts = keyPath.split(".")
+ for part in parts[:-1]:
+ child = parent.get(part, None)
+ if child is None:
+ return None
+ parent = child
+ return parent.get(parts[-1], None)
+
+
+ def addSyncTokenKey(self, keyPath):
+ """
+ Indicates the specified key should be taken into account when generating
+ the sync token. Also invalidates the (possibly) cached syncToken.
+
+ @param keyPath: a dot-delimited string specifying the path of keys to
+ traverse
+ @type keyPath: C{str}
+ """
+ if keyPath not in self._syncTokenKeys:
+ self._syncTokenKeys.append(keyPath)
+ self._cachedSyncToken = None
+
+
+ def syncToken(self):
+ """
+ Iterates the previously registered keys (sorted, so the order in which
+ the keys were registered doesn't affect the hash) and generates an MD5
+ hash of the combined values. The hash is cached, and is invalidated
+ during a reload or if invalidateSyncToken is called.o
+
+ @return: the sync token
+ @rtype: C{str}
+ """
+ if self._cachedSyncToken is None:
+ pieces = []
+ self._syncTokenKeys.sort()
+ for key in self._syncTokenKeys:
+ value = self.getKeyPath(key)
+ if value is None:
+ value = ""
+ pieces.append(key + ":" + str(value))
+ whole = "|".join(pieces)
+ self._cachedSyncToken = hashlib.md5(whole).hexdigest()
+ return self._cachedSyncToken
+
+
+ def invalidateSyncToken(self):
+ """
+ Invalidates the cached copy of the sync token.
+ """
+ self._cachedSyncToken = None
+
+
+ def joinToken(self, dataToken):
+ """
+ Joins the config sync token with the dataToken. If EnableConfigSyncToken
+ is False, the original dataToken is just returned
+ """
+ if self.EnableConfigSyncToken:
+ configToken = self.syncToken()
+ return "{}/{}".format(dataToken, configToken)
+ else:
+ return dataToken
+
+
</ins><span class="cx"> def mergeData(oldData, newData):
</span><span class="cx"> """
</span><span class="cx"> Merge two ConfigDict objects; oldData will be updated with all the keys
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavmethodreport_sync_collectionpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/method/report_sync_collection.py (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/method/report_sync_collection.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/method/report_sync_collection.py 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> # the child resource loop and supply those to the checkPrivileges on each child.
</span><span class="cx"> filteredaces = (yield self.inheritedACEsforChildren(request))
</span><span class="cx">
</span><del>- changed, removed, notallowed, newtoken = yield self.whatchanged(sync_collection.sync_token, depth)
</del><ins>+ changed, removed, notallowed, newtoken, resourceChanged = yield self.whatchanged(sync_collection.sync_token, depth)
</ins><span class="cx">
</span><span class="cx"> # Now determine which valid resources are readable and which are not
</span><span class="cx"> ok_resources = []
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> inherited_aces=filteredaces
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ if resourceChanged:
+ ok_resources.append((self, request.uri))
+
</ins><span class="cx"> for child, child_uri in ok_resources:
</span><span class="cx"> href = element.HRef.fromString(child_uri)
</span><span class="cx"> try:
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/resource.py (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/resource.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/resource.py 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -1183,15 +1183,27 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def whatchanged(self, client_token, depth):
</span><ins>+
+ client_data_token = None
+ client_config_token = None
+
+ if client_token:
+ if "/" in client_token:
+ client_data_token, client_config_token = client_token.split("/")
+ else:
+ client_data_token = client_token
+
</ins><span class="cx"> current_token = (yield self.getSyncToken())
</span><ins>+ if "/" in current_token:
+ current_token = current_token.split("/")[0]
</ins><span class="cx"> current_uuid, current_revision = current_token[6:].split("_", 1)
</span><span class="cx"> current_revision = int(current_revision)
</span><span class="cx">
</span><del>- if client_token:
</del><ins>+ if client_data_token:
</ins><span class="cx"> try:
</span><del>- if not client_token.startswith("data:,"):
</del><ins>+ if not client_data_token.startswith("data:,"):
</ins><span class="cx"> raise ValueError
</span><del>- caluuid, revision = client_token[6:].split("_", 1)
</del><ins>+ caluuid, revision = client_data_token[6:].split("_", 1)
</ins><span class="cx"> revision = int(revision)
</span><span class="cx">
</span><span class="cx"> # Check client token validity
</span><span class="lines">@@ -1217,9 +1229,19 @@
</span><span class="cx"> "Sync token not recognized",
</span><span class="cx"> ))
</span><span class="cx">
</span><del>- returnValue((changed, removed, notallowed, current_token))
</del><ins>+ if config.EnableConfigSyncToken:
+ # Append the app-level portion of sync token (e.g. derived from config)
+ newConfigToken = config.syncToken()
+ current_token = "{}/{}".format(current_token, newConfigToken)
</ins><span class="cx">
</span><ins>+ # If the config token changed, note that in the returned tuple
+ resourceChanged = (newConfigToken != client_config_token)
+ else:
+ resourceChanged = False
</ins><span class="cx">
</span><ins>+ returnValue((changed, removed, notallowed, current_token, resourceChanged))
+
+
</ins><span class="cx"> def _indexWhatChanged(self, revision, depth):
</span><span class="cx"> # Now handled directly by newstore
</span><span class="cx"> raise NotImplementedError
</span><span class="lines">@@ -1232,7 +1254,9 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> internal_token = (yield self.getInternalSyncToken())
</span><del>- returnValue("data:,%s" % (internal_token,))
</del><ins>+ internal_token = "data:,%s" % (internal_token,)
+ token = config.joinToken(internal_token)
+ returnValue(token)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def getInternalSyncToken(self):
</span><span class="lines">@@ -2038,12 +2062,25 @@
</span><span class="cx"> def _mergeSyncTokens(self, hometoken, notificationtoken):
</span><span class="cx"> """
</span><span class="cx"> Merge two sync tokens, choosing the higher revision number of the two,
</span><del>- but keeping the home resource-id intact.
</del><ins>+ but keeping the home resource-id intact. If the config portion of
+ the token is present, it is also kept intact.
</ins><span class="cx"> """
</span><ins>+ if "/" in hometoken:
+ hometoken, configtoken = hometoken.split("/")
+ else:
+ configtoken = None
+
+ if "/" in notificationtoken:
+ notificationtoken = notificationtoken.split("/")[0]
+
</ins><span class="cx"> homekey, homerev = hometoken.split("_", 1)
</span><span class="cx"> notrev = notificationtoken.split("_", 1)[1]
</span><span class="cx"> if int(notrev) > int(homerev):
</span><span class="cx"> hometoken = "%s_%s" % (homekey, notrev,)
</span><ins>+
+ if configtoken:
+ hometoken = "{}/{}".format(hometoken, configtoken)
+
</ins><span class="cx"> return hometoken
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/stdconfig.py (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/stdconfig.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/stdconfig.py 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -475,6 +475,7 @@
</span><span class="cx"> "EnableAddMember" : True, # POST ;add-member extension
</span><span class="cx"> "EnableSyncReport" : True, # REPORT collection-sync
</span><span class="cx"> "EnableSyncReportHome" : True, # REPORT collection-sync on home collections
</span><ins>+ "EnableConfigSyncToken" : False, # Sync token includes config component
</ins><span class="cx"> "EnableWellKnown" : True, # /.well-known resource
</span><span class="cx"> "EnableCalendarQueryExtended" : True, # Extended calendar-query REPORT
</span><span class="cx">
</span><span class="lines">@@ -1554,6 +1555,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _updateNotifications(configDict, reloading=False):
</span><ins>+
+ # These three keys go into producing the config sync token
+ config.addSyncTokenKey("Notifications.Services.APNS.Enabled")
+ config.addSyncTokenKey("Notifications.Services.APNS.CalDAV.Topic")
+ config.addSyncTokenKey("Notifications.Services.APNS.CardDAV.Topic")
+
</ins><span class="cx"> # Reloading not supported -- requires process running as root
</span><span class="cx"> if reloading:
</span><span class="cx"> return
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavtesttest_configpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_config.py (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_config.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_config.py 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -66,6 +66,60 @@
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><ins>+ <key>Notifications</key>
+ <dict>
+
+ <key>Services</key>
+ <dict>
+
+ <key>AMP</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>Port</key>
+ <integer>62311</integer>
+ <key>EnableStaggering</key>
+ <false/>
+ <key>StaggerSeconds</key>
+ <integer>3</integer>
+ </dict>
+
+ <key>APNS</key>
+ <dict>
+ <key>CalDAV</key>
+ <dict>
+ <key>AuthorityChainPath</key>
+ <string>com.apple.calendar.chain.pem</string>
+ <key>CertificatePath</key>
+ <string>com.apple.calendar.cert.pem</string>
+ <key>PrivateKeyPath</key>
+ <string>com.apple.calendar.key.pem</string>
+ <key>Topic</key>
+ <string>calendar-topic</string>
+ <key>Passphrase</key>
+ <string>password</string>
+ </dict>
+ <key>CardDAV</key>
+ <dict>
+ <key>AuthorityChainPath</key>
+ <string>com.apple.contact.chain.pem</string>
+ <key>CertificatePath</key>
+ <string>com.apple.contact.cert.pem</string>
+ <key>PrivateKeyPath</key>
+ <string>com.apple.contact.key.pem</string>
+ <key>Topic</key>
+ <string>contact-topic</string>
+ <key>Passphrase</key>
+ <string>password</string>
+ </dict>
+ <key>Enabled</key>
+ <true/>
+ </dict>
+
+ </dict>
+
+ </dict>
+
</ins><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span><span class="cx"> """
</span><span class="lines">@@ -635,3 +689,35 @@
</span><span class="cx"> config.load(self.testMaster)
</span><span class="cx"> self.assertEquals(config.HTTPPort, 9008)
</span><span class="cx"> self.assertEquals(config.SSLPort, 8443)
</span><ins>+
+
+ def testSyncToken(self):
+ config.load(self.testConfig)
+
+ # no sync token keys specified; need to empty this array here because
+ # stdconfig is registering keys automatically
+ config._syncTokenKeys = []
+ self.assertEquals("d41d8cd98f00b204e9800998ecf8427e", config.syncToken())
+
+ # add sync token keys (some with multiple levels)
+ config.addSyncTokenKey("DefaultLogLevel")
+ config.addSyncTokenKey("Notifications.Services.APNS.Enabled")
+ config.addSyncTokenKey("Notifications.Services.APNS.CalDAV.Topic")
+ config.addSyncTokenKey("Notifications.Services.APNS.CardDAV.Topic")
+ self.assertEquals("7473205187d7a6ff0c61a2b6b04053c5", config.syncToken())
+
+ # modify a sync token key value
+ config.Notifications.Services.APNS.CalDAV.Topic = "changed"
+ # direct manipulation of config requires explicit invalidation
+ self.assertEquals("7473205187d7a6ff0c61a2b6b04053c5", config.syncToken())
+ config.invalidateSyncToken()
+ self.assertEquals("4cdbb3841625d001dc768439f5a88cba", config.syncToken())
+
+ # add a non existent key (not an error because it could exist later)
+ config.addSyncTokenKey("Notifications.Services.APNS.CalDAV.NonExistent")
+ config.invalidateSyncToken()
+ self.assertEquals("2ffb128cee5a4b217cef82fd31ae7767", config.syncToken())
+
+ # reload automatically invalidates
+ config.reload()
+ self.assertEquals("a1c46c5aff1899658dac033ee8520b07", config.syncToken())
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtwistedcaldavtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_resource.py (14407 => 14408)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_resource.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_resource.py 2015-02-12 22:10:41 UTC (rev 14408)
</span><span class="lines">@@ -111,7 +111,13 @@
</span><span class="cx"> self.assertTrue(('http://calendarserver.org/ns/', 'getctag') in resource.liveProperties())
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_commonHomeResourceMergeSyncToken(self):
+ resource = CommonHomeResource(None, None, None, StubHome())
+ self.assertEquals(resource._mergeSyncTokens("1_2/A", "1_3/A"), "1_3/A")
+ self.assertEquals(resource._mergeSyncTokens("1_2", "1_3"), "1_3")
+ self.assertEquals(resource._mergeSyncTokens("1_4", "1_3"), "1_4")
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class OwnershipTests(TestCase):
</span><span class="cx"> """
</span><span class="cx"> L{CalDAVResource.isOwner} determines if the authenticated principal of the
</span></span></pre>
</div>
</div>
</body>
</html>