[CalendarServer-changes] [9786] CalendarServer/branches/users/gaya/directorybacker

source_changes at macosforge.org source_changes at macosforge.org
Thu Sep 6 16:49:57 PDT 2012


Revision: 9786
          http://trac.macosforge.org/projects/calendarserver/changeset/9786
Author:   gaya at apple.com
Date:     2012-09-06 16:49:57 -0700 (Thu, 06 Sep 2012)
Log Message:
-----------
update to trunk

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/directorybacker/bin/_calendarserver_preamble.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/dsattributes.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/dsquery.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/opendirectory.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/setup_directory.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/test/test_opendirectory.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/test/test_root.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/push/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/push/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/cfgchild.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/profiling.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/longlines.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/test_util.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/backup_pg.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/cmdline.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/config.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/doublequotefix.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/export.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/gateway.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/icalsplit.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/loadaugmentdb.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/managepostgres.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/managetimezones.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/migrate.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/notifications.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/resources.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/tables.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_changeip.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_export.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_gateway.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_purge.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_resources.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_util.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/upgrade.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/warmup.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/webadmin/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/webadmin/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/calendarserver/webcal/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/test/test_certupdate.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/migration/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/migration/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/_event_change.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/_event_create.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchlib.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmark.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/bounded_recurrence.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_add_attendee.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_autoaccept.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_change_date.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_change_summary.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_delete.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_delete_attendee.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_move.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/find_calendars.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/find_events.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/unbounded_recurrence.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/vfreebusy.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/vfreebusy_vary_attendees.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/compare.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/display-calendar-events.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/graph.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/httpauth.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/httpclient.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/ampsim.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/test_trafficlogger.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/trafficlogger.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/massupload.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/report.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/report_principals.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/setbackend.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/sqlwatch.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/stackedbar.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/test_benchmark.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/test_event_change_date.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/performance/upload.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/anonymous_log.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/dtraceanalyze.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/fakecalendardata.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/monitoranalysis.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/monitorsplit.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/pg_stats_analysis.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/sortrecurrences.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/sqldata_from_path.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/tables.py
    CalendarServer/branches/users/gaya/directorybacker/contrib/tools/test_protocolanalysis.py
    CalendarServer/branches/users/gaya/directorybacker/setup.py
    CalendarServer/branches/users/gaya/directorybacker/support/directorysetup.py
    CalendarServer/branches/users/gaya/directorybacker/support/version.py
    CalendarServer/branches/users/gaya/directorybacker/testserver
    CalendarServer/branches/users/gaya/directorybacker/twext/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/parseschema.py
    CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/test/test_parseschema.py
    CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/ienterprise.py
    CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/util.py
    CalendarServer/branches/users/gaya/directorybacker/twext/internet/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/internet/decorate.py
    CalendarServer/branches/users/gaya/directorybacker/twext/internet/spawnsvc.py
    CalendarServer/branches/users/gaya/directorybacker/twext/internet/ssl.py
    CalendarServer/branches/users/gaya/directorybacker/twext/internet/tcp.py
    CalendarServer/branches/users/gaya/directorybacker/twext/internet/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/internet/threadutils.py
    CalendarServer/branches/users/gaya/directorybacker/twext/protocols/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/protocols/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/filepath.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/log.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/plistlib.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/sendfd.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/test/pullpipe.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_filepath.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_log.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_sendmsg.py
    CalendarServer/branches/users/gaya/directorybacker/twext/python/vcomponent.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/basic.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/digest.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/interfaces.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/wrapper.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/channel/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/channel/http.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/http.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/interfaces.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/fileop.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/idav.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/acl.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/copymove.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/delete.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/delete_common.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/get.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/lock.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/mkcol.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/prop_common.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/put.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/put_common.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_acl_principal_prop_set.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_expand.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_match.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_property_search.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_search_property_set.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/noneprops.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_acl.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_copy.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_delete.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_http.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_lock.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_mkcol.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_move.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_options.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_pipeline.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_put.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_quota.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_report.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_report_expand.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_resource.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_static.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_util.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/util.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/util.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/xattrprops.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/error.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/fileupload.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/http.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/iweb.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/resource.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/responsecode.py
    CalendarServer/branches/users/gaya/directorybacker/twext/web2/stream.py
    CalendarServer/branches/users/gaya/directorybacker/twisted/plugins/caldav.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/accounting.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/authkerb.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/bind.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/carddavxml.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/geturl.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/pool.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/test/test_reverseproxy.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/database.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/addressdata.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/calendardata.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/filter.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/peruserdata.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/privateevents.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_calendardata.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_peruserdata.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_privateevents.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/calendaruserproxyloader.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/common.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/digest.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/directory.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/idirectory.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/internal.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/ldapdirectorybacker.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/opendirectorybacker.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/resource.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/resourceinfo.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_aggregate.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_buildquery.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_calendar.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_digest.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_directory.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_livedirectory.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_modify.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_proxyprincipalmembers.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_resources.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_xmlfile.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/dropbox.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/freebusyurl.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/icaldav.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/linkresource.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/localization.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/memcachelock.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/memcacheprops.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/acl.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/copymove_contact.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/delete.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/delete_common.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/get.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/put_addressbook_common.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_addressbook_multiget.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_calendar_multiget.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_freebusy.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/mkcolxml.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/notifications.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/addressbookquery.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/calendarquery.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/expression.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/sqlgenerator.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_addressbookquery.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_calendarquery.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_expression.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_queryfilter.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/addressmapping.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/cuaddress.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/delivery.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/ischeduleservers.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/test_caldav.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/test_imip.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/utils.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/servers.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/sharedcollection.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/sql.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/csv2ical.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/makelargecalendars.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/makelargefbset.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/split_holidays.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_accounting.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_addressbookmultiget.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_addressbookquery.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_caldavxml.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_collectioncontents.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_config.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_customxml.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_database.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_extensions.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_freebusyquery.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_kerberos.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_link.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_localization.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_memcachepool.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_memcacheprops.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_mkcalendar.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_multiget.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_notify.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_options.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_resource.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_servers.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_sharing.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_sql.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_timezones.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_timezonestdservice.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_xml.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_xmlutil.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/timezones.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/util.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/vcard.py
    CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/xmlutil.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/dbapiclient.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/file.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/subpostgres.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/test/test_subpostgres.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/util.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/appledouble_xattr.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/none.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_appledouble.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_base.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_none.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/test_index_file.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/test_util.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/resource.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/file.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/index_file.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/test/test_index_file.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/util.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/iaddressbookstore.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/resource.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/file/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/migrate.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/test/test_upgrade.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrade.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/upgrade_from_1_to_2.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/upgrade_from_2_to_3.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/util.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/test/__init__.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/test/test_migrate.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/common/inotifications.py
    CalendarServer/branches/users/gaya/directorybacker/txdav/xml/rfc4331.py

