[CalendarServer-changes] [8600] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sat Jan 28 14:36:11 PST 2012
Revision: 8600
http://trac.macosforge.org/projects/calendarserver/changeset/8600
Author: cdaboo at apple.com
Date: 2012-01-28 14:36:10 -0800 (Sat, 28 Jan 2012)
Log Message:
-----------
Fix for latest server paths, behaviors.
Modified Paths:
--------------
CalDAVTester/trunk/QuickLook-All
CalDAVTester/trunk/QuickLook-CalDAV
CalDAVTester/trunk/QuickLook-CardDAV
CalDAVTester/trunk/Validation-All
CalDAVTester/trunk/Validation-CalDAV
CalDAVTester/trunk/Validation-CardDAV
CalDAVTester/trunk/odsetup.py
CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/sslserverinfo.xml
Modified: CalDAVTester/trunk/QuickLook-All
===================================================================
--- CalDAVTester/trunk/QuickLook-All 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/QuickLook-All 2012-01-28 22:36:10 UTC (rev 8600)
@@ -19,7 +19,7 @@
# Runs a subset of tests as a quick check that the server is functional.
#
-export PYTHONPATH=/usr/share/caldavd/lib/python
+export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
./testcaldav.py --print-details-onfail -s scripts/server/serverinfo-caldav.xml \
CalDAV/caldavIOP.xml \
CalDAV/errors.xml \
Modified: CalDAVTester/trunk/QuickLook-CalDAV
===================================================================
--- CalDAVTester/trunk/QuickLook-CalDAV 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/QuickLook-CalDAV 2012-01-28 22:36:10 UTC (rev 8600)
@@ -19,7 +19,7 @@
# Runs a subset of tests as a quick check that the server is functional.
#
-export PYTHONPATH=/usr/share/caldavd/lib/python
+export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
./testcaldav.py --print-details-onfail -s scripts/server/serverinfo-caldav.xml \
CalDAV/caldavIOP.xml \
CalDAV/errors.xml \
Modified: CalDAVTester/trunk/QuickLook-CardDAV
===================================================================
--- CalDAVTester/trunk/QuickLook-CardDAV 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/QuickLook-CardDAV 2012-01-28 22:36:10 UTC (rev 8600)
@@ -19,7 +19,7 @@
# Runs a subset of tests as a quick check that the server is functional.
#
-export PYTHONPATH=/usr/share/caldavd/lib/python
+export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
./testcaldav.py --print-details-onfail -s scripts/server/serverinfo-caldav.xml \
CardDAV/ab-client.xml \
CardDAV/errors.xml \
Modified: CalDAVTester/trunk/Validation-All
===================================================================
--- CalDAVTester/trunk/Validation-All 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/Validation-All 2012-01-28 22:36:10 UTC (rev 8600)
@@ -20,7 +20,7 @@
# server is functional.
#
-export PYTHONPATH=/usr/share/caldavd/lib/python
+export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
./testcaldav.py --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all \
--exclude CalDAV/directory.xml \
--exclude CalDAV/proxyauthz.xml \
Modified: CalDAVTester/trunk/Validation-CalDAV
===================================================================
--- CalDAVTester/trunk/Validation-CalDAV 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/Validation-CalDAV 2012-01-28 22:36:10 UTC (rev 8600)
@@ -19,7 +19,7 @@
# Runs a full set of tests to verify that the server is functional.
#
-export PYTHONPATH=/usr/share/caldavd/lib/python
+export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
./testcaldav.py --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all \
--subdir CalDAV \
--exclude CalDAV/directory.xml \
Modified: CalDAVTester/trunk/Validation-CardDAV
===================================================================
--- CalDAVTester/trunk/Validation-CardDAV 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/Validation-CardDAV 2012-01-28 22:36:10 UTC (rev 8600)
@@ -19,7 +19,7 @@
# Runs a full set of tests to verify that the server is functional.
#
-export PYTHONPATH=/usr/share/caldavd/lib/python
+export PYTHONPATH=/usr/share/caldavd/lib/python:/Applications/Server.app/Contents/ServerRoot/usr/share/caldavd/lib/python/
./testcaldav.py --print-details-onfail -s scripts/server/serverinfo-caldav.xml --all \
--subdir CardDAV \
--exclude CardDAV/directory.xml \
Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/odsetup.py 2012-01-28 22:36:10 UTC (rev 8600)
@@ -32,6 +32,7 @@
import xml.parsers.expat
sys_root = "/Applications/Server.app/Contents/ServerRoot"
+conf_root = "/Library/Server/Calendar and Contacts/Config"
diradmin_user = "admin"
diradmin_pswd = ""
@@ -46,7 +47,7 @@
details = {
"caldav": {
- "config": sys_root + "/etc/caldavd/caldavd.plist",
+ "config": conf_root + "/caldavd.plist",
"serverinfo": "scripts/server/serverinfo-caldav.xml"
},
}
@@ -278,7 +279,7 @@
plist["SudoersFile"]
except KeyError:
# add SudoersFile entry to caldavd.plist
- plist["SudoersFile"] = sys_root + "/etc/caldavd/sudoers.plist"
+ plist["SudoersFile"] = conf_root + "/sudoers.plist"
writePlist(plist,config)
try:
@@ -361,6 +362,9 @@
# Needed for CDT
plist["EnableAnonymousReadRoot"] = True
+ if "Options" not in plist["Scheduling"]:
+ plist["Scheduling"]["Options"] = dict()
+ plist["Scheduling"]["Options"]["AttendeeRefreshBatch"] = 0
writePlist(plist, config)
@@ -466,12 +470,12 @@
def loadLists(config, path, records):
if path == "/Places":
result = cmd(
- "%s -f %s" % (cmdutility, config,),
+ "%s -f \"%s\"" % (cmdutility, config,),
locationlistcmd,
)
elif path == "/Resources":
result = cmd(
- "%s -f %s" % (cmdutility, config,),
+ "%s -f \"%s\"" % (cmdutility, config,),
resourcelistcmd
)
else:
@@ -551,7 +555,7 @@
# Other attributes
for key, value in user[2].iteritems():
if key == "dsAttrTypeStandard:GeneratedUID":
- value = uuid.uuid4()
+ value = str(uuid.uuid4()).upper()
cmd("dscl -u %s -P %s %s -create %s/%s \"%s\" \"%s\"" % (diradmin_user, diradmin_pswd, directory_node, path, user[0], key, value))
else:
print "%s/%s already exists" % (path, user[0],)
@@ -574,12 +578,12 @@
guids[user[0]] = resources[user[0]]
return
- guid = uuid.uuid4()
+ guid = str(uuid.uuid4()).upper()
if guids.has_key(user[0]):
guids[user[0]] = guid
if path == "/Places":
cmd(
- "%s -f %s" % (cmdutility, config,),
+ "%s -f \"%s\"" % (cmdutility, config,),
locationcreatecmd % {
"guid":guid,
"realname":user[2]["dsAttrTypeStandard:RealName"],
@@ -588,7 +592,7 @@
)
elif path == "/Resources":
cmd(
- "%s -f %s" % (cmdutility, config,),
+ "%s -f \"%s\"" % (cmdutility, config,),
resourcecreatecmd % {
"guid":guid,
"realname":user[2]["dsAttrTypeStandard:RealName"],
@@ -606,8 +610,8 @@
removeUserViaGateway(config, path, user)
def removeUserViaDS(config, path, user):
- # Do dscl command line operations to create a calendar user
-
+ # Do dscl command line operations to remove a calendar user
+
# Create the user
cmd("dscl -u %s -P %s %s -delete %s/%s" % (diradmin_user, diradmin_pswd, directory_node, path, user[0]), raiseOnFail=False)
@@ -618,7 +622,7 @@
return
guid = locations[user[0]]
cmd(
- "%s -f %s" % (cmdutility, config,),
+ "%s -f \"%s\"" % (cmdutility, config,),
locationremovecmd % {"guid":guid,}
)
elif path == "/Resources":
@@ -626,7 +630,7 @@
return
guid = resources[user[0]]
cmd(
- "%s -f %s" % (cmdutility, config,),
+ "%s -f \"%s\"" % (cmdutility, config,),
resourceremovecmd % {"guid":guid,}
)
else:
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2012-01-28 22:36:10 UTC (rev 8600)
@@ -49,6 +49,7 @@
<!-- <feature>quota-on-resources</feature> --> <!-- WebDAV QUOTA on calendar and address book object resources -->
<feature>resource-id</feature> <!-- WebDAV BIND DAV:resource-id property -->
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
+ <!-- <feature>sync-report_home</feature> --> <!-- WebDAV collection sync REPORT on Homes -->
<feature>well-known</feature> <!-- well-known feature -->
<!-- <feature>per-object-ACLs</feature> --> <!-- ACL for objects in calendar/address books -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2012-01-28 22:36:10 UTC (rev 8600)
@@ -49,6 +49,7 @@
<!-- <feature>quota-on-resources</feature> --> <!-- WebDAV QUOTA on calendar and address book object resources -->
<feature>resource-id</feature> <!-- WebDAV BIND DAV:resource-id property -->
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
+ <!-- <feature>sync-report_home</feature> --> <!-- WebDAV collection sync REPORT on Homes -->
<feature>well-known</feature> <!-- well-known feature -->
<!-- <feature>per-object-ACLs</feature> --> <!-- ACL for objects in calendar/address books -->
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2012-01-28 22:03:02 UTC (rev 8599)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2012-01-28 22:36:10 UTC (rev 8600)
@@ -50,6 +50,7 @@
<!-- <feature>quota-on-resources</feature> --> <!-- WebDAV QUOTA on calendar and address book object resources -->
<feature>resource-id</feature> <!-- WebDAV BIND DAV:resource-id property -->
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
+ <!-- <feature>sync-report_home</feature> --> <!-- WebDAV collection sync REPORT on Homes -->
<feature>well-known</feature> <!-- well-known feature -->
<!-- <feature>per-object-ACLs</feature> --> <!-- ACL for objects in calendar/address books -->
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120128/0f1ef2be/attachment-0001.html>
More information about the calendarserver-changes
mailing list