[Checkins] SVN: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/ - added basic infrastructure for migrations to CMF 2.3

[Yvo Schubbe]

Log message for revision 111430:
  - added basic infrastructure for migrations to CMF 2.3
  - added upgrade step for cookie crumbler

Changed:
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/profiles/default/metadata.xml
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/configure.zcml
  U   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/tests/test_upgrade.py
  A   Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/to23.py

-=-
Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/profiles/default/metadata.xml
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/profiles/default/metadata.xml	2010-04-26 13:55:33 UTC (rev 111429)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/profiles/default/metadata.xml	2010-04-26 14:15:29 UTC (rev 111430)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2.2</version>
+  <version>2.3</version>
 </metadata>

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/configure.zcml
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/configure.zcml	2010-04-26 13:55:33 UTC (rev 111429)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/configure.zcml	2010-04-26 14:15:29 UTC (rev 111430)
@@ -181,4 +181,28 @@
       sortkey="6"
       />
 
+  <genericsetup:upgradeSteps
+      source="2.2"
+      destination="2.3"
+      profile="Products.CMFDefault:default"
+      sortkey="7">
+
+    <genericsetup:upgradeStep
+        title="Upgrade cookie crumbler"
+        description="Remove obsolete cookie crumbler properties."
+        handler=".to23.upgrade_cookie_crumbler"
+        checker=".to23.check_cookie_crumbler"
+        />
+
+  </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeStep
+      title="Mark 2.3 upgrade as finished"
+      source="2.2"
+      destination="2.3"
+      profile="Products.CMFDefault:default"
+      handler=".mark_as_finished"
+      sortkey="8"
+      />
+
 </configure>

Modified: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/tests/test_upgrade.py
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/tests/test_upgrade.py	2010-04-26 13:55:33 UTC (rev 111429)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/tests/test_upgrade.py	2010-04-26 14:15:29 UTC (rev 111430)
@@ -70,7 +70,7 @@
         stool.manage_doUpgrades(request)
 
         self.assertEqual(stool.getLastVersionForProfile(profile_id),
-                         ('2', '2'))
+                         ('2', '3'))
 
         newSecurityManager(None, UnrestrictedUser('god', '', ['Manager'], ''))
         setSite(self.app.site)

Added: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/to23.py
===================================================================
--- Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/to23.py	                        (rev 0)
+++ Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/to23.py	2010-04-26 14:15:29 UTC (rev 111430)
@@ -0,0 +1,47 @@
+##############################################################################
+#
+# Copyright (c) 2010 Zope Foundation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Upgrade steps to CMFDefault 2.3.
+
+$Id$
+"""
+import logging
+
+from Acquisition import aq_base
+from Products.CMFCore.utils import getToolByName
+
+_MARKER = object()
+
+def check_cookie_crumbler(tool):
+    """2.2.x to 2.3.0 upgrade step checker
+    """
+    cctool = getToolByName(tool, 'cookie_authentication', None)
+    if cctool is None:
+        return False
+    cctool = aq_base(cctool)
+    for name in ('auto_login_page', 'unauth_page', 'logout_page'):
+        if getattr(cctool, name, _MARKER) is not _MARKER:
+            return True
+    return False
+
+def upgrade_cookie_crumbler(tool):
+    """2.2.x to 2.3.0 upgrade step handler
+    """
+    logger = logging.getLogger('GenericSetup.upgrade')
+    cctool = getToolByName(tool, 'cookie_authentication', None)
+    if cctool is None:
+        return
+    cctool = aq_base(cctool)
+    for name in ('auto_login_page', 'unauth_page', 'logout_page'):
+        if getattr(cctool, name, _MARKER) is not _MARKER:
+            delattr(cctool, name)
+            logger.info("Cookie crumbler property '%s' removed." % name)


Property changes on: Products.CMFDefault/branches/cookiecrumbler_with_views/Products/CMFDefault/upgrade/to23.py
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native