Property Changed:
----------------
    CalendarServer/branches/users/gaya/directorybacker/


Property changes on: CalendarServer/branches/users/gaya/directorybacker
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/generic-sqlstore:6167-6191
/CalendarServer/branches/new-store:5594-5934
/CalendarServer/branches/new-store-no-caldavfile:5911-5935
/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/pods:7297-7377
/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
/CalendarServer/branches/users/cdaboo/pycard:7227-7237
/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
/CalendarServer/branches/users/glyph/conn-limit:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/dalify:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
/CalendarServer/branches/users/glyph/deploybuild:7563-7572
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
/CalendarServer/branches/users/glyph/new-export:7444-7485
/CalendarServer/branches/users/glyph/oracle:7106-7155
/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
/CalendarServer/branches/users/glyph/other-html:8062-8091
/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
/CalendarServer/branches/users/glyph/q:9560-9688
/CalendarServer/branches/users/glyph/quota:7604-7637
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
/CalendarServer/branches/users/glyph/sharedpool:6490-6550
/CalendarServer/branches/users/glyph/sharing-api:9192-9205
/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
/CalendarServer/branches/users/glyph/sql-store:5929-6073
/CalendarServer/branches/users/glyph/subtransactions:7248-7258
/CalendarServer/branches/users/glyph/table-alias:8651-8664
/CalendarServer/branches/users/glyph/uidexport:7673-7676
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
/CalendarServer/branches/users/sagen/applepush:8126-8184
/CalendarServer/branches/users/sagen/inboxitems:7380-7381
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:9759-9772
   + /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/generic-sqlstore:6167-6191
/CalendarServer/branches/new-store:5594-5934
/CalendarServer/branches/new-store-no-caldavfile:5911-5935
/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/pods:7297-7377
/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
/CalendarServer/branches/users/cdaboo/pycard:7227-7237
/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
/CalendarServer/branches/users/glyph/conn-limit:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/dalify:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
/CalendarServer/branches/users/glyph/deploybuild:7563-7572
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
/CalendarServer/branches/users/glyph/new-export:7444-7485
/CalendarServer/branches/users/glyph/oracle:7106-7155
/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
/CalendarServer/branches/users/glyph/other-html:8062-8091
/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
/CalendarServer/branches/users/glyph/q:9560-9688
/CalendarServer/branches/users/glyph/quota:7604-7637
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
/CalendarServer/branches/users/glyph/sharedpool:6490-6550
/CalendarServer/branches/users/glyph/sharing-api:9192-9205
/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
/CalendarServer/branches/users/glyph/sql-store:5929-6073
/CalendarServer/branches/users/glyph/subtransactions:7248-7258
/CalendarServer/branches/users/glyph/table-alias:8651-8664
/CalendarServer/branches/users/glyph/uidexport:7673-7676
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
/CalendarServer/branches/users/sagen/applepush:8126-8184
/CalendarServer/branches/users/sagen/inboxitems:7380-7381
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:9759-9784

