[Checkins] SVN: CMF/branches/2.1/ Backported CMFDefault.factory change from trunk, updated GenericSetup to current revision of GS trunk.

[Hanno Schlichting]

Log message for revision 77022:
  Backported CMFDefault.factory change from trunk, updated GenericSetup to current revision of GS trunk.
  

Changed:
  _U  CMF/branches/2.1/
  U   CMF/branches/2.1/CHANGES.txt
  U   CMF/branches/2.1/CMFDefault/factory.py
  U   CMF/branches/2.1/EXTERNALS.txt

-=-

Property changes on: CMF/branches/2.1
___________________________________________________________________
Name: svn:externals
   - #
# Used for maintenance of external resources in this svn bundle.  Edit
# this file as appropriate and then run the following command from within
# the checkout directory where this file lives on your local machine:
#
# svn propset svn:externals -F ./EXTERNALS.TXT .
#
GenericSetup svn://svn.zope.org/repos/main/GenericSetup/tags/CMF-2.1.0-beta

   + #
# Used for maintenance of external resources in this svn bundle.  Edit
# this file as appropriate and then run the following command from within
# the checkout directory where this file lives on your local machine:
#
# svn propset svn:externals -F ./EXTERNALS.TXT .
#
GenericSetup -r77021 svn://svn.zope.org/repos/main/GenericSetup/trunk


Modified: CMF/branches/2.1/CHANGES.txt
===================================================================
--- CMF/branches/2.1/CHANGES.txt	2007-06-24 19:28:41 UTC (rev 77021)
+++ CMF/branches/2.1/CHANGES.txt	2007-06-24 19:37:05 UTC (rev 77022)
@@ -64,6 +64,8 @@
 
   Other
 
+    - CMFDefault: Adjusted factory.py to new GenericSetup version.
+
     - CMFUid.UniqueIdAnnotationTool: Annotation handling has been switched
       from triggering it through old-style manage_*-methods to using
       events. UID assigning behavior has been made more flexible. Please

Modified: CMF/branches/2.1/CMFDefault/factory.py
===================================================================
--- CMF/branches/2.1/CMFDefault/factory.py	2007-06-24 19:28:41 UTC (rev 77021)
+++ CMF/branches/2.1/CMFDefault/factory.py	2007-06-24 19:37:05 UTC (rev 77022)
@@ -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' )

Modified: CMF/branches/2.1/EXTERNALS.txt
===================================================================
--- CMF/branches/2.1/EXTERNALS.txt	2007-06-24 19:28:41 UTC (rev 77021)
+++ CMF/branches/2.1/EXTERNALS.txt	2007-06-24 19:37:05 UTC (rev 77022)
@@ -5,4 +5,4 @@
 #
 # svn propset svn:externals -F ./EXTERNALS.TXT .
 #
-GenericSetup svn://svn.zope.org/repos/main/GenericSetup/tags/CMF-2.1.0-beta
+GenericSetup -r77021 svn://svn.zope.org/repos/main/GenericSetup/trunk