<!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>[13130] CalendarServer/branches/users/sagen/move2who-cdt/scripts</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/13130">13130</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-02 13:51:42 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>don't test for /addressbooks/groups/ and /calendars/groups/</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtscriptsserverserverinfopodxml">CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-pod.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtscriptsserverserverinfotemplatexml">CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-template.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtscriptsserverserverinfoxml">CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtscriptstestsCalDAVdirectoryxml">CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CalDAV/directory.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtscriptstestsCardDAVdirectoryxml">CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/directory.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2whocdtscriptsserverserverinfopodxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-pod.xml (13129 => 13130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-pod.xml 2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-pod.xml 2014-04-02 20:51:42 UTC (rev 13130)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> <sslport2>8543</sslport2>
</span><span class="cx">
</span><span class="cx"> <authtype>basic</authtype>
</span><del>-
</del><ins>+
</ins><span class="cx"> <waitcount>120</waitcount>
</span><span class="cx"> <waitdelay>0.25</waitdelay>
</span><span class="cx">
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> <feature>COPY Method</feature> <!-- COPY method -->
</span><span class="cx"> <feature>MOVE Method</feature> <!-- MOVE method -->
</span><span class="cx"> <feature>Extended MKCOL</feature> <!-- Extended MKCOL -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- ACL related -->
</span><span class="cx"> <feature>ACL Method</feature> <!-- ACL method -->
</span><span class="cx"> <feature>acl-principal-prop-set REPORT</feature> <!-- ACL acl-principal-prop-set REPORT -->
</span><span class="lines">@@ -233,10 +233,6 @@
</span><span class="cx"> <value>$calendars:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$calendars_groups:</key>
- <value>$calendars:$groupstype:/</value>
- </substitution>
- <substitution>
</del><span class="cx"> <key>$calendars_resources:</key>
</span><span class="cx"> <value>$calendars:$resourcestype:/</value>
</span><span class="cx"> </substitution>
</span><span class="lines">@@ -326,10 +322,6 @@
</span><span class="cx"> <key>$addressbooks_users:</key>
</span><span class="cx"> <value>$addressbooks:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><del>- <substitution>
- <key>$addressbooks_groups:</key>
- <value>$addressbooks:$groupstype:/</value>
- </substitution>
</del><span class="cx">
</span><span class="cx"> <!-- primary addressbook name -->
</span><span class="cx"> <substitution>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whocdtscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-template.xml (13129 => 13130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-template.xml 2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo-template.xml 2014-04-02 20:51:42 UTC (rev 13130)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> <nonsslport>%(nonsslport)s</nonsslport>
</span><span class="cx"> <sslport>%(sslport)s</sslport>
</span><span class="cx"> <authtype>%(authtype)s</authtype>
</span><del>-
</del><ins>+
</ins><span class="cx"> <waitcount>120</waitcount>
</span><span class="cx"> <waitdelay>0.25</waitdelay>
</span><span class="cx">
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> <feature>COPY Method</feature> <!-- COPY method -->
</span><span class="cx"> <feature>MOVE Method</feature> <!-- MOVE method -->
</span><span class="cx"> <feature>Extended MKCOL</feature> <!-- Extended MKCOL -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- ACL related -->
</span><span class="cx"> <feature>ACL Method</feature> <!-- ACL method -->
</span><span class="cx"> <feature>acl-principal-prop-set REPORT</feature> <!-- ACL acl-principal-prop-set REPORT -->
</span><span class="lines">@@ -228,10 +228,6 @@
</span><span class="cx"> <value>$calendars:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$calendars_groups:</key>
- <value>$calendars:$groupstype:/</value>
- </substitution>
- <substitution>
</del><span class="cx"> <key>$calendars_resources:</key>
</span><span class="cx"> <value>$calendars:$resourcestype:/</value>
</span><span class="cx"> </substitution>
</span><span class="lines">@@ -321,10 +317,6 @@
</span><span class="cx"> <key>$addressbooks_users:</key>
</span><span class="cx"> <value>$addressbooks:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><del>- <substitution>
- <key>$addressbooks_groups:</key>
- <value>$addressbooks:$groupstype:/</value>
- </substitution>
</del><span class="cx">
</span><span class="cx"> <!-- primary addressbook name -->
</span><span class="cx"> <substitution>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whocdtscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml (13129 => 13130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml 2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml 2014-04-02 20:51:42 UTC (rev 13130)
</span><span class="lines">@@ -228,10 +228,6 @@
</span><span class="cx"> <value>$calendars:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><span class="cx"> <substitution>
</span><del>- <key>$calendars_groups:</key>
- <value>$calendars:$groupstype:/</value>
- </substitution>
- <substitution>
</del><span class="cx"> <key>$calendars_resources:</key>
</span><span class="cx"> <value>$calendars:$resourcestype:/</value>
</span><span class="cx"> </substitution>
</span><span class="lines">@@ -327,10 +323,6 @@
</span><span class="cx"> <key>$addressbooks_users:</key>
</span><span class="cx"> <value>$addressbooks:$userstype:/</value>
</span><span class="cx"> </substitution>
</span><del>- <substitution>
- <key>$addressbooks_groups:</key>
- <value>$addressbooks:$groupstype:/</value>
- </substitution>
</del><span class="cx">
</span><span class="cx"> <!-- primary addressbook name -->
</span><span class="cx"> <substitution>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whocdtscriptstestsCalDAVdirectoryxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CalDAV/directory.xml (13129 => 13130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CalDAV/directory.xml 2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CalDAV/directory.xml 2014-04-02 20:51:42 UTC (rev 13130)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> </require-feature>
</span><span class="cx">
</span><span class="cx"> <start/>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='GET on collections'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>GET on root collection</description>
</span><span class="lines">@@ -124,16 +124,6 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='10'>
</span><del>- <description>GET on group calendars collection</description>
- <request>
- <method>GET</method>
- <ruri>$calendars_groups:</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='11'>
</del><span class="cx"> <description>GET on locations calendars collection</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -143,7 +133,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='12'>
</del><ins>+ <test name='11'>
</ins><span class="cx"> <description>GET on resources calendars collection</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -153,7 +143,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13'>
</del><ins>+ <test name='12'>
</ins><span class="cx"> <description>GET on __uids__ calendars collection</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -168,7 +158,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <end/>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whocdtscriptstestsCardDAVdirectoryxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/directory.xml (13129 => 13130)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/directory.xml 2014-04-02 20:48:29 UTC (rev 13129)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/directory.xml 2014-04-02 20:51:42 UTC (rev 13130)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> <caldavtest>
</span><span class="cx"> <description>Test GET on collections to ensure proper directory listing</description>
</span><del>-
</del><ins>+
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>carddav</feature>
</span><span class="cx"> </require-feature>
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- </test>
</del><ins>+ </test>
</ins><span class="cx"> <test name='5'>
</span><span class="cx"> <description>GET on __uids__ principals collection</description>
</span><span class="cx"> <request>
</span><span class="lines">@@ -103,16 +103,6 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><del>- <description>GET on group addressbooks collection</description>
- <request>
- <method>GET</method>
- <ruri>$addressbooks_groups:</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='9'>
</del><span class="cx"> <description>GET on __uids__ addressbooks collection</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -129,5 +119,5 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <end/>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre>
</div>
</div>
</body>
</html>