April 2007 - calendarserver-changes

[1485] CalDAVTester/trunk/buildperformance
by source_changes＠macosforge.org 13 Apr '07

13 Apr '07

Revision: 1485 http://trac.macosforge.org/projects/calendarserver/changeset/1485 Author: cdaboo(a)apple.com Date: 2007-04-13 14:00:15 -0700 (Fri, 13 Apr 2007) Log Message: ----------- Various scripts for checking server load performance. Added Paths: ----------- CalDAVTester/trunk/buildperformance/client-sim/ CalDAVTester/trunk/buildperformance/client-sim/poll-nothing-new.xml CalDAVTester/trunk/buildperformance/client-sim/poll-one-new.xml CalDAVTester/trunk/buildperformance/client-sim/poll-ten-new.xml CalDAVTester/trunk/buildperformance/get/get-principal.xml Added: CalDAVTester/trunk/buildperformance/client-sim/poll-nothing-new.xml =================================================================== --- CalDAVTester/trunk/buildperformance/client-sim/poll-nothing-new.xml (rev 0) +++ CalDAVTester/trunk/buildperformance/client-sim/poll-nothing-new.xml 2007-04-13 21:00:15 UTC (rev 1485) @@ -0,0 +1,51 @@ +<?xml version="1.0"?> + +<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd"> + + + +<caldavtest ignore-all='yes'> + <description>Performance check GET</description> + + <start/> + + <test-suite name='Client polling - nothing new found' ignore='no'> + <test name='1' count='1' stats='yes'> + <description>PROPFIND on calendar home</description> + <request> + <method>PROPFIND</method> + <header> + <name>Depth</name> + <value>1</value> + </header> + <ruri>$pathprefix:/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/1.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + </test-suite> + + <end/> + +</caldavtest> Added: CalDAVTester/trunk/buildperformance/client-sim/poll-one-new.xml =================================================================== --- CalDAVTester/trunk/buildperformance/client-sim/poll-one-new.xml (rev 0) +++ CalDAVTester/trunk/buildperformance/client-sim/poll-one-new.xml 2007-04-13 21:00:15 UTC (rev 1485) @@ -0,0 +1,88 @@ +<?xml version="1.0"?> + +<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd"> + + + +<caldavtest ignore-all='yes'> + <description>Performance check GET</description> + + <start/> + + <test-suite name='Client polling - nothing new found' ignore='no'> + <test name='1' count='1' stats='yes'> + <description>PROPFIND on calendar home</description> + <request print-response="no"> + <method>PROPFIND</method> + <header> + <name>Depth</name> + <value>1</value> + </header> + <ruri>$pathprefix:/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/1.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PROPFIND</method> + <header> + <name>Depth</name> + <value>1</value> + </header> + <ruri>$pathprefix:/calendar.10/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/2.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>REPORT</method> + <ruri>$pathprefix:/calendar.10/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/3.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/1.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/1.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + </test-suite> + + <end/> + +</caldavtest> Added: CalDAVTester/trunk/buildperformance/client-sim/poll-ten-new.xml =================================================================== --- CalDAVTester/trunk/buildperformance/client-sim/poll-ten-new.xml (rev 0) +++ CalDAVTester/trunk/buildperformance/client-sim/poll-ten-new.xml 2007-04-13 21:00:15 UTC (rev 1485) @@ -0,0 +1,187 @@ +<?xml version="1.0"?> + +<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd"> + + + +<caldavtest ignore-all='yes'> + <description>Performance check GET</description> + + <start/> + + <test-suite name='Client polling - nothing new found' ignore='no'> + <test name='1' count='1' stats='yes'> + <description>PROPFIND on calendar home</description> + <request print-response="no"> + <method>PROPFIND</method> + <header> + <name>Depth</name> + <value>1</value> + </header> + <ruri>$pathprefix:/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/1.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PROPFIND</method> + <header> + <name>Depth</name> + <value>1</value> + </header> + <ruri>$pathprefix:/calendar.10/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/2.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>REPORT</method> + <ruri>$pathprefix:/calendar.10/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/4.xml</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/1.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/1.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/2.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/2.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/3.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/3.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/4.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/4.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/5.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/5.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/6.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/6.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/7.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/7.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/8.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/8.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/9.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/9.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request print-response="no"> + <method>PUT</method> + <ruri>$pathprefix:/calendar/10.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/performance/client-sim/10.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + </test-suite> + + <end/> + +</caldavtest> Added: CalDAVTester/trunk/buildperformance/get/get-principal.xml =================================================================== --- CalDAVTester/trunk/buildperformance/get/get-principal.xml (rev 0) +++ CalDAVTester/trunk/buildperformance/get/get-principal.xml 2007-04-13 21:00:15 UTC (rev 1485) @@ -0,0 +1,43 @@ +<?xml version="1.0"?> + +<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd"> + + + +<caldavtest ignore-all='yes'> + <description>Performance check GET</description> + + <start/> + + <test-suite name='Plain GET - principal collection' ignore='no'> + <test name='1' count='1' stats='yes'> + <description>GET on principal collection</description> + <request> + <method>GET</method> + <ruri>$principal:</ruri> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + </test-suite> + + <end/> + +</caldavtest>

