[CalendarServer-changes] [14408] CalendarServer/branches/users/cdaboo/pod2pod-migration
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 12 14:10:41 PST 2015
Revision: 14408
http://trac.calendarserver.org//changeset/14408
Author: cdaboo at apple.com
Date: 2015-02-12 14:10:41 -0800 (Thu, 12 Feb 2015)
Log Message:
-----------
Merge from trunk.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/_build.sh
CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/caldavd
CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/package
CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-dev.txt
CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-stable.txt
CalendarServer/branches/users/cdaboo/pod2pod-migration/support/Apple.make
CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/config.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/method/report_sync_collection.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/resource.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/stdconfig.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_config.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_resource.py
Property Changed:
----------------
CalendarServer/branches/users/cdaboo/pod2pod-migration/
Property changes on: CalendarServer/branches/users/cdaboo/pod2pod-migration
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/trunk:11193-11198
/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/release/CalendarServer-4.3-dev:10180-10190,10192
/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
/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/cross-pod-sharing:12038-12191
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
/CalendarServer/branches/users/cdaboo/json:11622-11912
/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
/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/reverse-proxy-pods:11875-11900
/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
/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/digest-auth-redux:10624-10635
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
/CalendarServer/branches/users/glyph/hang-fix:11465-11491
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
/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/one-home-list-api:10048-10073
/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/queue-locking-and-timing:10204-10289
/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/start-service-start-loop:11060-11065
/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/unshare-when-access-revoked:10562-10595
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
/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/move2who:12819-12860
/CalendarServer/branches/users/sagen/move2who-2:12861-12898
/CalendarServer/branches/users/sagen/move2who-3:12899-12913
/CalendarServer/branches/users/sagen/move2who-4:12914-13157
/CalendarServer/branches/users/sagen/move2who-5:13158-13163
/CalendarServer/branches/users/sagen/newcua:13309-13327
/CalendarServer/branches/users/sagen/newcua-1:13328-13330
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/recordtypes:13648-13656
/CalendarServer/branches/users/sagen/recordtypes-2:13657
/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/sagen/testing:10827-10851,10853-10855
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:14338-14388
+ /CalDAVTester/trunk:11193-11198
/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/release/CalendarServer-4.3-dev:10180-10190,10192
/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
/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/cross-pod-sharing:12038-12191
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
/CalendarServer/branches/users/cdaboo/json:11622-11912
/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
/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/reverse-proxy-pods:11875-11900
/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
/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/digest-auth-redux:10624-10635
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
/CalendarServer/branches/users/glyph/hang-fix:11465-11491
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
/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/one-home-list-api:10048-10073
/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/queue-locking-and-timing:10204-10289
/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/start-service-start-loop:11060-11065
/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/unshare-when-access-revoked:10562-10595
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
/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/move2who:12819-12860
/CalendarServer/branches/users/sagen/move2who-2:12861-12898
/CalendarServer/branches/users/sagen/move2who-3:12899-12913
/CalendarServer/branches/users/sagen/move2who-4:12914-13157
/CalendarServer/branches/users/sagen/move2who-5:13158-13163
/CalendarServer/branches/users/sagen/newcua:13309-13327
/CalendarServer/branches/users/sagen/newcua-1:13328-13330
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/recordtypes:13648-13656
/CalendarServer/branches/users/sagen/recordtypes-2:13657
/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/sagen/testing:10827-10851,10853-10855
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:14338-14407
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/_build.sh
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/_build.sh 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/_build.sh 2015-02-12 22:10:41 UTC (rev 14408)
@@ -374,7 +374,6 @@
mkdir -p "${dep_sources}";
local srcdir="${dep_sources}/${path}";
- # local dstroot="${srcdir}/_root";
local dstroot="${dev_roots}/${name}";
www_get ${f_hash} "${name}" "${srcdir}" "${uri}";
@@ -385,7 +384,7 @@
export CPPFLAGS="-I${dstroot}/include ${CPPFLAGS:-} ";
export LDFLAGS="-L${dstroot}/lib -L${dstroot}/lib64 ${LDFLAGS:-} ";
export DYLD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:${DYLD_LIBRARY_PATH:-}";
- export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
+ export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
if "${do_setup}"; then
if "${force_setup}"; then
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/caldavd
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/caldavd 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/caldavd 2015-02-12 22:10:41 UTC (rev 14408)
@@ -52,7 +52,7 @@
return 0;
}
-for v in "2.7" "2.6" "2.5" ""; do
+for v in "2.7" ""; do
for p in \
"${PYTHON:=}" \
"python${v}" \
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/package
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/package 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/bin/package 2015-02-12 22:10:41 UTC (rev 14408)
@@ -109,19 +109,39 @@
dev_roots="${destination}/roots";
py_virtualenv="${destination}/virtualenv";
py_bindir="${py_virtualenv}/bin";
+ py_ve_tools="${dev_home}/ve_tools";
+ if [ ! -d "${py_virtualenv}" ]; then
+ bootstrap_virtualenv;
+ "${bootstrap_python}" -m virtualenv \
+ --always-copy \
+ --no-setuptools \
+ "${py_virtualenv}";
+ fi;
+
c_dependencies;
py_dependencies;
install -d "${destination}/bin";
- (
- cd "${destination}/bin" && \
- find ../virtualenv/bin \
- '(' -name 'caldavd' -o -name 'calendarserver_*' -o -name 'python' ')' \
- -exec ln -fs '{}' . ';';
- );
+ cd "${destination}/bin";
+ find ../virtualenv/bin \
+ '(' -name 'caldavd' -o -name 'calendarserver_*' -o -name 'python' ')' \
+ -exec ln -fs '{}' . ';' \
+ ;
+
+ for executable in \
+ "memcached/bin/memcached" \
+ "openssl/bin/openssl" \
+ "PostgreSQL/bin/psql" \
+ "PostgreSQL/bin/pg_dump" \
+ "PostgreSQL/bin/pg_dumpall" \
+ "PostgreSQL/bin/pg_restore" \
+ ; do
+ ln -s "../roots/${executable}" .;
+ done;
+
}
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-dev.txt
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-dev.txt 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-dev.txt 2015-02-12 22:10:41 UTC (rev 14408)
@@ -8,4 +8,4 @@
q
tl.eggdeps
--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14383#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14406#egg=CalDAVTester
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-stable.txt
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-stable.txt 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/requirements-stable.txt 2015-02-12 22:10:41 UTC (rev 14408)
@@ -36,7 +36,7 @@
#pyOpenSSL
pycrypto==2.6.1
- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14351#egg=twextpy
+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14404#egg=twextpy
cffi==0.8.6
pycparser==2.10
#twisted
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/support/Apple.make
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/support/Apple.make 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/support/Apple.make 2015-02-12 22:10:41 UTC (rev 14408)
@@ -144,10 +144,6 @@
$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)";
$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist";
-# install:: install-logdir-omg-hack-ew
-# install-logdir-omg-hack-ew::
-# $(_v) $(INSTALL_DIRECTORY) -o "$(CS_USER)" -g "$(CS_GROUP)" -m 0755 "$(DSTROOT)$(VARDIR)/log$(CALDAVDSUBDIR)";
-
install:: install-commands
install-commands::
@echo "Installing links to executables...";
@@ -213,17 +209,3 @@
@echo "Copying source for $(Project) to build directory...";
$(_v) $(MKDIR) -p "$@";
$(_v) cp -a "$(Sources)/" "$@/";
-
-#
-# Open Source Hooey
-#
-
-OSV = $(USRDIR)/local/OpenSourceVersions
-OSL = $(USRDIR)/local/OpenSourceLicenses
-
-#install:: install-ossfiles
-install-ossfiles::
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSV)";
- $(_v) $(INSTALL_FILE) "$(Sources)/$(ProjectName).plist" "$(DSTROOT)/$(OSV)/$(ProjectName).plist";
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)/$(OSL)";
- $(_v) $(INSTALL_FILE) "$(BuildDirectory)/$(Project)/LICENSE" "$(DSTROOT)/$(OSL)/$(ProjectName).txt";
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/config.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/config.py 2015-02-12 22:10:41 UTC (rev 14408)
@@ -22,8 +22,9 @@
"config",
]
+import copy
+import hashlib
import os
-import copy
class ConfigurationError(RuntimeError):
"""
@@ -262,6 +263,7 @@
self._updating = False
self._dirty = False
+ self._cachedSyncToken = None
def load(self, configFile):
@@ -297,9 +299,89 @@
def reset(self):
self._data = ConfigDict(copy.deepcopy(self._provider.getDefaults()))
self._dirty = True
+ self._syncTokenKeys = []
+ self._cachedSyncToken = None
+ def getKeyPath(self, keyPath):
+ """
+ Allows the getting of arbitrary nested dictionary keys via a single
+ dot-separated string. For example, getKeyPath(self, "foo.bar.baz")
+ would fetch parent["foo"]["bar"]["baz"]. If any of the keys don't
+ exist, None is returned instead.
+
+ @param keyPath: a dot-delimited string specifying the path of keys to
+ traverse
+ @type keyPath: C{str}
+ @return: the value at keyPath
+ """
+ parent = self
+ parts = keyPath.split(".")
+ for part in parts[:-1]:
+ child = parent.get(part, None)
+ if child is None:
+ return None
+ parent = child
+ return parent.get(parts[-1], None)
+
+
+ def addSyncTokenKey(self, keyPath):
+ """
+ Indicates the specified key should be taken into account when generating
+ the sync token. Also invalidates the (possibly) cached syncToken.
+
+ @param keyPath: a dot-delimited string specifying the path of keys to
+ traverse
+ @type keyPath: C{str}
+ """
+ if keyPath not in self._syncTokenKeys:
+ self._syncTokenKeys.append(keyPath)
+ self._cachedSyncToken = None
+
+
+ def syncToken(self):
+ """
+ Iterates the previously registered keys (sorted, so the order in which
+ the keys were registered doesn't affect the hash) and generates an MD5
+ hash of the combined values. The hash is cached, and is invalidated
+ during a reload or if invalidateSyncToken is called.o
+
+ @return: the sync token
+ @rtype: C{str}
+ """
+ if self._cachedSyncToken is None:
+ pieces = []
+ self._syncTokenKeys.sort()
+ for key in self._syncTokenKeys:
+ value = self.getKeyPath(key)
+ if value is None:
+ value = ""
+ pieces.append(key + ":" + str(value))
+ whole = "|".join(pieces)
+ self._cachedSyncToken = hashlib.md5(whole).hexdigest()
+ return self._cachedSyncToken
+
+
+ def invalidateSyncToken(self):
+ """
+ Invalidates the cached copy of the sync token.
+ """
+ self._cachedSyncToken = None
+
+
+ def joinToken(self, dataToken):
+ """
+ Joins the config sync token with the dataToken. If EnableConfigSyncToken
+ is False, the original dataToken is just returned
+ """
+ if self.EnableConfigSyncToken:
+ configToken = self.syncToken()
+ return "{}/{}".format(dataToken, configToken)
+ else:
+ return dataToken
+
+
def mergeData(oldData, newData):
"""
Merge two ConfigDict objects; oldData will be updated with all the keys
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/method/report_sync_collection.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/method/report_sync_collection.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/method/report_sync_collection.py 2015-02-12 22:10:41 UTC (rev 14408)
@@ -87,7 +87,7 @@
# the child resource loop and supply those to the checkPrivileges on each child.
filteredaces = (yield self.inheritedACEsforChildren(request))
- changed, removed, notallowed, newtoken = yield self.whatchanged(sync_collection.sync_token, depth)
+ changed, removed, notallowed, newtoken, resourceChanged = yield self.whatchanged(sync_collection.sync_token, depth)
# Now determine which valid resources are readable and which are not
ok_resources = []
@@ -105,6 +105,9 @@
inherited_aces=filteredaces
)
+ if resourceChanged:
+ ok_resources.append((self, request.uri))
+
for child, child_uri in ok_resources:
href = element.HRef.fromString(child_uri)
try:
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/resource.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/resource.py 2015-02-12 22:10:41 UTC (rev 14408)
@@ -1183,15 +1183,27 @@
@inlineCallbacks
def whatchanged(self, client_token, depth):
+
+ client_data_token = None
+ client_config_token = None
+
+ if client_token:
+ if "/" in client_token:
+ client_data_token, client_config_token = client_token.split("/")
+ else:
+ client_data_token = client_token
+
current_token = (yield self.getSyncToken())
+ if "/" in current_token:
+ current_token = current_token.split("/")[0]
current_uuid, current_revision = current_token[6:].split("_", 1)
current_revision = int(current_revision)
- if client_token:
+ if client_data_token:
try:
- if not client_token.startswith("data:,"):
+ if not client_data_token.startswith("data:,"):
raise ValueError
- caluuid, revision = client_token[6:].split("_", 1)
+ caluuid, revision = client_data_token[6:].split("_", 1)
revision = int(revision)
# Check client token validity
@@ -1217,9 +1229,19 @@
"Sync token not recognized",
))
- returnValue((changed, removed, notallowed, current_token))
+ if config.EnableConfigSyncToken:
+ # Append the app-level portion of sync token (e.g. derived from config)
+ newConfigToken = config.syncToken()
+ current_token = "{}/{}".format(current_token, newConfigToken)
+ # If the config token changed, note that in the returned tuple
+ resourceChanged = (newConfigToken != client_config_token)
+ else:
+ resourceChanged = False
+ returnValue((changed, removed, notallowed, current_token, resourceChanged))
+
+
def _indexWhatChanged(self, revision, depth):
# Now handled directly by newstore
raise NotImplementedError
@@ -1232,7 +1254,9 @@
"""
internal_token = (yield self.getInternalSyncToken())
- returnValue("data:,%s" % (internal_token,))
+ internal_token = "data:,%s" % (internal_token,)
+ token = config.joinToken(internal_token)
+ returnValue(token)
def getInternalSyncToken(self):
@@ -2038,12 +2062,25 @@
def _mergeSyncTokens(self, hometoken, notificationtoken):
"""
Merge two sync tokens, choosing the higher revision number of the two,
- but keeping the home resource-id intact.
+ but keeping the home resource-id intact. If the config portion of
+ the token is present, it is also kept intact.
"""
+ if "/" in hometoken:
+ hometoken, configtoken = hometoken.split("/")
+ else:
+ configtoken = None
+
+ if "/" in notificationtoken:
+ notificationtoken = notificationtoken.split("/")[0]
+
homekey, homerev = hometoken.split("_", 1)
notrev = notificationtoken.split("_", 1)[1]
if int(notrev) > int(homerev):
hometoken = "%s_%s" % (homekey, notrev,)
+
+ if configtoken:
+ hometoken = "{}/{}".format(hometoken, configtoken)
+
return hometoken
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/stdconfig.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/stdconfig.py 2015-02-12 22:10:41 UTC (rev 14408)
@@ -475,6 +475,7 @@
"EnableAddMember" : True, # POST ;add-member extension
"EnableSyncReport" : True, # REPORT collection-sync
"EnableSyncReportHome" : True, # REPORT collection-sync on home collections
+ "EnableConfigSyncToken" : False, # Sync token includes config component
"EnableWellKnown" : True, # /.well-known resource
"EnableCalendarQueryExtended" : True, # Extended calendar-query REPORT
@@ -1554,6 +1555,12 @@
def _updateNotifications(configDict, reloading=False):
+
+ # These three keys go into producing the config sync token
+ config.addSyncTokenKey("Notifications.Services.APNS.Enabled")
+ config.addSyncTokenKey("Notifications.Services.APNS.CalDAV.Topic")
+ config.addSyncTokenKey("Notifications.Services.APNS.CardDAV.Topic")
+
# Reloading not supported -- requires process running as root
if reloading:
return
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_config.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_config.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_config.py 2015-02-12 22:10:41 UTC (rev 14408)
@@ -66,6 +66,60 @@
</dict>
</dict>
+ <key>Notifications</key>
+ <dict>
+
+ <key>Services</key>
+ <dict>
+
+ <key>AMP</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>Port</key>
+ <integer>62311</integer>
+ <key>EnableStaggering</key>
+ <false/>
+ <key>StaggerSeconds</key>
+ <integer>3</integer>
+ </dict>
+
+ <key>APNS</key>
+ <dict>
+ <key>CalDAV</key>
+ <dict>
+ <key>AuthorityChainPath</key>
+ <string>com.apple.calendar.chain.pem</string>
+ <key>CertificatePath</key>
+ <string>com.apple.calendar.cert.pem</string>
+ <key>PrivateKeyPath</key>
+ <string>com.apple.calendar.key.pem</string>
+ <key>Topic</key>
+ <string>calendar-topic</string>
+ <key>Passphrase</key>
+ <string>password</string>
+ </dict>
+ <key>CardDAV</key>
+ <dict>
+ <key>AuthorityChainPath</key>
+ <string>com.apple.contact.chain.pem</string>
+ <key>CertificatePath</key>
+ <string>com.apple.contact.cert.pem</string>
+ <key>PrivateKeyPath</key>
+ <string>com.apple.contact.key.pem</string>
+ <key>Topic</key>
+ <string>contact-topic</string>
+ <key>Passphrase</key>
+ <string>password</string>
+ </dict>
+ <key>Enabled</key>
+ <true/>
+ </dict>
+
+ </dict>
+
+ </dict>
+
</dict>
</plist>
"""
@@ -635,3 +689,35 @@
config.load(self.testMaster)
self.assertEquals(config.HTTPPort, 9008)
self.assertEquals(config.SSLPort, 8443)
+
+
+ def testSyncToken(self):
+ config.load(self.testConfig)
+
+ # no sync token keys specified; need to empty this array here because
+ # stdconfig is registering keys automatically
+ config._syncTokenKeys = []
+ self.assertEquals("d41d8cd98f00b204e9800998ecf8427e", config.syncToken())
+
+ # add sync token keys (some with multiple levels)
+ config.addSyncTokenKey("DefaultLogLevel")
+ config.addSyncTokenKey("Notifications.Services.APNS.Enabled")
+ config.addSyncTokenKey("Notifications.Services.APNS.CalDAV.Topic")
+ config.addSyncTokenKey("Notifications.Services.APNS.CardDAV.Topic")
+ self.assertEquals("7473205187d7a6ff0c61a2b6b04053c5", config.syncToken())
+
+ # modify a sync token key value
+ config.Notifications.Services.APNS.CalDAV.Topic = "changed"
+ # direct manipulation of config requires explicit invalidation
+ self.assertEquals("7473205187d7a6ff0c61a2b6b04053c5", config.syncToken())
+ config.invalidateSyncToken()
+ self.assertEquals("4cdbb3841625d001dc768439f5a88cba", config.syncToken())
+
+ # add a non existent key (not an error because it could exist later)
+ config.addSyncTokenKey("Notifications.Services.APNS.CalDAV.NonExistent")
+ config.invalidateSyncToken()
+ self.assertEquals("2ffb128cee5a4b217cef82fd31ae7767", config.syncToken())
+
+ # reload automatically invalidates
+ config.reload()
+ self.assertEquals("a1c46c5aff1899658dac033ee8520b07", config.syncToken())
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_resource.py 2015-02-12 21:27:11 UTC (rev 14407)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/twistedcaldav/test/test_resource.py 2015-02-12 22:10:41 UTC (rev 14408)
@@ -111,7 +111,13 @@
self.assertTrue(('http://calendarserver.org/ns/', 'getctag') in resource.liveProperties())
+ def test_commonHomeResourceMergeSyncToken(self):
+ resource = CommonHomeResource(None, None, None, StubHome())
+ self.assertEquals(resource._mergeSyncTokens("1_2/A", "1_3/A"), "1_3/A")
+ self.assertEquals(resource._mergeSyncTokens("1_2", "1_3"), "1_3")
+ self.assertEquals(resource._mergeSyncTokens("1_4", "1_3"), "1_4")
+
class OwnershipTests(TestCase):
"""
L{CalDAVResource.isOwner} determines if the authenticated principal of the
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150212/fd94466a/attachment-0001.html>
More information about the calendarserver-changes
mailing list