Modified: CalendarServer/branches/users/gaya/directorybacker/bin/_calendarserver_preamble.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/bin/_calendarserver_preamble.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/bin/_calendarserver_preamble.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: calendarserver -*-
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/dsattributes.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/dsattributes.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/dsattributes.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2008 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/dsquery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/dsquery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/dsquery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/opendirectory.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/opendirectory.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/opendirectory.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/setup_directory.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/setup_directory.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/setup_directory.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/test/test_opendirectory.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/test/test_opendirectory.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/platform/darwin/od/test/test_opendirectory.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/test/test_root.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/test/test_root.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/provision/test/test_root.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/push/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/push/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/push/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/push/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/push/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/push/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/cfgchild.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/cfgchild.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/cfgchild.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/profiling.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/profiling.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/profiling.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/longlines.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/longlines.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/longlines.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2007-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/test_util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/test_util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tap/test/test_util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2007-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/backup_pg.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/backup_pg.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/backup_pg.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/cmdline.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/cmdline.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/cmdline.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/config.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/config.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/config.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/doublequotefix.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/doublequotefix.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/doublequotefix.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 ##
-# Copyright (c) 2008 Apple Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/export.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/export.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/export.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- test-case-name: calendarserver.tools.test.test_export -*-
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/gateway.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/gateway.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/gateway.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/icalsplit.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/icalsplit.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/icalsplit.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/loadaugmentdb.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/loadaugmentdb.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/loadaugmentdb.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/managepostgres.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/managepostgres.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/managepostgres.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/managetimezones.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/managetimezones.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/managetimezones.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/migrate.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/migrate.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/migrate.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/notifications.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/notifications.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/notifications.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/resources.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/resources.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/resources.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/tables.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/tables.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/tables.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_changeip.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_changeip.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_changeip.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_export.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_export.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_export.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_gateway.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_gateway.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_gateway.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_purge.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_purge.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_purge.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_resources.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_resources.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_resources.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/test/test_util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/upgrade.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/upgrade.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/upgrade.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- test-case-name: calendarserver.tools.test.test_upgrade -*-
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/warmup.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/warmup.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/tools/warmup.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/webadmin/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/webadmin/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/webadmin/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/webadmin/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/webadmin/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/webadmin/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/calendarserver/webcal/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/calendarserver/webcal/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/calendarserver/webcal/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/test/test_certupdate.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/test/test_certupdate.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/certupdate/test/test_certupdate.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/migration/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/migration/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/migration/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/migration/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/migration/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/migration/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twistedcaldav.test -*-
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/_event_change.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/_event_change.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/_event_change.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/_event_create.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/_event_create.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/_event_create.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchlib.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchlib.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchlib.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmark.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmark.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmark.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/bounded_recurrence.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/bounded_recurrence.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/bounded_recurrence.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_add_attendee.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_add_attendee.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_add_attendee.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_autoaccept.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_autoaccept.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_autoaccept.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_change_date.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_change_date.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_change_date.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_change_summary.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_change_summary.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_change_summary.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_delete.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_delete.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_delete.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_delete_attendee.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_delete_attendee.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_delete_attendee.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_move.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_move.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/event_move.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/find_calendars.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/find_calendars.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/find_calendars.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/find_events.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/find_events.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/find_events.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/unbounded_recurrence.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/unbounded_recurrence.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/unbounded_recurrence.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/vfreebusy.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/vfreebusy.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/vfreebusy.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/vfreebusy_vary_attendees.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/vfreebusy_vary_attendees.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/benchmarks/vfreebusy_vary_attendees.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/compare.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/compare.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/compare.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/display-calendar-events.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/display-calendar-events.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/display-calendar-events.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/graph.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/graph.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/graph.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/httpauth.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/httpauth.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/httpauth.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/httpclient.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/httpclient.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/httpclient.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/ampsim.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/ampsim.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/ampsim.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/test_trafficlogger.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/test_trafficlogger.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/test_trafficlogger.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/trafficlogger.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/trafficlogger.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/loadtest/trafficlogger.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/massupload.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/massupload.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/massupload.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/report.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/report.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/report.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/report_principals.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/report_principals.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/report_principals.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/setbackend.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/setbackend.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/setbackend.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/sqlwatch.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/sqlwatch.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/sqlwatch.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/stackedbar.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/stackedbar.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/stackedbar.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/test_benchmark.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/test_benchmark.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/test_benchmark.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/test_event_change_date.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/test_event_change_date.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/test_event_change_date.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/performance/upload.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/performance/upload.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/performance/upload.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/anonymous_log.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/anonymous_log.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/anonymous_log.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/dtraceanalyze.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/dtraceanalyze.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/dtraceanalyze.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -2,7 +2,7 @@
 # coding=utf-8
 
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/fakecalendardata.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/fakecalendardata.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/fakecalendardata.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/monitoranalysis.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/monitoranalysis.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/monitoranalysis.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/monitorsplit.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/monitorsplit.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/monitorsplit.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/pg_stats_analysis.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/pg_stats_analysis.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/pg_stats_analysis.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/sortrecurrences.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/sortrecurrences.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/sortrecurrences.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/sqldata_from_path.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/sqldata_from_path.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/sqldata_from_path.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/tables.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/tables.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/tables.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/contrib/tools/test_protocolanalysis.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/contrib/tools/test_protocolanalysis.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/contrib/tools/test_protocolanalysis.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/setup.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/setup.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/setup.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/support/directorysetup.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/support/directorysetup.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/support/directorysetup.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 ##
-# Copyright (c) 2007-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/support/version.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/support/version.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/support/version.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/testserver
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/testserver	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/testserver	2012-09-06 23:49:57 UTC (rev 9786)
@@ -25,15 +25,13 @@
 
 verbose="";
 serverinfo="${cdt}/scripts/server/serverinfo.xml";
-documentroot="${wd}/data/Documents";
 
 usage ()
 {
   program="$(basename "$0")";
-  echo "Usage: ${program} [-v] [-d docroot] [-s serverinfo]";
+  echo "Usage: ${program} [-v] [-s serverinfo]";
   echo "Options:";
   echo "        -h  Print this help and exit";
-  echo "        -d  Set the document root";
   echo "        -s  Set the serverinfo.xml";
   echo "        -v  Verbose.";
 
@@ -41,11 +39,10 @@
   exit 64;
 }
 
-while getopts 'hvd:s:' option; do
+while getopts 'hvs:' option; do
   case "$option" in 
     '?') usage; ;;
     'h') usage -; exit 0; ;;
-    'd') documentroot="${OPTARG}"; ;;
     's')   serverinfo="${OPTARG}"; ;;
     'v')      verbose="v"; ;;
   esac;
@@ -63,11 +60,5 @@
 
 source "${wd}/support/shell.sh";
 