1 0

[1484] CalendarServer/trunk/bin/xattr
by source_changes＠macosforge.org 13 Apr '07

13 Apr '07

Revision: 1484 http://trac.macosforge.org/projects/calendarserver/changeset/1484 Author: wsanchez(a)apple.com Date: 2007-04-13 10:47:50 -0700 (Fri, 13 Apr 2007) Log Message: ----------- Change license to MIT/PSF to match xattr project (so we can contribute it). Modified Paths: -------------- CalendarServer/trunk/bin/xattr Modified: CalendarServer/trunk/bin/xattr =================================================================== --- CalendarServer/trunk/bin/xattr 2007-04-13 15:24:08 UTC (rev 1483) +++ CalendarServer/trunk/bin/xattr 2007-04-13 17:47:50 UTC (rev 1484) @@ -1,21 +1,28 @@ #!/usr/bin/env python ## -# Copyright (c) 2005-2007 Apple Inc. All rights reserved. +# Copyright (c) 2007 Apple Inc. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# This is the MIT license. This software may also be distributed under the +# same terms as Python (the PSF license). # -# http://www.apache.org/licenses/LICENSE-2.0 +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. # -# DRI: Wilfredo Sanchez, wsanchez(a)apple.com +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. ## import sys

1 0

[1483] CalendarServer/trunk/twistedcaldav/dropbox.py
by source_changes＠macosforge.org 13 Apr '07

13 Apr '07

Revision: 1483 http://trac.macosforge.org/projects/calendarserver/changeset/1483 Author: cdaboo(a)apple.com Date: 2007-04-13 08:24:08 -0700 (Fri, 13 Apr 2007) Log Message: ----------- Group members are actually returned principal resources. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/dropbox.py Modified: CalendarServer/trunk/twistedcaldav/dropbox.py =================================================================== --- CalendarServer/trunk/twistedcaldav/dropbox.py 2007-04-13 00:29:15 UTC (rev 1482) +++ CalendarServer/trunk/twistedcaldav/dropbox.py 2007-04-13 15:24:08 UTC (rev 1483) @@ -123,7 +123,7 @@ if members: for member in members: - result.append(davxml.Principal(davxml.HRef.fromString(member))) + result.append(davxml.Principal(davxml.HRef.fromString(member.principalURL()))) else: result.append(davxml.Principal(principal)) yield result

1 0

[1482] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test. test_acl.patch
by source_changes＠macosforge.org 13 Apr '07

13 Apr '07

Revision: 1482 http://trac.macosforge.org/projects/calendarserver/changeset/1482 Author: cdaboo(a)apple.com Date: 2007-04-12 17:29:15 -0700 (Thu, 12 Apr 2007) Log Message: ----------- Fix comment. Modified Paths: -------------- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch =================================================================== --- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch 2007-04-12 16:53:08 UTC (rev 1481) +++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch 2007-04-13 00:29:15 UTC (rev 1482) @@ -82,16 +82,18 @@ for name, acl in ( ("none" , self.grant()), ("read" , self.grant(davxml.Read())), -@@ -363,7 +378,7 @@ +@@ -361,9 +376,7 @@ + if method == "GET": + ok = responsecode.OK elif method == "REPORT": - # BAD_REQUEST in the allowed case, because we're not actually - # including the required XML in the request body. +- # BAD_REQUEST in the allowed case, because we're not actually +- # including the required XML in the request body. - ok = responsecode.BAD_REQUEST + ok = responsecode.MULTI_STATUS else: raise AssertionError("We shouldn't be here. (method = %r)" % (method,)) -@@ -377,6 +392,9 @@ +@@ -377,6 +390,9 @@ path = os.path.join(self.docroot, name) request = SimpleRequest(self.site, method, "/" + name)

1 0

[1481] CalendarServer/trunk/twistedcaldav/method
by source_changes＠macosforge.org 12 Apr '07

