[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [4275] CalDAVTester/trunk
From: source_changes () macosforge ! org
Date: 2009-05-15 21:01:50
Message-ID: 20090515210150.C2A3A1A0F66F () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 4275
http://trac.macosforge.org/projects/calendarserver/changeset/4275
Author: cdaboo@apple.com
Date: 2009-05-15 14:01:49 -0700 (Fri, 15 May 2009)
Log Message:
-----------
Use calendarserver_manage_principals rather than caldav_utility.
Modified Paths:
--------------
CalDAVTester/trunk/QuickLook
CalDAVTester/trunk/Validation
CalDAVTester/trunk/odsetup.py
Modified: CalDAVTester/trunk/QuickLook
===================================================================
--- CalDAVTester/trunk/QuickLook 2009-05-15 20:40:10 UTC (rev 4274)
+++ CalDAVTester/trunk/QuickLook 2009-05-15 21:01:49 UTC (rev 4275)
@@ -16,7 +16,7 @@
# limitations under the License.
##
#
-# Runs a subset of tests as a quick check that the server is functional
+# Runs a subset of tests as a quick check that the server is functional.
#
export PYTHONPATH=/usr/share/caldavd/lib/python
Modified: CalDAVTester/trunk/Validation
===================================================================
--- CalDAVTester/trunk/Validation 2009-05-15 20:40:10 UTC (rev 4274)
+++ CalDAVTester/trunk/Validation 2009-05-15 21:01:49 UTC (rev 4275)
@@ -16,7 +16,7 @@
# limitations under the License.
##
#
-# Runs a full set of tests to verify that the server is functional
+# Runs a full set of tests to verify that the server is functional.
#
export PYTHONPATH=/usr/share/caldavd/lib/python
Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py 2009-05-15 20:40:10 UTC (rev 4274)
+++ CalDAVTester/trunk/odsetup.py 2009-05-15 21:01:49 UTC (rev 4275)
@@ -31,7 +31,7 @@
diradmin_pswd = "admin"
directory_node = "/LDAPv3/127.0.0.1"
config = "/etc/caldavd/caldavd.plist"
-utility = "/usr/sbin/caldav_utility"
+utility = "/usr/sbin/calendarserver_manage_principals"
serverinfo_default = "scripts/server/serverinfo.xml"
serverinfo_template = "scripts/server/serverinfo-template.xml"
@@ -361,17 +361,14 @@
# Do caldav_utility setup
if path in ("/Places", "/Resources",):
if path in ("/Places",):
- cmd = "%s --resource %s --add-write-delegate %s --set-auto-schedule \
true" % ( + cmd = "%s --add-write-proxy users:user01 \
--set-auto-schedule=true locations:%s" % ( utility,
- guids[user[0]],
- guids["user01"],
+ user[0],
)
else:
- cmd = "%s --resource %s --add-write-delegate %s --add-read-delegate %s \
--set-auto-schedule true" % ( + cmd = "%s --add-write-proxy users:user01 \
--add-read-proxy users:user03 --set-auto-schedule=true resources:%s" % ( utility,
- guids[user[0]],
- guids["user01"],
- guids["user03"],
+ user[0],
)
print cmd
commands.getoutput(cmd)
[Attachment #5 (text/html)]
<!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>[4275] 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.macosforge.org/projects/calendarserver/changeset/4275">4275</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2009-05-15 14:01:49 -0700 (Fri, 15 May 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use calendarserver_manage_principals rather than caldav_utility.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkQuickLook">CalDAVTester/trunk/QuickLook</a></li>
<li><a href="#CalDAVTestertrunkValidation">CalDAVTester/trunk/Validation</a></li>
<li><a href="#CalDAVTestertrunkodsetuppy">CalDAVTester/trunk/odsetup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkQuickLook"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/QuickLook (4274 => 4275)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/QuickLook 2009-05-15 20:40:10 UTC (rev \
4274)
+++ CalDAVTester/trunk/QuickLook 2009-05-15 21:01:49 UTC (rev 4275)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx"> #
</span><del>-# Runs a subset of tests as a quick check that the server is functional
</del><ins>+# Runs a subset of tests as a quick check that the server is functional.
</ins><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> export PYTHONPATH=/usr/share/caldavd/lib/python
</span></span></pre></div>
<a id="CalDAVTestertrunkValidation"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Validation (4274 => 4275)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Validation 2009-05-15 20:40:10 UTC (rev \
4274)
+++ CalDAVTester/trunk/Validation 2009-05-15 21:01:49 UTC (rev 4275)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx"> #
</span><del>-# Runs a full set of tests to verify that the server is functional
</del><ins>+# Runs a full set of tests to verify that the server is functional.
</ins><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> export PYTHONPATH=/usr/share/caldavd/lib/python
</span></span></pre></div>
<a id="CalDAVTestertrunkodsetuppy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/odsetup.py (4274 => 4275)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/odsetup.py 2009-05-15 20:40:10 UTC (rev \
4274)
+++ CalDAVTester/trunk/odsetup.py 2009-05-15 21:01:49 UTC (rev 4275)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> diradmin_pswd = "admin"
</span><span class="cx"> directory_node = "/LDAPv3/127.0.0.1"
</span><span class="cx"> config = "/etc/caldavd/caldavd.plist"
</span><del>-utility = "/usr/sbin/caldav_utility"
</del><ins>+utility = "/usr/sbin/calendarserver_manage_principals"
</ins><span class="cx">
</span><span class="cx"> serverinfo_default = \
"scripts/server/serverinfo.xml" </span><span class="cx"> \
serverinfo_template = "scripts/server/serverinfo-template.xml" </span><span \
class="lines">@@ -361,17 +361,14 @@ </span><span class="cx"> # Do caldav_utility \
setup </span><span class="cx"> if path in ("/Places", \
"/Resources",): </span><span class="cx"> if path in \
("/Places",): </span><del>- cmd = "%s --resource %s \
--add-write-delegate %s --set-auto-schedule true" % ( </del><ins>+ \
cmd = "%s --add-write-proxy users:user01 --set-auto-schedule=true \
locations:%s" % ( </ins><span class="cx"> utility,
</span><del>- guids[user[0]],
- guids["user01"],
</del><ins>+ user[0],
</ins><span class="cx"> )
</span><span class="cx"> else:
</span><del>- cmd = "%s --resource %s --add-write-delegate %s \
--add-read-delegate %s --set-auto-schedule true" % ( </del><ins>+ cmd \
= "%s --add-write-proxy users:user01 --add-read-proxy users:user03 \
--set-auto-schedule=true resources:%s" % ( </ins><span class="cx"> \
utility, </span><del>- guids[user[0]],
- guids["user01"],
- guids["user03"],
</del><ins>+ user[0],
</ins><span class="cx"> )
</span><span class="cx"> print cmd
</span><span class="cx"> commands.getoutput(cmd)
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic