<!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>[13480] CalDAVTester/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/13480">13480</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-15 18:21:47 -0700 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use .format() for serverinfo-template.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkodsetuppy">CalDAVTester/trunk/odsetup.py</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfotemplatexml">CalDAVTester/trunk/scripts/server/serverinfo-template.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkodsetuppy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/odsetup.py (13479 => 13480)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/odsetup.py 2014-05-16 01:04:44 UTC (rev 13479)
+++ CalDAVTester/trunk/odsetup.py 2014-05-16 01:21:47 UTC (rev 13480)
</span><span class="lines">@@ -395,13 +395,14 @@
</span><span class="cx"> for x, y in subs:
</span><span class="cx"> subs_str += subs_template % (x, y,)
</span><span class="cx">
</span><del>- data = data % {
- "hostname" : hostname,
- "nonsslport" : str(nonsslport),
- "sslport" : str(sslport),
- "authtype" : authtype,
- "overrides" : subs_str,
- }
</del><ins>+ data = data.format(
+ hostname=hostname,
+ nonsslport=str(nonsslport),
+ sslport=str(sslport),
+ authtype=authtype,
+ overrides=subs_str,
+ DAV="{DAV:}",
+ )
</ins><span class="cx">
</span><span class="cx"> fd = open(serverinfo_default, "w")
</span><span class="cx"> try:
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml (13479 => 13480)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-05-16 01:04:44 UTC (rev 13479)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-05-16 01:21:47 UTC (rev 13480)
</span><span class="lines">@@ -19,10 +19,10 @@
</span><span class="cx"> -->
</span><span class="cx">
</span><span class="cx"> <serverinfo>
</span><del>- <host>%(hostname)s</host>
- <nonsslport>%(nonsslport)s</nonsslport>
- <sslport>%(sslport)s</sslport>
- <authtype>%(authtype)s</authtype>
</del><ins>+ <host>{hostname}</host>
+ <nonsslport>{nonsslport}</nonsslport>
+ <sslport>{sslport}</sslport>
+ <authtype>{authtype}</authtype>
</ins><span class="cx">
</span><span class="cx"> <waitcount>120</waitcount>
</span><span class="cx"> <waitdelay>0.25</waitdelay>
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> <feature>attachments-collection</feature> <!-- Server uses a collection in same WebDAV tree to store attachments -->
</span><span class="cx"> <feature>auto-accept</feature> <!-- Auto-accept for rooms & locations -->
</span><span class="cx"> <feature>auto-accept-modes</feature> <!-- Auto-accept modes -->
</span><del>- <!-- <feature>dropbox</feature> --> <!-- dropbox extension -->
</del><ins>+ <!--<feature>dropbox</feature> --> <!-- dropbox extension -->
</ins><span class="cx"> <feature>default-alarms</feature> <!-- default alarms extension -->
</span><span class="cx"> <feature>EMAIL parameter</feature> <!-- Server normalizes cuaddress and adds EMAIL parameter -->
</span><span class="cx"> <feature>extended-freebusy</feature> <!-- Extended freebusy response -->
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <!-- CardDAV specific extension -->
</span><span class="cx"> <feature>carddav</feature> <!-- Basic CardDAV feature enabler -->
</span><span class="cx"> <feature>default-addressbook</feature> <!-- Default address book behavior -->
</span><del>- <!-- <feature>shared-addressbooks</feature> --> <!-- Shared address books extension -->
</del><ins>+ <feature>shared-addressbooks</feature> <!-- Shared address books extension -->
</ins><span class="cx"> <!-- <feature>directory-gateway</feature> --> <!-- Directory gateway extension -->
</span><span class="cx">
</span><span class="cx"> </features>
</span><span class="lines">@@ -410,138 +410,139 @@
</span><span class="cx"> <repeat count="40">
</span><span class="cx"> <!-- user id -->
</span><span class="cx"> <substitution>
</span><del>- <key>$userid%%d:</key>
- <value>user%%02d</value>
</del><ins>+ <key>$userid%d:</key>
+ <value>user%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- user guid -->
</span><span class="cx"> <substitution>
</span><del>- <key>$userguid%%d:</key>
</del><ins>+ <key>$userguid%d:</key>
</ins><span class="cx"> <value>10000000-0000-0000-0000-000000000%03d</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <!-- user name -->
</span><span class="cx"> <substitution>
</span><del>- <key>$username%%d:</key>
- <value>User %%02d</value>
</del><ins>+ <key>$username%d:</key>
+ <value>User %02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- user name URI encoded -->
</span><span class="cx"> <substitution>
</span><del>- <key>$username-encoded%%d:</key>
- <value>User%%%%20%%02d</value>
</del><ins>+ <key>$username-encoded%d:</key>
+ <value>User%%20%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- first name -->
</span><span class="cx"> <substitution>
</span><del>- <key>$firstname%%d:</key>
</del><ins>+ <key>$firstname%d:</key>
</ins><span class="cx"> <value>User</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <!-- last name -->
</span><span class="cx"> <substitution>
</span><del>- <key>$lastname%%d:</key>
- <value>%%02d</value>
</del><ins>+ <key>$lastname%d:</key>
+ <value>%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- password -->
</span><span class="cx"> <substitution>
</span><del>- <key>$pswd%%d:</key>
- <value>user%%02d</value>
</del><ins>+ <key>$pswd%d:</key>
+ <value>user%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user principal resource-->
</span><span class="cx"> <substitution>
</span><del>- <key>$principal%%d:</key>
- <value>$principals_users:$userid%%d:/</value>
</del><ins>+ <key>$principal%d:</key>
+ <value>$principals_users:$userid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$principaluri%%d:</key>
- <value>$principals_uids:$userguid%%d:/</value>
</del><ins>+ <key>$principaluri%d:</key>
+ <value>$principals_uids:$userguid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$principal%%dnoslash:</key>
- <value>$principals_users:$userid%%d:</value>
</del><ins>+ <key>$principal%dnoslash:</key>
+ <value>$principals_users:$userid%d:</value>
</ins><span class="cx"> </substitution>
</span><ins>+
</ins><span class="cx"> <!-- relative path to user calendar home-->
</span><span class="cx"> <substitution>
</span><del>- <key>$calendarhome%%d:</key>
- <value>$calendars_uids:$userguid%%d:</value>
</del><ins>+ <key>$calendarhome%d:</key>
+ <value>$calendars_uids:$userguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user alternate calendar home-->
</span><span class="cx"> <substitution>
</span><del>- <key>$calendarhomealt%%d:</key>
- <value>$calendars_users:$userid%%d:</value>
</del><ins>+ <key>$calendarhomealt%d:</key>
+ <value>$calendars_users:$userid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user calendar-->
</span><span class="cx"> <substitution>
</span><del>- <key>$calendarpath%%d:</key>
- <value>$calendarhome%%d:/$calendar:</value>
</del><ins>+ <key>$calendarpath%d:</key>
+ <value>$calendarhome%d:/$calendar:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user alternate calendar-->
</span><span class="cx"> <substitution>
</span><del>- <key>$calendarpathalt%%d:</key>
- <value>$calendarhomealt%%d:/$calendar:</value>
</del><ins>+ <key>$calendarpathalt%d:</key>
+ <value>$calendarhomealt%d:/$calendar:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user tasks calendar-->
</span><span class="cx"> <substitution>
</span><del>- <key>$taskspath%%d:</key>
- <value>$calendarhome%%d:/$tasks:</value>
</del><ins>+ <key>$taskspath%d:</key>
+ <value>$calendarhome%d:/$tasks:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user polls calendar-->
</span><span class="cx"> <substitution>
</span><del>- <key>$pollspath%%d:</key>
- <value>$calendarhome%%d:/$polls:</value>
</del><ins>+ <key>$pollspath%d:</key>
+ <value>$calendarhome%d:/$polls:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user inbox-->
</span><span class="cx"> <substitution>
</span><del>- <key>$inboxpath%%d:</key>
- <value>$calendarhome%%d:/$inbox:</value>
</del><ins>+ <key>$inboxpath%d:</key>
+ <value>$calendarhome%d:/$inbox:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user outbox-->
</span><span class="cx"> <substitution>
</span><del>- <key>$outboxpath%%d:</key>
- <value>$calendarhome%%d:/$outbox:</value>
</del><ins>+ <key>$outboxpath%d:</key>
+ <value>$calendarhome%d:/$outbox:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user dropbox-->
</span><span class="cx"> <substitution>
</span><del>- <key>$dropboxpath%%d:</key>
- <value>$calendarhome%%d:/$dropbox:</value>
</del><ins>+ <key>$dropboxpath%d:</key>
+ <value>$calendarhome%d:/$dropbox:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user notification-->
</span><span class="cx"> <substitution>
</span><del>- <key>$notificationpath%%d:</key>
- <value>$calendarhome%%d:/$notification:</value>
</del><ins>+ <key>$notificationpath%d:</key>
+ <value>$calendarhome%d:/$notification:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user freebusy-->
</span><span class="cx"> <substitution>
</span><del>- <key>$freebusypath%%d:</key>
- <value>$calendarhome%%d:/$freebusy:</value>
</del><ins>+ <key>$freebusypath%d:</key>
+ <value>$calendarhome%d:/$freebusy:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$email%%d:</key>
- <value>$userid%%d:@example.com</value>
</del><ins>+ <key>$email%d:</key>
+ <value>$userid%d:@example.com</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- calendar user address of user-->
</span><span class="cx"> <substitution>
</span><del>- <key>$cuaddr%%d:</key>
- <value>mailto:$email%%d:</value>
</del><ins>+ <key>$cuaddr%d:</key>
+ <value>mailto:$email%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$cuaddralt%%d:</key>
- <value>$cuaddr%%d:</value>
</del><ins>+ <key>$cuaddralt%d:</key>
+ <value>$cuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$cuaddraltnoslash%%d:</key>
- <value>$cuaddr%%d:</value>
</del><ins>+ <key>$cuaddraltnoslash%d:</key>
+ <value>$cuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$cuaddrurn%%d:</key>
- <value>urn:x-uid:$userguid%%d:</value>
</del><ins>+ <key>$cuaddrurn%d:</key>
+ <value>urn:x-uid:$userguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx">
</span><span class="cx"> <!-- relative path to user addressbook home-->
</span><span class="cx"> <substitution>
</span><del>- <key>$addressbookhome%%d:</key>
- <value>$addressbooks_uids:$userguid%%d:</value>
</del><ins>+ <key>$addressbookhome%d:</key>
+ <value>$addressbooks_uids:$userguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user addressbook-->
</span><span class="cx"> <substitution>
</span><del>- <key>$addressbookpath%%d:</key>
- <value>$addressbookhome%%d:/$addressbook:</value>
</del><ins>+ <key>$addressbookpath%d:</key>
+ <value>$addressbookhome%d:/$addressbook:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> </repeat>
</span><span class="cx">
</span><span class="lines">@@ -549,169 +550,169 @@
</span><span class="cx"> <repeat count="10">
</span><span class="cx"> <!-- user id -->
</span><span class="cx"> <substitution>
</span><del>- <key>$publicuserid%%d:</key>
- <value>public%%02d</value>
</del><ins>+ <key>$publicuserid%d:</key>
+ <value>public%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- user guid -->
</span><span class="cx"> <substitution>
</span><del>- <key>$publicuserguid%%d:</key>
</del><ins>+ <key>$publicuserguid%d:</key>
</ins><span class="cx"> <value>50000000-0000-0000-0000-0000000000%02d</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <!-- user name -->
</span><span class="cx"> <substitution>
</span><del>- <key>$publicusername%%d:</key>
- <value>Public %%02d</value>
</del><ins>+ <key>$publicusername%d:</key>
+ <value>Public %02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- password -->
</span><span class="cx"> <substitution>
</span><del>- <key>$publicpswd%%d:</key>
- <value>public%%02d</value>
</del><ins>+ <key>$publicpswd%d:</key>
+ <value>public%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user principal resource-->
</span><span class="cx"> <substitution>
</span><del>- <key>$publicprincipal%%d:</key>
- <value>$principals_users:$publicuserid%%d:/</value>
</del><ins>+ <key>$publicprincipal%d:</key>
+ <value>$principals_users:$publicuserid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$publicprincipaluri%%d:</key>
- <value>$principals_uids:$publicuserguid%%d:/</value>
</del><ins>+ <key>$publicprincipaluri%d:</key>
+ <value>$principals_uids:$publicuserguid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user calendar home-->
</span><span class="cx"> <substitution>
</span><del>- <key>$publiccalendarhome%%d:</key>
- <value>$calendars_uids:$publicuserguid%%d:</value>
</del><ins>+ <key>$publiccalendarhome%d:</key>
+ <value>$calendars_uids:$publicuserguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to user calendar-->
</span><span class="cx"> <substitution>
</span><del>- <key>$publiccalendarpath%%d:</key>
- <value>$calendars_uids:$publicuserguid%%d:/$calendar:</value>
</del><ins>+ <key>$publiccalendarpath%d:</key>
+ <value>$calendars_uids:$publicuserguid%d:/$calendar:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$publicemail%%d:</key>
- <value>$publicuserid%%d:@example.com</value>
</del><ins>+ <key>$publicemail%d:</key>
+ <value>$publicuserid%d:@example.com</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- calendar user address of user-->
</span><span class="cx"> <substitution>
</span><del>- <key>$publiccuaddr%%d:</key>
- <value>mailto:$publicemail%%d:</value>
</del><ins>+ <key>$publiccuaddr%d:</key>
+ <value>mailto:$publicemail%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$publiccuaddralt%%d:</key>
- <value>$publiccuaddr%%d:</value>
</del><ins>+ <key>$publiccuaddralt%d:</key>
+ <value>$publiccuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$publiccuaddrurn%%d:</key>
- <value>urn:x-uid:$publicuserguidi%%d:</value>
</del><ins>+ <key>$publiccuaddrurn%d:</key>
+ <value>urn:x-uid:$publicuserguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> </repeat>
</span><span class="cx">
</span><span class="cx"> <!-- Twenty resource accounts -->
</span><span class="cx"> <repeat count="20">
</span><span class="cx"> <substitution>
</span><del>- <key>$resourceid%%d:</key>
- <value>resource%%02d</value>
</del><ins>+ <key>$resourceid%d:</key>
+ <value>resource%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- resource guid-->
</span><span class="cx"> <substitution>
</span><del>- <key>$resourceguid%%d:</key>
</del><ins>+ <key>$resourceguid%d:</key>
</ins><span class="cx"> <value>40000000-0000-0000-0000-000000000%03d</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <!-- resource name-->
</span><span class="cx"> <substitution>
</span><del>- <key>$resourcename%%d:</key>
- <value>Resource %%02d</value>
</del><ins>+ <key>$resourcename%d:</key>
+ <value>Resource %02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first resource calendar home-->
</span><span class="cx"> <substitution>
</span><del>- <key>$rcalendarhome%%d:</key>
- <value>$calendars_uids:$resourceguid%%d:</value>
</del><ins>+ <key>$rcalendarhome%d:</key>
+ <value>$calendars_uids:$resourceguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first resource calendar home-->
</span><span class="cx"> <substitution>
</span><del>- <key>$rcalendarpath%%d:</key>
- <value>$calendars_uids:$resourceguid%%d:/$calendar:</value>
</del><ins>+ <key>$rcalendarpath%d:</key>
+ <value>$calendars_uids:$resourceguid%d:/$calendar:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first resource inbox-->
</span><span class="cx"> <substitution>
</span><del>- <key>$rinboxpath%%d:</key>
- <value>$calendars_uids:$resourceguid%%d:/$inbox:</value>
</del><ins>+ <key>$rinboxpath%d:</key>
+ <value>$calendars_uids:$resourceguid%d:/$inbox:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first resource outbox-->
</span><span class="cx"> <substitution>
</span><del>- <key>$routboxpath%%d:</key>
- <value>$calendars_uids:$resourceguid%%d:/$outbox:</value>
</del><ins>+ <key>$routboxpath%d:</key>
+ <value>$calendars_uids:$resourceguid%d:/$outbox:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first resource principal resource-->
</span><span class="cx"> <substitution>
</span><del>- <key>$rprincipal%%d:</key>
- <value>$principals_resources:$resourceid%%d:/</value>
</del><ins>+ <key>$rprincipal%d:</key>
+ <value>$principals_resources:$resourceid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$rprincipaluri%%d:</key>
- <value>$principals_uids:$resourceguid%%d:/</value>
</del><ins>+ <key>$rprincipaluri%d:</key>
+ <value>$principals_uids:$resourceguid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$rcuaddralt%%d:</key>
- <value>$rcuaddrurn%%d:</value>
</del><ins>+ <key>$rcuaddralt%d:</key>
+ <value>$rcuaddrurn%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$rcuaddrurn%%d:</key>
- <value>urn:x-uid:$resourceguid%%d:</value>
</del><ins>+ <key>$rcuaddrurn%d:</key>
+ <value>urn:x-uid:$resourceguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> </repeat>
</span><span class="cx">
</span><span class="cx"> <!-- Ten Location accounts -->
</span><span class="cx"> <repeat count="10">
</span><span class="cx"> <substitution>
</span><del>- <key>$locationid%%d:</key>
- <value>location%%02d</value>
</del><ins>+ <key>$locationid%d:</key>
+ <value>location%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- location guid-->
</span><span class="cx"> <substitution>
</span><del>- <key>$locationguid%%d:</key>
</del><ins>+ <key>$locationguid%d:</key>
</ins><span class="cx"> <value>30000000-0000-0000-0000-000000000%03d</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <!-- location name-->
</span><span class="cx"> <substitution>
</span><del>- <key>$locationname%%d:</key>
- <value>Location %%02d</value>
</del><ins>+ <key>$locationname%d:</key>
+ <value>Location %02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first location calendar home-->
</span><span class="cx"> <substitution>
</span><del>- <key>$lcalendarhome%%d:</key>
- <value>$calendars_uids:$locationguid%%d:</value>
</del><ins>+ <key>$lcalendarhome%d:</key>
+ <value>$calendars_uids:$locationguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first location calendar home-->
</span><span class="cx"> <substitution>
</span><del>- <key>$lcalendarpath%%d:</key>
- <value>$calendars_uids:$locationguid%%d:/$calendar:</value>
</del><ins>+ <key>$lcalendarpath%d:</key>
+ <value>$calendars_uids:$locationguid%d:/$calendar:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first location inbox-->
</span><span class="cx"> <substitution>
</span><del>- <key>$linboxpath%%d:</key>
- <value>$calendars_uids:$locationguid%%d:/$inbox:</value>
</del><ins>+ <key>$linboxpath%d:</key>
+ <value>$calendars_uids:$locationguid%d:/$inbox:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first location outbox-->
</span><span class="cx"> <substitution>
</span><del>- <key>$loutboxpath%%d:</key>
- <value>$calendars_uids:$locationguid%%d:/$outbox:</value>
</del><ins>+ <key>$loutboxpath%d:</key>
+ <value>$calendars_uids:$locationguid%d:/$outbox:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first location principal resource-->
</span><span class="cx"> <substitution>
</span><del>- <key>$lprincipal%%d:</key>
- <value>$principals_resources:$locationid%%d:/</value>
</del><ins>+ <key>$lprincipal%d:</key>
+ <value>$principals_resources:$locationid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$lprincipaluri%%d:</key>
- <value>$principals_uids:$locationguid%%d:/</value>
</del><ins>+ <key>$lprincipaluri%d:</key>
+ <value>$principals_uids:$locationguid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$lcuaddralt%%d:</key>
- <value>$lprincipaluri%%d:</value>
</del><ins>+ <key>$lcuaddralt%d:</key>
+ <value>$lprincipaluri%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$lcuaddrurn%%d:</key>
- <value>urn:x-uid:$locationguid%%d:</value>
</del><ins>+ <key>$lcuaddrurn%d:</key>
+ <value>urn:x-uid:$locationguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> </repeat>
</span><span class="cx">
</span><span class="lines">@@ -719,35 +720,35 @@
</span><span class="cx"> <!-- Ten Group accounts -->
</span><span class="cx"> <repeat count="10">
</span><span class="cx"> <substitution>
</span><del>- <key>$groupid%%d:</key>
- <value>group%%02d</value>
</del><ins>+ <key>$groupid%d:</key>
+ <value>group%02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- group guid-->
</span><span class="cx"> <substitution>
</span><del>- <key>$groupguid%%d:</key>
</del><ins>+ <key>$groupguid%d:</key>
</ins><span class="cx"> <value>20000000-0000-0000-0000-000000000%03d</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <!-- group name-->
</span><span class="cx"> <substitution>
</span><del>- <key>$groupname%%d:</key>
- <value>Group %%02d</value>
</del><ins>+ <key>$groupname%d:</key>
+ <value>Group %02d</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <!-- relative path to first group principal resource-->
</span><span class="cx"> <substitution>
</span><del>- <key>$gprincipal%%d:</key>
- <value>$principals_resources:$groupid%%d:/</value>
</del><ins>+ <key>$gprincipal%d:</key>
+ <value>$principals_resources:$groupid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$gprincipaluri%%d:</key>
- <value>$principals_uids:$groupguid%%d:/</value>
</del><ins>+ <key>$gprincipaluri%d:</key>
+ <value>$principals_uids:$groupguid%d:/</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$gcuaddralt%%d:</key>
- <value>$gprincipaluri%%d:</value>
</del><ins>+ <key>$gcuaddralt%d:</key>
+ <value>$gprincipaluri%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$gcuaddrurn%%d:</key>
- <value>urn:x-uid:$groupguid%%d:</value>
</del><ins>+ <key>$gcuaddrurn%d:</key>
+ <value>urn:x-uid:$groupguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> </repeat>
</span><span class="cx">
</span><span class="lines">@@ -813,7 +814,7 @@
</span><span class="cx"> <value>MAILTO:$email2:</value>
</span><span class="cx"> </substitution>
</span><span class="cx">
</span><del>- %(overrides)s
</del><ins>+ {overrides}
</ins><span class="cx">
</span><span class="cx"> </substitutions>
</span><span class="cx"> </serverinfo>
</span></span></pre>
</div>
</div>
</body>
</html>