12 Apr '07

Revision: 1481 http://trac.macosforge.org/projects/calendarserver/changeset/1481 Author: cdaboo(a)apple.com Date: 2007-04-12 09:53:08 -0700 (Thu, 12 Apr 2007) Log Message: ----------- Make sure empty queries return nothing. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/method/report_calquery.py CalendarServer/trunk/twistedcaldav/method/report_multiget.py Modified: CalendarServer/trunk/twistedcaldav/method/report_calquery.py =================================================================== --- CalendarServer/trunk/twistedcaldav/method/report_calquery.py 2007-04-12 16:51:47 UTC (rev 1480) +++ CalendarServer/trunk/twistedcaldav/method/report_calquery.py 2007-04-12 16:53:08 UTC (rev 1481) @@ -153,6 +153,9 @@ # Get list of children that match the search and have read access names = [name for name, ignore_uid, ignore_type in calresource.index().search(filter)] + if not names: + yield None + return # Now determine which valid resources are readable and which are not ok_resources = [] Modified: CalendarServer/trunk/twistedcaldav/method/report_multiget.py =================================================================== --- CalendarServer/trunk/twistedcaldav/method/report_multiget.py 2007-04-12 16:51:47 UTC (rev 1480) +++ CalendarServer/trunk/twistedcaldav/method/report_multiget.py 2007-04-12 16:53:08 UTC (rev 1481) @@ -149,6 +149,9 @@ responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_ALLOWED))) else: checked_names.append(name) + if not checked_names: + yield None + return # Now determine which valid resources are readable and which are not ok_resources = []

1 0

[1480] CalDAVTester/trunk
by source_changes＠macosforge.org 12 Apr '07

12 Apr '07

Revision: 1480 http://trac.macosforge.org/projects/calendarserver/changeset/1480 Author: cdaboo(a)apple.com Date: 2007-04-12 09:51:47 -0700 (Thu, 12 Apr 2007) Log Message: ----------- Non-existent multiget check. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/reports.xml Added Paths: ----------- CalDAVTester/trunk/Resource/reports/multiget/8.xml Added: CalDAVTester/trunk/Resource/reports/multiget/8.xml =================================================================== --- CalDAVTester/trunk/Resource/reports/multiget/8.xml (rev 0) +++ CalDAVTester/trunk/Resource/reports/multiget/8.xml 2007-04-12 16:51:47 UTC (rev 1480) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" ?> +<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"> +<D:propname/> +<D:href>$pathprefix:/calendar/bogus-resource.ics</D:href> +</C:calendar-multiget> Modified: CalDAVTester/trunk/scripts/tests/reports.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/reports.xml 2007-04-12 16:32:13 UTC (rev 1479) +++ CalDAVTester/trunk/scripts/tests/reports.xml 2007-04-12 16:51:47 UTC (rev 1480) @@ -339,6 +339,23 @@ </verify> </request> </test> + <test name='8' ignore='no'> + <description>Single non-existent query</description> + <request print-response="no"> + <method>REPORT</method> + <data substitutions='yes'> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/reports/multiget/8.xml</filepath> + </data> + <verify> + <callback>multistatusItems</callback> + <arg> + <name>badhrefs</name> + <value>bogus-resource.ics</value> + </arg> + </verify> + </request> + </test> </test-suite> <test-suite name='basic query reports' ignore='no'>

1 0

[1479] CalDAVTester/trunk
by source_changes＠macosforge.org 12 Apr '07

12 Apr '07

Revision: 1479 http://trac.macosforge.org/projects/calendarserver/changeset/1479 Author: cdaboo(a)apple.com Date: 2007-04-12 09:32:13 -0700 (Thu, 12 Apr 2007) Log Message: ----------- Add test for a query that should match nothing. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/reports.xml Added Paths: ----------- CalDAVTester/trunk/Resource/reports/basicquery/15.xml Added: CalDAVTester/trunk/Resource/reports/basicquery/15.xml =================================================================== --- CalDAVTester/trunk/Resource/reports/basicquery/15.xml (rev 0) +++ CalDAVTester/trunk/Resource/reports/basicquery/15.xml 2007-04-12 16:32:13 UTC (rev 1479) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"> +<D:prop> +<D:getetag/> +<C:calendar-data/> +</D:prop> +<C:filter> +<C:comp-filter name="VCALENDAR"> +<C:comp-filter name="VJOURNAL"/> +</C:comp-filter> +</C:filter> +</C:calendar-query> Modified: CalDAVTester/trunk/scripts/tests/reports.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/reports.xml 2007-04-12 02:51:59 UTC (rev 1478) +++ CalDAVTester/trunk/scripts/tests/reports.xml 2007-04-12 16:32:13 UTC (rev 1479) @@ -806,6 +806,19 @@ </verify> </request> </test> + <test name='21' ignore='no'> + <description>empty query</description> + <request print-response='no'> + <method>REPORT</method> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/reports/basicquery/15.xml</filepath> + </data> + <verify> + <callback>multistatusItems</callback> + </verify> + </request> + </test> </test-suite> <test-suite name='time-range query reports' ignore='no'>

1 0

[1478] CalendarServer/trunk/twistedcaldav/schedule.py
by source_changes＠macosforge.org 12 Apr '07

12 Apr '07

Revision: 1478 http://trac.macosforge.org/projects/calendarserver/changeset/1478 Author: cdaboo(a)apple.com Date: 2007-04-11 19:51:59 -0700 (Wed, 11 Apr 2007) Log Message: ----------- Make sure calendar-free-busy-set is a live property. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/schedule.py Modified: CalendarServer/trunk/twistedcaldav/schedule.py =================================================================== --- CalendarServer/trunk/twistedcaldav/schedule.py 2007-04-12 02:48:40 UTC (rev 1477) +++ CalendarServer/trunk/twistedcaldav/schedule.py 2007-04-12 02:51:59 UTC (rev 1478) @@ -26,7 +26,7 @@ ] from twisted.internet import reactor -from twisted.internet.defer import deferredGenerator, maybeDeferred, waitForDeferred +from twisted.internet.defer import deferredGenerator, maybeDeferred, succeed, waitForDeferred from twisted.python import log from twisted.python.failure import Failure from twisted.web2 import responsecode @@ -91,6 +91,11 @@ Extends L{DAVResource} to provide CalDAV functionality. """ + + liveProperties = CalendarSchedulingCollectionResource.liveProperties + ( + (caldav_namespace, "calendar-free-busy-set"), + ) + def resourceType(self): return davxml.ResourceType.scheduleInbox @@ -105,6 +110,19 @@ ), ) + def readProperty(self, property, request): + if type(property) is tuple: + qname = property + else: + qname = property.qname() + + if qname == (caldav_namespace, "calendar-free-busy-set"): + # Always return at least an empty list + if not self.hasDeadProperty(property): + return succeed(()) + + return super(ScheduleInboxResource, self).readProperty(property, request) + @deferredGenerator def writeProperty(self, property, request): assert isinstance(property, davxml.WebDAVElement)

1 0

[1477] CalDAVTester/trunk
by source_changes＠macosforge.org 12 Apr '07

12 Apr '07

Revision: 1477 http://trac.macosforge.org/projects/calendarserver/changeset/1477 Author: cdaboo(a)apple.com Date: 2007-04-11 19:48:40 -0700 (Wed, 11 Apr 2007) Log Message: ----------- Make sure calendar-free-busy-set is a live property. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/scheduleprops.xml Added Paths: ----------- CalDAVTester/trunk/Resource/scheduleprops/5.xml Added: CalDAVTester/trunk/Resource/scheduleprops/5.xml =================================================================== --- CalDAVTester/trunk/Resource/scheduleprops/5.xml (rev 0) +++ CalDAVTester/trunk/Resource/scheduleprops/5.xml 2007-04-12 02:48:40 UTC (rev 1477) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" ?> +<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"> +<D:remove> +<D:prop> +<C:calendar-free-busy-set/> +</D:prop> +</D:remove> +</D:propertyupdate> Modified: CalDAVTester/trunk/scripts/tests/scheduleprops.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/scheduleprops.xml 2007-04-12 00:40:28 UTC (rev 1476) +++ CalDAVTester/trunk/scripts/tests/scheduleprops.xml 2007-04-12 02:48:40 UTC (rev 1477) @@ -112,6 +112,24 @@ </request> </test> <test name='4' ignore='no'> + <description>PROPPATCH delete it - fails</description> + <request print-response="no"> + <method>PROPPATCH</method> + <ruri>$pathprefix:/$inbox:/</ruri> + <data> + <content-type>text/xml; charset=utf-8</content-type> + <filepath>Resource/scheduleprops/5.xml</filepath> + </data> + <verify> + <callback>propfindItems</callback> + <arg> + <name>badprops</name> + <value>urn:ietf:params:xml:ns:caldavcalendar-free-busy-set</value> + </arg> + </verify> + </request> + </test> + <test name='5' ignore='no'> <description>PROPPATCH valid calendar - reset it</description> <request print-response="no"> <method>PROPPATCH</method>

