[CMF-checkins] SVN: CMF/trunk/CMFDefault/ - moved user folder setup to toolset.xml

[Yvo Schubbe]

Log message for revision 40387:
  - moved user folder setup to toolset.xml

Changed:
  U   CMF/trunk/CMFDefault/profiles/default/toolset.xml
  U   CMF/trunk/CMFDefault/setuphandlers.py

-=-
Modified: CMF/trunk/CMFDefault/profiles/default/toolset.xml
===================================================================
--- CMF/trunk/CMFDefault/profiles/default/toolset.xml	2005-11-28 11:38:16 UTC (rev 40386)
+++ CMF/trunk/CMFDefault/profiles/default/toolset.xml	2005-11-28 14:49:38 UTC (rev 40387)
@@ -3,6 +3,8 @@
 
  <required tool_id="MailHost"
            class="Products.MailHost.MailHost.MailHost"/>
+ <required tool_id="acl_users"
+           class="AccessControl.User.UserFolder"/>
  <required tool_id="caching_policy_manager"
            class="Products.CMFCore.CachingPolicyManager.CachingPolicyManager"/>
  <required tool_id="content_type_registry"

Modified: CMF/trunk/CMFDefault/setuphandlers.py
===================================================================
--- CMF/trunk/CMFDefault/setuphandlers.py	2005-11-28 11:38:16 UTC (rev 40386)
+++ CMF/trunk/CMFDefault/setuphandlers.py	2005-11-28 14:49:38 UTC (rev 40387)
@@ -15,7 +15,9 @@
 $Id$
 """
 
+from exceptions import BadRequest
 
+
 def importVarious(context):
     """ Import various settings.
 
@@ -25,10 +27,9 @@
     site = context.getSite()
 
     try:
-        site.manage_addProduct['OFSP'].manage_addUserFolder()
-    except TypeError:
+        site.manage_addPortalFolder('Members')
+    except BadRequest:
         return 'Various settings: Nothing to import.'
-    site.manage_addPortalFolder('Members')
     site.Members.manage_addProduct['OFSP'].manage_addDTMLMethod('index_html',
                                         'Member list', '<dtml-return roster>')