-if [ ! -e "${documentroot}/calendars/__uids__/user09" ]; then
-  curl "http://localhost:8008/calendars/__uids__/user09/";
-fi;
-
-"${python}" twistedcaldav/test/data/makelargecalendars.py -o 9 -d "${documentroot}";
-
 cd "${cdt}" && "${python}" testcaldav.py --print-details-onfail -s "${serverinfo}" "$@";
 

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/parseschema.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/parseschema.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/parseschema.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.enterprise.dal.test.test_parseschema -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/test/test_parseschema.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/test/test_parseschema.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/dal/test/test_parseschema.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/ienterprise.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/ienterprise.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/ienterprise.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/enterprise/util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/internet/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/internet/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/internet/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/internet/decorate.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/internet/decorate.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/internet/decorate.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/internet/spawnsvc.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/internet/spawnsvc.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/internet/spawnsvc.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/internet/ssl.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/internet/ssl.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/internet/ssl.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2008 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/internet/tcp.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/internet/tcp.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/internet/tcp.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/internet/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/internet/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/internet/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/internet/threadutils.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/internet/threadutils.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/internet/threadutils.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/protocols/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/protocols/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/protocols/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/protocols/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/protocols/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/protocols/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/filepath.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/filepath.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/filepath.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.python.test.test_filepath -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/log.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/log.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/log.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/plistlib.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/plistlib.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/plistlib.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2008 Apple Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/sendfd.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/sendfd.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/sendfd.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.python.test.test_sendmsg -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/test/pullpipe.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/test/pullpipe.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/test/pullpipe.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- test-case-name: twext.python.test.test_sendmsg -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_filepath.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_filepath.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_filepath.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_log.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_log.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_log.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_sendmsg.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_sendmsg.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/test/test_sendmsg.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/python/vcomponent.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/python/vcomponent.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/python/vcomponent.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright (c) 2009 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/basic.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/basic.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/basic.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_httpauth -*-
 ##
 # Copyright (c) 2006-2009 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/digest.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/digest.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/digest.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_httpauth -*-
 ##
 # Copyright (c) 2006-2009 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/interfaces.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/interfaces.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/interfaces.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 ##
 # Copyright (c) 2004-2007 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/wrapper.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/wrapper.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/auth/wrapper.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_httpauth -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/channel/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/channel/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/channel/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_cgi,twext.web2.test.test_http -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/channel/http.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/channel/http.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/channel/http.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_http -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2008-2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -657,6 +657,7 @@
         self.write(text)
         self.write("\n")
         self.finish()
+        log.warn("Aborted request (%d) %s" % (errorcode, text))
         raise AbortedException
     
     def _cleanup(self):

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_client -*-
 ##
 # Copyright (c) 2004 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/http.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/http.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/http.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_client -*-
 ##
 # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/interfaces.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/interfaces.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/client/interfaces.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_client -*-
 ##
 # Copyright (c) 2007 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright (c) 2009 Twisted Matrix Laboratories.
-# Copyright (c) 2005-2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/fileop.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/fileop.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/fileop.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/idav.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/idav.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/idav.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/acl.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/acl.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/acl.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_lock -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/copymove.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/copymove.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/copymove.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_copy,twext.web2.dav.test.test_move -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/delete.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/delete.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/delete.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_delete -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/delete_common.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/delete_common.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/delete_common.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_delete -*-
 ##
-# Copyright (c) 2005-2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/get.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/get.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/get.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_lock -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/lock.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/lock.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/lock.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_lock -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/mkcol.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/mkcol.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/mkcol.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_mkcol -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/prop_common.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/prop_common.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/prop_common.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 ##
 # Cyrus Daboo, cdaboo at apple.com
-# Copyright 2006 Apple Computer, Inc.  All Rights Reserved.
+# Copyright 2006-2012 Apple Computer, Inc.  All Rights Reserved.
 ##
 
 __all__ = [

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/put.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/put.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/put.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_put -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/put_common.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/put_common.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/put_common.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_report -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_acl_principal_prop_set.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_acl_principal_prop_set.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_acl_principal_prop_set.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
 ##
-# Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_expand.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_expand.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_expand.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
 ##
-# Copyright (c) 2005-2008 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_match.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_match.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_match.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
 ##
-# Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_property_search.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_property_search.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_property_search.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
 ##
-# Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_search_property_set.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_search_property_set.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/method/report_principal_search_property_set.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
 ##
-# Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/noneprops.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/noneprops.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/noneprops.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_acl.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_acl.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_acl.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_copy.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_copy.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_copy.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_delete.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_delete.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_delete.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_http.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_http.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_http.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_lock.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_lock.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_lock.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_mkcol.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_mkcol.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_mkcol.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_move.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_move.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_move.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_options.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_options.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_options.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_pipeline.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_pipeline.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_pipeline.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_put.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_put.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_put.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_quota.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_quota.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_quota.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_report.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_report.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_report.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_report_expand.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_report_expand.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_report_expand.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_resource.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_resource.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_static.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_static.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_static.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/test_util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/test/util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twext.web2.test.test_util -*-
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/xattrprops.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/xattrprops.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/dav/xattrprops.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -2,7 +2,7 @@
 # See LICENSE for details.
 
 ##
-# Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/error.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/error.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/error.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_log -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/fileupload.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/fileupload.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/fileupload.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/http.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/http.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/http.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_http -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/iweb.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/iweb.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/iweb.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test -*-
 ##
 # Copyright (c) 2001-2008 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/resource.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/resource.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/resource.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_server,twext.web2.test.test_resource -*-
 ##
 # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/responsecode.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/responsecode.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/responsecode.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twext/web2/stream.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twext/web2/stream.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twext/web2/stream.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 # -*- test-case-name: twext.web2.test.test_stream -*-
 ##
 # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
-# Copyright (c) 2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twisted/plugins/caldav.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twisted/plugins/caldav.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twisted/plugins/caldav.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/accounting.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/accounting.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/accounting.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/authkerb.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/authkerb.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/authkerb.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
-# Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/bind.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/bind.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/bind.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/carddavxml.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/carddavxml.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/carddavxml.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/geturl.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/geturl.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/geturl.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/pool.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/pool.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/pool.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/test/test_reverseproxy.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/test/test_reverseproxy.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/client/test/test_reverseproxy.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/database.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/database.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/database.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/addressdata.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/addressdata.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/addressdata.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/calendardata.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/calendardata.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/calendardata.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/filter.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/filter.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/filter.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/peruserdata.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/peruserdata.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/peruserdata.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/privateevents.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/privateevents.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/privateevents.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_calendardata.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_calendardata.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_calendardata.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_peruserdata.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_peruserdata.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_peruserdata.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_privateevents.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_privateevents.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/datafilters/test/test_privateevents.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/calendaruserproxyloader.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/calendaruserproxyloader.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/calendaruserproxyloader.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/common.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/common.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/common.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twistedcaldav.test.test_wrapping,twistedcaldav.directory.test.test_calendar -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/digest.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/digest.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/digest.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/directory.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/directory.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -721,17 +721,18 @@
         self.log_info("Updating group membership cache")
 
         dataRoot = FilePath(config.DataRoot)
-        snapshotFile = dataRoot.child("memberships_cache")
+        membershipsCacheFile = dataRoot.child("memberships_cache")
+        extProxyCacheFile = dataRoot.child("external_proxy_cache")
 
-        if not snapshotFile.exists():
+        if not membershipsCacheFile.exists():
             self.log_info("Group membership snapshot file does not yet exist")
             fast = False
             previousMembers = {}
             callGroupsChanged = False
         else:
             self.log_info("Group membership snapshot file exists: %s" %
-                (snapshotFile.path,))
-            previousMembers = pickle.loads(snapshotFile.getContent())
+                (membershipsCacheFile.path,))
+            previousMembers = pickle.loads(membershipsCacheFile.getContent())
             callGroupsChanged = True
 
         if useLock:
