[CalendarServer-changes] [8237] CalendarServer/trunk/contrib/migration

[source_changes at macosforge.org]

Revision: 8237
          http://trac.macosforge.org/projects/calendarserver/changeset/8237
Author:   sagen at apple.com
Date:     2011-10-31 17:50:22 -0700 (Mon, 31 Oct 2011)
Log Message:
-----------
Since AugmentService is now off by default in stdconfig, add it to caldavd.plist during upgrades.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/migration/calendarmigrator.py
    CalendarServer/trunk/contrib/migration/test/test_migrator.py

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2011-10-28 21:49:40 UTC (rev 8236)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2011-11-01 00:50:22 UTC (rev 8237)
@@ -533,7 +533,15 @@
     # If SSL is enabled, redirect HTTP to HTTPS.
     combined["RedirectHTTPToHTTPS"] = enableSSL
 
+    # Add AugmentService which is now not on by default in stdconfig.py
+    combined["AugmentService"] = {
+        "params" : {
+            "xmlFiles" : ["augments.xml"],
+        },
+        "type" : "twistedcaldav.directory.augment.AugmentXMLDB",
+    }
 
+
 def isServiceDisabled(source, service):
     """
     Returns whether or not a service is disabled

Modified: CalendarServer/trunk/contrib/migration/test/test_migrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/test/test_migrator.py	2011-10-28 21:49:40 UTC (rev 8236)
+++ CalendarServer/trunk/contrib/migration/test/test_migrator.py	2011-11-01 00:50:22 UTC (rev 8237)
@@ -42,6 +42,13 @@
         return FakeGroup()
 
 
+DEFAULT_AUGMENT_SERVICE = {
+    "params" : {
+        "xmlFiles" : ["augments.xml"],
+    },
+    "type" : "twistedcaldav.directory.augment.AugmentXMLDB",
+}
+
 class MigrationTests(twistedcaldav.test.util.TestCase):
     """
     Calendar Server Migration Tests
@@ -88,6 +95,7 @@
             "SSLCertificate": "/etc/certificates/test.cert.pem",
             "SSLPort": 8443,
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -124,6 +132,7 @@
             "SSLCertificate": "",
             "SSLPort": 8443,
             "SSLPrivateKey": "",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -160,6 +169,7 @@
             "SSLCertificate": "/etc/certificates/test.cert.pem",
             "SSLPort": 8443,
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -196,6 +206,7 @@
             "SSLCertificate": "/etc/certificates/test.cert.pem",
             "SSLPort": 8443,
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -232,6 +243,7 @@
             "SSLCertificate": "/etc/certificates/test.cert.pem",
             "SSLPort": 9999,
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -265,6 +277,7 @@
             "SSLCertificate": "",
             "SSLPort": 8443,
             "SSLPrivateKey": "",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -293,6 +306,7 @@
             "SSLCertificate": "/etc/certificates/test.cert.pem",
             "SSLPort": 8443,
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -312,6 +326,7 @@
             "SSLCertificate": "",
             "SSLPort": 8443,
             "SSLPrivateKey": "",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -357,6 +372,7 @@
             "SSLCertificate": "",
             "SSLPort": 8443,
             "SSLPrivateKey": "",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -394,6 +410,7 @@
             "SSLCertificate": "",
             "SSLPort": 8443,
             "SSLPrivateKey": "",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
@@ -431,6 +448,7 @@
             "SSLCertificate": "",
             "SSLPort": 8443,
             "SSLPrivateKey": "",
+            "AugmentService" : DEFAULT_AUGMENT_SERVICE,
         }
         newCombined = { }
         mergePlist(oldCalDAV, oldCardDAV, newCombined)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111031/1ff5e0d0/attachment.html>