[CMF-checkins] SVN: CMF/branches/1.6/C - Removed remnants of CMFSetup.

[Stefan H. Holek]

Log message for revision 69357:
  - Removed remnants of CMFSetup.
  - Made sure extension profiles are registered for ISiteRoot.
  

Changed:
  U   CMF/branches/1.6/CHANGES.txt
  U   CMF/branches/1.6/CMFDefault/__init__.py
  U   CMF/branches/1.6/CMFTopic/__init__.py
  U   CMF/branches/1.6/CMFUid/__init__.py

-=-
Modified: CMF/branches/1.6/CHANGES.txt
===================================================================
--- CMF/branches/1.6/CHANGES.txt	2006-08-05 15:31:24 UTC (rev 69356)
+++ CMF/branches/1.6/CHANGES.txt	2006-08-05 16:43:48 UTC (rev 69357)
@@ -13,7 +13,15 @@
     - standard_error_message.pt was out of sync with Zope.
       (http://www.zope.org/Collectors/Zope/2133)
 
+  Other
 
+    - CMFUid: Removed remnants of CMFSetup. Made sure the extension profile is
+      registered for ISiteRoot.
+
+    - CMFDefault + CMFTopic: Made sure extension profiles are registered for
+      ISiteRoot.
+
+
 CMF 1.6.1 (2006/06/09)
 
   Other

Modified: CMF/branches/1.6/CMFDefault/__init__.py
===================================================================
--- CMF/branches/1.6/CMFDefault/__init__.py	2006-08-05 15:31:24 UTC (rev 69356)
+++ CMF/branches/1.6/CMFDefault/__init__.py	2006-08-05 16:43:48 UTC (rev 69357)
@@ -21,6 +21,7 @@
 from Products.CMFCore.utils import ToolInit
 from Products.CMFCore.utils import ContentInit
 from Products.CMFCore.utils import registerIcon
+from Products.CMFCore.interfaces import ISiteRoot
 from Products.GenericSetup import BASE
 from Products.GenericSetup import EXTENSION
 from Products.GenericSetup import profile_registry
@@ -126,7 +127,8 @@
                                      'Content for a sample CMFSite.',
                                      'profiles/sample_content',
                                      'CMFDefault',
-                                     EXTENSION)
+                                     EXTENSION,
+                                     for_=ISiteRoot)
 
     context.registerClass( Portal.CMFSite
                          , constructors=(factory.addConfiguredSiteForm,

Modified: CMF/branches/1.6/CMFTopic/__init__.py
===================================================================
--- CMF/branches/1.6/CMFTopic/__init__.py	2006-08-05 15:31:24 UTC (rev 69356)
+++ CMF/branches/1.6/CMFTopic/__init__.py	2006-08-05 16:43:48 UTC (rev 69357)
@@ -21,6 +21,7 @@
 
 from Products.CMFCore.utils import ContentInit
 from Products.CMFCore.DirectoryView import registerDirectory
+from Products.CMFCore.interfaces import ISiteRoot
 from Products.GenericSetup import EXTENSION
 from Products.GenericSetup import profile_registry
 
@@ -64,4 +65,5 @@
                                      'Adds topic portal type.',
                                      'profiles/default',
                                      'CMFTopic',
-                                     EXTENSION)
+                                     EXTENSION,
+                                     for_=ISiteRoot)

Modified: CMF/branches/1.6/CMFUid/__init__.py
===================================================================
--- CMF/branches/1.6/CMFUid/__init__.py	2006-08-05 15:31:24 UTC (rev 69356)
+++ CMF/branches/1.6/CMFUid/__init__.py	2006-08-05 16:43:48 UTC (rev 69357)
@@ -18,12 +18,9 @@
 from sys import modules
 
 from Products.CMFCore import utils
-try:
-    from Products.CMFSetup import EXTENSION
-    from Products.CMFSetup import profile_registry
-    has_profile_registry = True
-except ImportError:
-    has_profile_registry = False
+from Products.CMFCore.interfaces import ISiteRoot
+from Products.GenericSetup import EXTENSION
+from Products.GenericSetup import profile_registry
 
 import UniqueIdAnnotationTool
 import UniqueIdGeneratorTool
@@ -50,10 +47,10 @@
                   , icon='tool.gif'
                   ).initialize(context)
 
-    if has_profile_registry:
-        profile_registry.registerProfile('default',
-                                         'CMFUid',
-                                         'Adds UID support.',
-                                         'profiles/default',
-                                         'CMFUid',
-                                         EXTENSION)
+    profile_registry.registerProfile('default',
+                                     'CMFUid',
+                                     'Adds UID support.',
+                                     'profiles/default',
+                                     'CMFUid',
+                                     EXTENSION,
+                                     for_=ISiteRoot)