@@ -743,37 +744,75 @@
             self.log_info("Acquired lock")
 
         if not fast and self.useExternalProxies:
+
+            # Load in cached copy of external proxies so we can diff against them
+            previousAssignments = []
+            if extProxyCacheFile.exists():
+                self.log_info("External proxies snapshot file exists: %s" %
+                    (extProxyCacheFile.path,))
+                previousAssignments = pickle.loads(extProxyCacheFile.getContent())
+
             self.log_info("Retrieving proxy assignments from directory")
             assignments = self.externalProxiesSource()
             self.log_info("%d proxy assignments retrieved from directory" %
                 (len(assignments),))
+
+            changed, removed = diffAssignments(previousAssignments, assignments)
+            # changed is the list of proxy assignments (either new or updates).
+            # removed is the list of principals who used to have an external
+            #   delegate but don't anymore.
+
             # populate proxy DB from external resource info
-            self.log_info("Applying proxy assignment changes")
-            assignmentCount = 0
-            totalNumAssignments = len(assignments)
-            currentAssignmentNum = 0
-            for principalUID, members in assignments:
-                currentAssignmentNum += 1
-                if currentAssignmentNum % 1000 == 0:
-                    self.log_info("...proxy assignment %d of %d" % (currentAssignmentNum,
-                        totalNumAssignments))
-                try:
-                    current = (yield self.proxyDB.getMembers(principalUID))
-                    if members != current:
+            if changed:
+                self.log_info("Updating proxy assignments")
+                assignmentCount = 0
+                totalNumAssignments = len(changed)
+                currentAssignmentNum = 0
+                for principalUID, members in changed:
+                    currentAssignmentNum += 1
+                    if currentAssignmentNum % 1000 == 0:
+                        self.log_info("...proxy assignment %d of %d" % (currentAssignmentNum,
+                            totalNumAssignments))
+                    try:
+                        current = (yield self.proxyDB.getMembers(principalUID))
+                        if members != current:
+                            assignmentCount += 1
+                            yield self.proxyDB.setGroupMembers(principalUID, members)
+                    except Exception, e:
+                        self.log_error("Unable to update proxy assignment: principal=%s, members=%s, error=%s" % (principalUID, members, e))
+                self.log_info("Updated %d assignment%s in proxy database" %
+                    (assignmentCount, "" if assignmentCount == 1 else "s"))
+
+            if removed:
+                self.log_info("Deleting proxy assignments")
+                assignmentCount = 0
+                totalNumAssignments = len(removed)
+                currentAssignmentNum = 0
+                for principalUID in removed:
+                    currentAssignmentNum += 1
+                    if currentAssignmentNum % 1000 == 0:
+                        self.log_info("...proxy assignment %d of %d" % (currentAssignmentNum,
+                            totalNumAssignments))
+                    try:
                         assignmentCount += 1
-                        yield self.proxyDB.setGroupMembers(principalUID, members)
-                except Exception, e:
-                    self.log_error("Unable to apply proxy assignment: principal=%s, members=%s, error=%s" % (principalUID, members, e))
-            self.log_info("Applied %d assignment%s to proxy database" %
-                (assignmentCount, "" if assignmentCount == 1 else "s"))
+                        yield self.proxyDB.setGroupMembers(principalUID, [])
+                    except Exception, e:
+                        self.log_error("Unable to remove proxy assignment: principal=%s, members=%s, error=%s" % (principalUID, members, e))
+                self.log_info("Removed %d assignment%s from proxy database" %
+                    (assignmentCount, "" if assignmentCount == 1 else "s"))
 
+            # Store external proxy snapshot
+            self.log_info("Taking snapshot of external proxies to %s" %
+                (extProxyCacheFile.path,))
+            extProxyCacheFile.setContent(pickle.dumps(assignments))
+
         if fast:
             # If there is an on-disk snapshot of the membership information,
             # load that and put into memcached, bypassing the faulting in of
             # any records, so that the server can start up quickly.
 
             self.log_info("Loading group memberships from snapshot")
-            members = pickle.loads(snapshotFile.getContent())
+            members = pickle.loads(membershipsCacheFile.getContent())
 
         else:
             # Fetch the group hierarchy from the directory, fetch the list
@@ -813,8 +852,8 @@
 
             # Store snapshot
             self.log_info("Taking snapshot of group memberships to %s" %
-                (snapshotFile.path,))
-            snapshotFile.setContent(pickle.dumps(members))
+                (membershipsCacheFile.path,))
+            membershipsCacheFile.setContent(pickle.dumps(members))
 
             # Update ownership
             uid = gid = -1