1 0

[1476] CalendarServer/trunk
by source_changes＠macosforge.org 12 Apr '07

12 Apr '07

Revision: 1476 http://trac.macosforge.org/projects/calendarserver/changeset/1476 Author: dreid(a)apple.com Date: 2007-04-11 17:40:28 -0700 (Wed, 11 Apr 2007) Log Message: ----------- Ability to run twistd with profiling enabled Modified Paths: -------------- CalendarServer/trunk/bin/caldavd CalendarServer/trunk/run Modified: CalendarServer/trunk/bin/caldavd =================================================================== --- CalendarServer/trunk/bin/caldavd 2007-04-11 21:36:28 UTC (rev 1475) +++ CalendarServer/trunk/bin/caldavd 2007-04-12 00:40:28 UTC (rev 1476) @@ -28,6 +28,7 @@ twistdpath="$(type -p twistd)"; plugin_name="caldav"; service_type=""; +profile=""; py_version () { @@ -79,7 +80,7 @@ if [ "${1--}" != "-" ]; then echo "$@"; echo; fi; - echo "Usage: ${program} [-hX] [-u username] [-g groupname] [-T twistd] [-t type] [-f caldavd.plist]"; + echo "Usage: ${program} [-hX] [-u username] [-g groupname] [-T twistd] [-t type] [-f caldavd.plist] [-p statsfile]"; echo "Options:"; echo " -h Print this help and exit"; echo " -X Do not daemonize"; @@ -88,12 +89,13 @@ echo " -f Configuration file to read"; echo " -T Path to twistd binary"; echo " -t Process type (Master, Slave or Combined)"; + echo " -p Path to the desired pstats file."; if [ "${1-}" == "-" ]; then return 0; fi; exit 64; } -while getopts 'hXu:g:f:T:P:t:' option; do +while getopts 'hXu:g:f:T:P:t:p:' option; do case "${option}" in '?') usage; ;; 'h') usage -; exit 0; ;; @@ -104,6 +106,7 @@ 'g') groupname="-g ${OPTARG}"; ;; 'P') plugin_name="${OPTARG}"; ;; 't') service_type="-o ProcessType=${OPTARG}"; ;; + 'p') profile="--profile=${OPTARG} --nothotshot --savestats"; ;; esac; done; @@ -113,4 +116,4 @@ export PYTHONPATH -exec "${python}" "${twistdpath}" ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type}; +exec "${python}" "${twistdpath}" ${daemonize} ${username} ${groupname} ${profile} "${plugin_name}" ${configfile} ${service_type}; Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2007-04-11 21:36:28 UTC (rev 1475) +++ CalendarServer/trunk/run 2007-04-12 00:40:28 UTC (rev 1476) @@ -39,6 +39,7 @@ plugin_name="caldav"; service_type="Combined"; read_key=""; + profile=""; usage () { @@ -46,7 +47,7 @@ if [ "${1--}" != "-" ]; then echo "$@"; echo; fi; - echo "Usage: ${program} [-hvsfpndkr] [-K key] [-iI dst] [-t type]"; + echo "Usage: ${program} [-hvsfpndkr] [-K key] [-iI dst] [-t type] [-S statsfile]"; echo "Options:"; echo " -h Print this help and exit"; echo " -v Be verbose"; @@ -61,12 +62,13 @@ echo " -i Perform a system install into dst; implies -s"; echo " -I Perform a home install into dst; implies -s"; echo " -t Select the server process type (Master, Slave or Combined)"; + echo " -S Write a pstats object to the given file when the server is stopped."; if [ "${1-}" == "-" ]; then return 0; fi; exit 64; } -while getopts 'hvsfnpkrdP:i:I:t:K:' option; do +while getopts 'hvsfnpkrdP:i:I:t:K:S:' option; do case "$option" in '?') usage; ;; 'h') usage -; exit 0; ;; @@ -83,6 +85,7 @@ 'I') setup_only="true"; install="${wd}/build/dst"; install_flag="--root="; install_home="${OPTARG}"; ;; 't') service_type="${OPTARG}"; ;; 'K') read_key="${OPTARG}"; ;; + 'S') profile="-p ${OPTARG}"; ;; esac; done; shift $((${OPTIND} - 1)); @@ -231,7 +234,8 @@ -f "${config}" \ -T "${twisted}/bin/twistd" \ -P "${plugin_name}" \ - -t "${service_type}"; + -t "${service_type}" \ + ${profile}; cd /; fi; }

1 0