[Checkins] SVN: CMF/trunk/C CMFDefault: Adjusted factory.py to new GenericSetup version.

[Hanno Schlichting]

Log message for revision 77021:
  CMFDefault: Adjusted factory.py to new GenericSetup version.
  

Changed:
  U   CMF/trunk/CHANGES.txt
  U   CMF/trunk/CMFDefault/factory.py

-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt	2007-06-24 19:22:38 UTC (rev 77020)
+++ CMF/trunk/CHANGES.txt	2007-06-24 19:28:41 UTC (rev 77021)
@@ -21,6 +21,8 @@
 
   Others
 
+    - CMFDefault: Adjusted factory.py to new GenericSetup version.
+
     - CMFUid: Removed redundant and unexpected code to auto-create catalog
       index and column for the UID handler tool. The index and column are
       already created by the default CMFUid GenericSetup profile.

Modified: CMF/trunk/CMFDefault/factory.py
===================================================================
--- CMF/trunk/CMFDefault/factory.py	2007-06-24 19:22:38 UTC (rev 77020)
+++ CMF/trunk/CMFDefault/factory.py	2007-06-24 19:28:41 UTC (rev 77021)
@@ -58,12 +58,10 @@
     site._setObject(_TOOL_ID, SetupTool(_TOOL_ID))
     setup_tool = getattr(site, _TOOL_ID)
 
-    setup_tool.setImportContext( 'profile-%s' % profile_id )
-    setup_tool.runAllImportSteps()
+    setup_tool.setBaselineContext('profile-%s' % profile_id)
+    setup_tool.runAllImportStepsFromProfile('profile-%s' % profile_id)
     for extension_id in extension_ids:
-        setup_tool.setImportContext( 'profile-%s' % extension_id )
-        setup_tool.runAllImportSteps()
-    setup_tool.setImportContext( 'profile-%s' % profile_id )
+        setup_tool.runAllImportStepsFromProfile('profile-%s' % extension_id)
 
     if snapshot is True:
         setup_tool.createSnapshot( 'initial_configuration' )