@@ -822,7 +861,9 @@
                 uid = pwd.getpwnam(config.UserName).pw_uid
             if config.GroupName:
                 gid = grp.getgrnam(config.GroupName).gr_gid
-            os.chown(snapshotFile.path, uid, gid)
+            os.chown(membershipsCacheFile.path, uid, gid)
+            if extProxyCacheFile.exists():
+                os.chown(extProxyCacheFile.path, uid, gid)
 
         self.log_info("Storing %d group memberships in memcached" %
                        (len(members),))
@@ -1115,7 +1156,35 @@
 
         return cacherService
 
+def diffAssignments(old, new):
+    """
+    Compare two proxy assignment lists and return their differences in the form of
+    two lists -- one for added/updated assignments, and one for removed assignments.
+    @param old: list of (group, set(members)) tuples
+    @type old: C{list}
+    @param new: list of (group, set(members)) tuples
+    @type new: C{list}
+    @return: Tuple of two lists; the first list contains tuples of (proxy-principal,
+        set(members)), and represents all the new or updated assignments.  The
+        second list contains all the proxy-principals which used to have a delegate
+        but don't anymore.
+    """
+    old = dict(old)
+    new = dict(new)
+    changed = []
+    removed = []
+    for key in old.iterkeys():
+        if key not in new:
+            removed.append(key)
+        else:
+            if old[key] != new[key]:
+                changed.append((key, new[key]))
+    for key in new.iterkeys():
+        if key not in old:
+            changed.append((key, new[key]))
+    return changed, removed
 
+
 class DirectoryRecord(LoggingMixIn):
     implements(IDirectoryRecord)
 

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/idirectory.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/idirectory.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/idirectory.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/internal.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/internal.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/internal.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/ldapdirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -130,7 +130,7 @@
         
  
     def createCache(self):
-         succeed(None)
+        succeed(None)
                         
 
     @inlineCallbacks
