<!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>[13342] CalDAVTester/trunk/scripts/server</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/13342">13342</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 08:21:37 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Also update the -pod and -template versions of serverinfo.xml</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfopodxml">CalDAVTester/trunk/scripts/server/serverinfo-pod.xml</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="CalDAVTestertrunkscriptsserverserverinfopodxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml (13341 => 13342)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-04-21 05:11:50 UTC (rev 13341)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-04-21 15:21:37 UTC (rev 13342)
</span><span class="lines">@@ -491,15 +491,15 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$cuaddralt%d:</key>
</span><del>- <value>$principaluri%d:</value>
</del><ins>+ <value>$cuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$cuaddraltnoslash%d:</key>
</span><del>- <value>$principals_uids:$userguid%d:</value>
</del><ins>+ <value>$cuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$cuaddrurn%d:</key>
</span><del>- <value>urn:uuid:$userguid%d:</value>
</del><ins>+ <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="lines">@@ -626,7 +626,7 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$pcuaddralt%d:</key>
</span><del>- <value>$pprincipaluri%d:</value>
</del><ins>+ <value>$pcuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$pcuaddraltnoslash%d:</key>
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$pcuaddrurn%d:</key>
</span><del>- <value>urn:uuid:$puserguid%d:</value>
</del><ins>+ <value>urn:x-uid:$puserguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx">
</span><span class="cx"> <!-- relative path to user addressbook home-->
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml (13341 => 13342)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-04-21 05:11:50 UTC (rev 13341)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-04-21 15:21:37 UTC (rev 13342)
</span><span class="lines">@@ -522,15 +522,15 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$cuaddralt%%d:</key>
</span><del>- <value>$principaluri%%d:</value>
</del><ins>+ <value>$cuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$cuaddraltnoslash%%d:</key>
</span><del>- <value>$principals_uids:$userguid%%d:</value>
</del><ins>+ <value>$cuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$cuaddrurn%%d:</key>
</span><del>- <value>urn:uuid:$userguid%%d:</value>
</del><ins>+ <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="lines">@@ -597,11 +597,11 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$publiccuaddralt%%d:</key>
</span><del>- <value>$publicprincipaluri%%d:</value>
</del><ins>+ <value>$publiccuaddr%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$publiccuaddrurn%%d:</key>
</span><del>- <value>urn:uuid:$publicuserguid%%d:</value>
</del><ins>+ <value>urn:x-uid:$publicuserguid%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> </repeat>
</span><span class="cx">
</span><span class="lines">@@ -652,11 +652,11 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$rcuaddralt%%d:</key>
</span><del>- <value>$rprincipaluri%%d:</value>
</del><ins>+ <value>$rcuaddrurn%%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$rcuaddrurn%%d:</key>
</span><del>- <value>urn:uuid:$resourceguid%%d:</value>
</del><ins>+ <value>urn:x-uid:$resourceguid%%d:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx"> </repeat>
</span><span class="cx">
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$lcuaddrurn%%d:</key>
</span><del>- <value>urn:uuid:$locationguid%%d:</value>
</del><ins>+ <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">@@ -747,7 +747,7 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$gcuaddrurn%%d:</key>
</span><del>- <value>urn:uuid:$groupguid%%d:</value>
</del><ins>+ <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">@@ -787,7 +787,7 @@
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$i18ncuaddrurn:</key>
</span><del>- <value>urn:uuid:$i18nguid:</value>
</del><ins>+ <value>urn:x-uid:$i18nguid:</value>
</ins><span class="cx"> </substitution>
</span><span class="cx">
</span><span class="cx"> <!-- relative path to disabled group principal resource-->
</span></span></pre>
</div>
</div>
</body>
</html>