Drop CMFUid's tools

product/ERP5/ERP5Site.py

@@ -1888,16 +1888,6 @@ class PortalGenerator:
         addCMFCoreTool('CMF URL Tool', None)
         addCMFCoreTool('CMF Workflow Tool', None)
 
-        # try to install CMFUid without raising exceptions if not available
-        try:
-            addCMFUidTool = p.manage_addProduct['CMFUid'].manage_addTool
-        except AttributeError:
-            pass
-        else:
-            addCMFUidTool('Unique Id Annotation Tool', None)
-            addCMFUidTool('Unique Id Generator Tool', None)
-            addCMFUidTool('Unique Id Handler Tool', None)
-
     def setupMailHost(self, p):
         p.manage_addProduct['MailHost'].manage_addMailHost(
             'MailHost', smtp_host='localhost')

product/ERP5Type/dynamic/portal_type_class.py

@@ -465,9 +465,11 @@ def synchronizeDynamicModules(context, force=False):
           assert tool._p_changed
           migrate = True
 
-        if portal.hasObject("portal_properties"):
-          portal._delObject("portal_properties", suppress_events=True)
-          migrate = True
+        for tool_id in ("portal_properties", "portal_uidannotation",
+                        "portal_uidgenerator", "portal_uidhandler"):
+          if portal.hasObject(tool_id):
+            portal._delObject(tool_id, suppress_events=True)
+            migrate = True
 
         if migrate:
           portal.migrateToPortalTypeClass()