@@ -247,7 +247,6 @@
         """
     
         results = {} if self.removeDuplicateUIDs else []
-        limited = False
         
         #one ldap query for each rnd in queries
         for queryMap in self.rdnSchema["queries"]:

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -115,7 +115,7 @@
         def addNodesToNodeRecordTypeMap(nodeList, recordType):
             for node in nodeList if isinstance(nodeList, list) else (nodeList,):
                 if not node in nodeRecordTypeMap:
-                     nodeRecordTypeMap[node] = []
+                    nodeRecordTypeMap[node] = []
                 nodeRecordTypeMap[node] += [recordType,]
             self.recordTypes += [recordType,]
 
@@ -124,7 +124,7 @@
         if queryPeopleRecords:
             addNodesToNodeRecordTypeMap(peopleNode, dsattributes.kDSStdRecordTypePeople,)
         if queryUserRecords:
-             addNodesToNodeRecordTypeMap(userNode, dsattributes.kDSStdRecordTypeUsers,)
+            addNodesToNodeRecordTypeMap(userNode, dsattributes.kDSStdRecordTypeUsers,)
         if queryGroupRecords:
             addNodesToNodeRecordTypeMap(groupNode, dsattributes.kDSStdRecordTypeGroups,)
         
@@ -490,7 +490,7 @@
                 kind = dsRecordTypeToKindMap.get(recordType, "individual")
                 constantProperties["KIND"] = kind
            
-                filterPropertyNames, dsFilter  = dsFilterFromAddressBookFilter( addressBookFilter, 
+                filterPropertyNames, dsFilter  = dsFilterFromAddressBookFilter( addressBookFilter,  #@UnusedVariable
                                                                                          self.vcardPropToSearchableDSAttrMap,
                                                                                          constantProperties=constantProperties );
                 if not dsFilter is False:

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/resource.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/resource.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/resource.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/resourceinfo.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/resourceinfo.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/resourceinfo.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_aggregate.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_aggregate.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_aggregate.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_buildquery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_buildquery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_buildquery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_calendar.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_calendar.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_calendar.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_digest.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_digest.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_digest.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_directory.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_directory.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_directory.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -21,7 +21,7 @@
 from twistedcaldav.test.util import TestCase
 from twistedcaldav.test.util import xmlFile, augmentsFile, proxiesFile, dirTest
 from twistedcaldav.config import config
-from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord, GroupMembershipCacherService, GroupMembershipCache, GroupMembershipCacheUpdater
+from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord, GroupMembershipCacherService, GroupMembershipCache, GroupMembershipCacheUpdater, diffAssignments
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 from twistedcaldav.directory.calendaruserproxyloader import XMLCalendarUserProxyLoader
 from twistedcaldav.directory import augment, calendaruserproxy
@@ -485,7 +485,172 @@
                 groups,
             )
 
+        #
+        # Now remove two external assignments, and those should take effect.
+        #
+        def fakeExternalProxiesRemoved():
+            return [
+                (
+                    "transporter#calendar-proxy-write",
+                    set(["8B4288F6-CC82-491D-8EF9-642EF4F3E7D0"])
+                ),
+            ]
 
+        updater = GroupMembershipCacheUpdater(
+            calendaruserproxy.ProxyDBService, self.directoryService, 30, 30,
+            cache=cache, useExternalProxies=True,
+            externalProxiesSource=fakeExternalProxiesRemoved)
+
+        yield updater.updateCache()
+
+        delegates = (
+
+            # record name
+            # read-write delegators
+            # read-only delegators
+            # groups delegate is in (restricted to only those groups
+            #   participating in delegation)
+
+            # Note: "transporter" is now gone for wsanchez and cdaboo
+
+            ("wsanchez",
+             set(["mercury", "apollo", "orion", "gemini"]),
+             set(["non_calendar_proxy"]),
+             set(['left_coast',
+                  'both_coasts',
+                  'recursive1_coasts',
+                  'recursive2_coasts',
+                  'gemini#calendar-proxy-write',
+                ]),
+            ),
+            ("cdaboo",
+             set(["apollo", "orion", "non_calendar_proxy"]),
+             set(["non_calendar_proxy"]),
+             set(['both_coasts',
+                  'non_calendar_group',
+                  'recursive1_coasts',
+                  'recursive2_coasts',
+                ]),
+            ),
+            ("lecroy",
+             set(["apollo", "mercury", "non_calendar_proxy", "transporter"]),
+             set(),
+             set(['both_coasts',
+                  'left_coast',
+                  'non_calendar_group',
+                  'transporter#calendar-proxy-write',
+                ]),
+            ),
+        )
+
+        for name, write, read, groups in delegates:
+            delegate = self._getPrincipalByShortName(DirectoryService.recordType_users, name)
+
+            proxyFor = (yield delegate.proxyFor(True))
+            self.assertEquals(
+                set([p.record.guid for p in proxyFor]),
+                write,
+            )
+            proxyFor = (yield delegate.proxyFor(False))
+            self.assertEquals(
+                set([p.record.guid for p in proxyFor]),
+                read,
+            )
+            groupsIn = (yield delegate.groupMemberships())
+            uids = set()
+            for group in groupsIn:
+                try:
+                    uid = group.uid # a sub-principal
+                except AttributeError:
+                    uid = group.record.guid # a regular group
+                uids.add(uid)
+            self.assertEquals(
+                set(uids),
+                groups,
+            )
+
+    def test_diffAssignments(self):
+        """
+        Ensure external proxy assignment diffing works
+        """
+
+        self.assertEquals(
+            (
+                # changed
+                [ ],
+                # removed
+                [ ],
+            ),
+            diffAssignments(
+                # old
+                [ ],
+                # new
+                [ ],
+            )
+        )
+
+        self.assertEquals(
+            (
+                # changed
+                [ ],
+                # removed
+                [ ],
+            ),
+            diffAssignments(
+                # old
+                [ ("B", set(["3"])), ("A", set(["1", "2"])), ],
+                # new
+                [ ("A", set(["1", "2"])), ("B", set(["3"])), ],
+            )
+        )
+
+        self.assertEquals(
+            (
+                # changed
+                [ ("A", set(["1", "2"])), ("B", set(["3"])), ],
+                # removed
+                [ ],
+            ),
+            diffAssignments(
+                # old
+                [ ],
+                # new
+                [ ("A", set(["1", "2"])), ("B", set(["3"])), ],
+            )
+        )
+
+        self.assertEquals(
+            (
+                # changed
+                [ ],
+                # removed
+                [ "A", "B" ],
+            ),
+            diffAssignments(
+                # old
+                [ ("A", set(["1", "2"])), ("B", set(["3"])), ],
+                # new
+                [ ],
+            )
+        )
+
+        self.assertEquals(
+            (
+                # changed
+                [ ("A", set(["2"])), ("C", set(["4", "5"])), ("D", set(["6"])), ],
+                # removed
+                [ "B" ],
+            ),
+            diffAssignments(
+                # old
+                [ ("A", set(["1", "2"])), ("B", set(["3"])), ("C", set(["4"])), ],
+                # new
+                [ ("D", set(["6"])), ("C", set(["4", "5"])), ("A", set(["2"])), ],
+            )
+        )
+
+
+
     @inlineCallbacks
     def test_groupMembershipCacheSnapshot(self):
         """

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_livedirectory.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_livedirectory.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_livedirectory.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_modify.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_modify.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_modify.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_resources.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_resources.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_resources.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_xmlfile.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/directory/test/test_xmlfile.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/dropbox.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/dropbox.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/dropbox.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/freebusyurl.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/freebusyurl.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/freebusyurl.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/icaldav.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/icaldav.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/icaldav.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/linkresource.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/linkresource.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/linkresource.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/localization.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/localization.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/localization.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/memcachelock.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/memcachelock.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/memcachelock.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2008-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/memcacheprops.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/memcacheprops.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/memcacheprops.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/acl.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/acl.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/acl.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/copymove_contact.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/copymove_contact.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/copymove_contact.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/delete.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/delete.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/delete.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/delete_common.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/delete_common.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/delete_common.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/get.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/get.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/get.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/put_addressbook_common.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/put_addressbook_common.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/put_addressbook_common.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2008 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_addressbook_multiget.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_addressbook_multiget.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_addressbook_multiget.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_calendar_multiget.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_calendar_multiget.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_calendar_multiget.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_freebusy.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_freebusy.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/method/report_freebusy.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2008 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/mkcolxml.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/mkcolxml.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/mkcolxml.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/notifications.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/notifications.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/notifications.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/addressbookquery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/addressbookquery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/addressbookquery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/calendarquery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/calendarquery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/calendarquery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/expression.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/expression.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/expression.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/sqlgenerator.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/sqlgenerator.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/sqlgenerator.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_addressbookquery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_addressbookquery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_addressbookquery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_calendarquery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_calendarquery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_calendarquery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -125,4 +125,4 @@
         self.assertTrue(sql.find(" OR ") != -1)
         self.assertTrue("VEVENT" in args)
         self.assertTrue("VTODO" in args)
