[CalendarServer-changes] [4275] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 4275
          http://trac.macosforge.org/projects/calendarserver/changeset/4275
Author:   cdaboo at 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090515/a0fa7d56/attachment.html>