Drop CMFDefault's tools

product/ERP5/ERP5Site.py

@@ -1881,19 +1881,13 @@ class PortalGenerator:
         addCMFCoreTool('CMF Actions Tool', None)
         addCMFCoreTool('CMF Catalog', None)
         addCMFCoreTool('CMF Member Data Tool', None)
+        addCMFCoreTool('CMF Membership Tool', None)
+        addCMFCoreTool('CMF Registration Tool', None)
         addCMFCoreTool('CMF Skins Tool', None)
         addCMFCoreTool('CMF Undo Tool', None)
         addCMFCoreTool('CMF URL Tool', None)
         addCMFCoreTool('CMF Workflow Tool', None)
 
-        addCMFDefaultTool = p.manage_addProduct['CMFDefault'].manage_addTool
-        addCMFDefaultTool('Default Discussion Tool', None)
-        addCMFDefaultTool('Default Membership Tool', None)
-        addCMFDefaultTool('Default Registration Tool', None)
-        addCMFDefaultTool('Default Properties Tool', None)
-        addCMFDefaultTool('Default Metadata Tool', None)
-        addCMFDefaultTool('Default Syndication Tool', None)
-
         # try to install CMFUid without raising exceptions if not available
         try:
             addCMFUidTool = p.manage_addProduct['CMFUid'].manage_addTool
@@ -2218,8 +2212,6 @@ class ERP5Generator(PortalGenerator):
                            'manage_members'))
     # actions tool
     removeActionsFromTool(p.portal_actions, ('folderContents',))
-    # properties tool
-    removeActionsFromTool(p.portal_properties, ('configPortal',))
     # remove unused action providers
     for i in ('portal_registration', 'portal_discussion', 'portal_syndication'):
       p.portal_actions.deleteActionProvider(i)

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/breadcrumbs.py

@@ -8,7 +8,7 @@ param = '?ignore_layout:int=1' if int(portal.REQUEST.get('ignore_layout', 0)) el
 if include_root:
     result = [{
         'id'    : 'root',
-        'title' : portal.portal_properties.title(),
+        'title' : portal.title,
         'url'   : '%s/view%s' % (portal_url, param),
     }]
 else:

product/ERP5Type/dynamic/portal_type_class.py

@@ -457,6 +457,18 @@ def synchronizeDynamicModules(context, force=False):
         except AttributeError:
           pass # no Activity Tool yet
 
+        from Products.CMFCore.MembershipTool import MembershipTool
+        tool = getattr(portal, "portal_membership", None)
+        if tool and tool.__class__ is not MembershipTool:
+          assert not tool._p_changed
+          tool.__class__ = MembershipTool
+          assert tool._p_changed
+          migrate = True
+
+        if portal.hasObject("portal_properties"):
+          portal._delObject("portal_properties", suppress_events=True)
+          migrate = True
+
         if migrate:
           portal.migrateToPortalTypeClass()
           portal.portal_skins.changeSkin(None)