[CalendarServer-changes] [9739] CalendarServer/branches/release/CalendarServer-4.1.1-dev
source_changes at macosforge.org
source_changes at macosforge.org
Wed Aug 22 18:41:56 PDT 2012
Revision: 9739
http://trac.macosforge.org/projects/calendarserver/changeset/9739
Author: sagen at apple.com
Date: 2012-08-22 18:41:56 -0700 (Wed, 22 Aug 2012)
Log Message:
-----------
Pull over r9737 from trunk
Revision Links:
--------------
http://trac.macosforge.org/projects/calendarserver/changeset/9737
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-4.1.1-dev/contrib/migration/calendarmigrator.py
CalendarServer/branches/release/CalendarServer-4.1.1-dev/contrib/migration/test/test_migrator.py
Property Changed:
----------------
CalendarServer/branches/release/CalendarServer-4.1.1-dev/
Property changes on: CalendarServer/branches/release/CalendarServer-4.1.1-dev
___________________________________________________________________
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/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:9347,9504
+ /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/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:9347,9504,9737
Modified: CalendarServer/branches/release/CalendarServer-4.1.1-dev/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.1.1-dev/contrib/migration/calendarmigrator.py 2012-08-23 01:31:36 UTC (rev 9738)
+++ CalendarServer/branches/release/CalendarServer-4.1.1-dev/contrib/migration/calendarmigrator.py 2012-08-23 01:41:56 UTC (rev 9739)
@@ -417,11 +417,27 @@
# Disable XMPPNotifier now that we're directly talking to APNS
try:
- if caldav["Notifications"]["Services"]["XMPPNotifier"]["Enabled"]:
- caldav["Notifications"]["Services"]["XMPPNotifier"]["Enabled"] = False
+ XMPPNotifier = caldav["Notifications"]["Services"]["XMPPNotifier"]
+ if XMPPNotifier["Enabled"]:
+ XMPPNotifier["Enabled"] = False
except KeyError:
pass
+ # If XMPP was also previously being routed to APNS, enable APNS
+ EnableAPNS = False
+ try:
+ if caldav["Notifications"]["Services"]["XMPPNotifier"]["CalDAV"]["APSBundleID"]:
+ EnableAPNS = True
+ except KeyError:
+ pass
+ try:
+ if caldav["Notifications"]["Services"]["XMPPNotifier"]["CardDAV"]["APSBundleID"]:
+ EnableAPNS = True
+ except KeyError:
+ pass
+ if EnableAPNS:
+ adminChanges.append(["EnableAPNS", "yes"])
+
# Merge ports
if not caldav.get("HTTPPort", 0):
caldav["HTTPPort"] = 8008
Modified: CalendarServer/branches/release/CalendarServer-4.1.1-dev/contrib/migration/test/test_migrator.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.1.1-dev/contrib/migration/test/test_migrator.py 2012-08-23 01:31:36 UTC (rev 9738)
+++ CalendarServer/branches/release/CalendarServer-4.1.1-dev/contrib/migration/test/test_migrator.py 2012-08-23 01:41:56 UTC (rev 9739)
@@ -422,11 +422,18 @@
# Ensure XMPPNotifier is disabled
+ # Both CalDAV and CardDAV push enabled:
oldCalDAV = {
"Notifications": {
"Services" : {
"XMPPNotifier" : {
"Enabled" : True,
+ "CalDAV" : {
+ "APSBundleID" : "com.apple.calendar.XServer",
+ },
+ "CardDAV" : {
+ "APSBundleID" : "com.apple.contact.XServer",
+ },
},
},
},
@@ -437,6 +444,12 @@
"Services" : {
"XMPPNotifier" : {
"Enabled" : False,
+ "CalDAV" : {
+ "APSBundleID" : "com.apple.calendar.XServer",
+ },
+ "CardDAV" : {
+ "APSBundleID" : "com.apple.contact.XServer",
+ },
},
},
},
@@ -452,10 +465,126 @@
}
newCombined = { }
adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+ self.assertEquals(adminChanges, [["EnableAPNS", "yes"]])
+ self.assertEquals(newCombined, expected)
+
+ # Only with CalDAV push enabled:
+ oldCalDAV = {
+ "Notifications": {
+ "Services" : {
+ "XMPPNotifier" : {
+ "Enabled" : True,
+ "CalDAV" : {
+ "APSBundleID" : "com.apple.calendar.XServer",
+ },
+ },
+ },
+ },
+ }
+ oldCardDAV = { }
+ expected = {
+ "Notifications": {
+ "Services" : {
+ "XMPPNotifier" : {
+ "Enabled" : False,
+ "CalDAV" : {
+ "APSBundleID" : "com.apple.calendar.XServer",
+ },
+ },
+ },
+ },
+ "BindHTTPPorts": [8008, 8800],
+ "BindSSLPorts": [8443, 8843],
+ "DSN" : "/Library/Server/PostgreSQL For Server Services/Socket:caldav:caldav:::",
+ "EnableSSL" : False,
+ "HTTPPort": 8008,
+ "RedirectHTTPToHTTPS": False,
+ "SSLAuthorityChain": "",
+ "SSLCertificate": "",
+ "SSLPort": 8443,
+ "SSLPrivateKey": "",
+ }
+ newCombined = { }
+ adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+ self.assertEquals(adminChanges, [["EnableAPNS", "yes"]])
+ self.assertEquals(newCombined, expected)
+
+ # Only with CardDAV push enabled:
+ oldCalDAV = {
+ "Notifications": {
+ "Services" : {
+ "XMPPNotifier" : {
+ "Enabled" : True,
+ "CardDAV" : {
+ "APSBundleID" : "com.apple.contact.XServer",
+ },
+ },
+ },
+ },
+ }
+ oldCardDAV = { }
+ expected = {
+ "Notifications": {
+ "Services" : {
+ "XMPPNotifier" : {
+ "Enabled" : False,
+ "CardDAV" : {
+ "APSBundleID" : "com.apple.contact.XServer",
+ },
+ },
+ },
+ },
+ "BindHTTPPorts": [8008, 8800],
+ "BindSSLPorts": [8443, 8843],
+ "DSN" : "/Library/Server/PostgreSQL For Server Services/Socket:caldav:caldav:::",
+ "EnableSSL" : False,
+ "HTTPPort": 8008,
+ "RedirectHTTPToHTTPS": False,
+ "SSLAuthorityChain": "",
+ "SSLCertificate": "",
+ "SSLPort": 8443,
+ "SSLPrivateKey": "",
+ }
+ newCombined = { }
+ adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+ self.assertEquals(adminChanges, [["EnableAPNS", "yes"]])
+ self.assertEquals(newCombined, expected)
+
+ # APNS push was not previously enabled:
+ oldCalDAV = {
+ "Notifications": {
+ "Services" : {
+ "XMPPNotifier" : {
+ "Enabled" : True,
+ },
+ },
+ },
+ }
+ oldCardDAV = { }
+ expected = {
+ "Notifications": {
+ "Services" : {
+ "XMPPNotifier" : {
+ "Enabled" : False,
+ },
+ },
+ },
+ "BindHTTPPorts": [8008, 8800],
+ "BindSSLPorts": [8443, 8843],
+ "DSN" : "/Library/Server/PostgreSQL For Server Services/Socket:caldav:caldav:::",
+ "EnableSSL" : False,
+ "HTTPPort": 8008,
+ "RedirectHTTPToHTTPS": False,
+ "SSLAuthorityChain": "",
+ "SSLCertificate": "",
+ "SSLPort": 8443,
+ "SSLPrivateKey": "",
+ }
+ newCombined = { }
+ adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
self.assertEquals(adminChanges, [])
self.assertEquals(newCombined, expected)
-
def test_examinePreviousSystem(self):
"""
Set up a virtual system in various configurations, then ensure the
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120822/1e22b0ff/attachment-0001.html>
More information about the calendarserver-changes
mailing list