-        
\ No newline at end of file
+        

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_expression.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_expression.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_expression.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_queryfilter.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_queryfilter.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/query/test/test_queryfilter.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/addressmapping.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/addressmapping.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/addressmapping.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/cuaddress.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/cuaddress.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/cuaddress.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/delivery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/delivery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/delivery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/ischeduleservers.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/ischeduleservers.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/ischeduleservers.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/test_caldav.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/test_caldav.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/test_caldav.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/test_imip.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/test_imip.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/test/test_imip.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/utils.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/utils.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/scheduling/utils.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/servers.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/servers.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/servers.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/sharedcollection.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/sharedcollection.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/sharedcollection.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/sql.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/sql.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: twistedcaldav.test -*-
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/csv2ical.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/csv2ical.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/csv2ical.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.4
 
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/makelargecalendars.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/makelargecalendars.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/makelargecalendars.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/makelargefbset.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/makelargefbset.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/makelargefbset.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/split_holidays.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/split_holidays.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/data/split_holidays.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.4
 
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_accounting.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_accounting.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_accounting.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_addressbookmultiget.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_addressbookmultiget.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_addressbookmultiget.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_addressbookquery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_addressbookquery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_addressbookquery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_caldavxml.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_caldavxml.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_caldavxml.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_collectioncontents.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_collectioncontents.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_collectioncontents.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_config.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_config.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_config.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_customxml.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_customxml.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_customxml.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_database.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_database.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_database.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_extensions.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_extensions.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_extensions.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_freebusyquery.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_freebusyquery.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_freebusyquery.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_kerberos.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_kerberos.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_kerberos.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_link.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_link.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_link.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2008 Apple Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_localization.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_localization.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_localization.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2008 Apple Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_memcachepool.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_memcachepool.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_memcachepool.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2008 Apple Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_memcacheprops.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_memcacheprops.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_memcacheprops.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Computer, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_mkcalendar.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_mkcalendar.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_mkcalendar.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_multiget.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_multiget.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_multiget.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_notify.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_notify.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_notify.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2008 Apple Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_options.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_options.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_options.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_resource.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_resource.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2008-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2008-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_servers.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_servers.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_servers.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2009-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -176,4 +176,4 @@
         
         request = SimpleRequest(None, "POST", "/ischedule")
         self.assertTrue(servers.getServerById("00002").checkSharedSecret(request))
-        
\ No newline at end of file
+        

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_sharing.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_sharing.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_sql.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_sql.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_sql.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2007 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_timezones.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_timezones.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_timezones.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_timezonestdservice.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_timezonestdservice.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_timezonestdservice.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_xml.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_xml.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_xml.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_xmlutil.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_xmlutil.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/test/test_xmlutil.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/timezones.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/timezones.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/timezones.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2006-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2007 Apple Inc. All rights reserved.
+# Copyright (c) 2007-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/vcard.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/vcard.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/vcard.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2010 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/xmlutil.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/xmlutil.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/twistedcaldav/xmlutil.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/dbapiclient.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/dbapiclient.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/dbapiclient.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/file.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/file.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/file.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/subpostgres.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/subpostgres.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/subpostgres.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.base.datastore.test.test_subpostgres -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/test/test_subpostgres.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/test/test_subpostgres.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/test/test_subpostgres.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/datastore/util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.caldav.datastore.test.test_file -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/appledouble_xattr.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/appledouble_xattr.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/appledouble_xattr.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.base.propertystore.test.test_appledouble -*- ##
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/none.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/none.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/none.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.base.propertystore.test.test_none,txdav.caldav.datastore,txdav.carddav.datastore -*-
 ##
-# Copyright (c) 2010-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_appledouble.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_appledouble.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_appledouble.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_base.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_base.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_base.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_none.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_none.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/base/propertystore/test/test_none.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.caldav.datastore.test -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/test_index_file.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/test_index_file.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/test_index_file.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/test_util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/test_util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/datastore/test/test_util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/resource.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/resource.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/caldav/resource.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/file.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/file.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/file.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.carddav.datastore.test.test_file -*-
 ##
-# Copyright (c) 2010-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/index_file.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/index_file.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/index_file.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2009 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.carddav.datastore.test -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/test/test_index_file.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/test/test_index_file.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/test/test_index_file.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/datastore/util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.carddav.datastore.test.test_sql -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/iaddressbookstore.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/iaddressbookstore.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/iaddressbookstore.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.carddav.datastore,txdav.carddav.datastore.test.test_sql.AddressBookSQLStorageTests -*-
 ##
-# Copyright (c) 2010-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/resource.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/resource.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/carddav/resource.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.carddav.datastore.test -*-
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/file/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/file/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/file/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/migrate.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/migrate.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/migrate.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.common.datastore.upgrade.test.test_migrate -*-
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/test/test_upgrade.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/test/test_upgrade.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/test/test_upgrade.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrade.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrade.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrade.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.common.datastore.upgrade.sql.test -*-
 ##
-# Copyright (c) 2010-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/upgrade_from_1_to_2.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/upgrade_from_1_to_2.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/upgrade_from_1_to_2.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.common.datastore.upgrade.sql.test -*-
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/upgrade_from_2_to_3.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/upgrade_from_2_to_3.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/upgrade_from_2_to_3.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,6 +1,6 @@
 # -*- test-case-name: txdav.common.datastore.upgrade.sql.test -*-
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/util.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/util.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/sql/upgrades/util.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/test/__init__.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/test/__init__.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/test/__init__.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2011 Apple Inc. All rights reserved.
+# Copyright (c) 2011-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/test/test_migrate.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/test/test_migrate.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/datastore/upgrade/test/test_migrate.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/common/inotifications.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/common/inotifications.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/common/inotifications.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2012 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Modified: CalendarServer/branches/users/gaya/directorybacker/txdav/xml/rfc4331.py
===================================================================
--- CalendarServer/branches/users/gaya/directorybacker/txdav/xml/rfc4331.py	2012-09-06 23:47:26 UTC (rev 9785)
+++ CalendarServer/branches/users/gaya/directorybacker/txdav/xml/rfc4331.py	2012-09-06 23:49:57 UTC (rev 9786)
@@ -1,5 +1,5 @@
 ##
-# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
+# Copyright (c) 2005-2012 Apple Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120906/86ea584a/attachment-0001.html>


More information about the calendarserver-changes mailing list