[CMF-checkins] CVS: CMF/CMFSetup/profiles/default - export_steps.xml:1.5 import_steps.xml:1.5

[Tres Seaver]

Update of /cvs-repository/CMF/CMFSetup/profiles/default
In directory cvs.zope.org:/tmp/cvs-serv26029/profiles/default

Modified Files:
	export_steps.xml import_steps.xml 
Log Message:


  - The "toolset" handler had a bootstrapping problem;  it relies on
    state which is not kept anywhere in the site!  Solve the problem
    by making the handler a sub-object of the setup tool, and renaming
    it "ToolsetRegistry" (note that its code migrated into the 'registry'
    module).

  - Add tests for export / import of toolset on actual site.


=== CMF/CMFSetup/profiles/default/export_steps.xml 1.4 => 1.5 ===
--- CMF/CMFSetup/profiles/default/export_steps.xml:1.4	Thu Jun 24 16:32:20 2004
+++ CMF/CMFSetup/profiles/default/export_steps.xml	Wed Jun 30 14:13:00 2004
@@ -1,20 +1,29 @@
 <?xml version="1.0"?>
 <export-steps>
- <export-step id="actions"
-              handler="Products.CMFSetup.actions.exportActionProviders"
-              title="Action Providers">
+ <export-step id="rolemap"
+              handler="Products.CMFSetup.rolemap.exportRolemap"
+              title="Role / Permission Map">
   
   
-  Export actions tool's action providers and their actions.
+  Export custom roles and non-default role-permission mappings.
  
  
  </export-step>
- <export-step id="rolemap"
-              handler="Products.CMFSetup.rolemap.exportRolemap"
-              title="Role / Permission Map">
+ <export-step id="toolset"
+              handler="Products.CMFSetup.tool.exportToolset"
+              title="Required Tools">
   
   
-  Export custom roles and non-default role-permission mappings.
+  Export required / forbidden tools.
+ 
+ 
+ </export-step>
+ <export-step id="actions"
+              handler="Products.CMFSetup.actions.exportActionProviders"
+              title="Action Providers">
+  
+  
+  Export actions tool's action providers and their actions.
  
  
  </export-step>


=== CMF/CMFSetup/profiles/default/import_steps.xml 1.4 => 1.5 ===
--- CMF/CMFSetup/profiles/default/import_steps.xml:1.4	Thu Jun 24 16:32:20 2004
+++ CMF/CMFSetup/profiles/default/import_steps.xml	Wed Jun 30 14:13:00 2004
@@ -1,24 +1,34 @@
 <?xml version="1.0"?>
 <import-steps>
- <import-step id="actions" version="20040523-01"
-              handler="Products.CMFSetup.actions.importActionProviders"
-              title="Action Providers">
+ <import-step id="rolemap" version="20040523-01"
+              handler="Products.CMFSetup.rolemap.importRolemap"
+              title="Role / Permission Map">
   
   
-  Import actions tool's action providers and their actions.
+  Import custom roles and non-default role-permission mappings.
  
  
  </import-step>
- <import-step id="rolemap" version="20040523-01"
-              handler="Products.CMFSetup.rolemap.importRolemap"
-              title="Role / Permission Map">
+ <import-step id="toolset" version="20040630-01"
+              handler="Products.CMFSetup.tool.importToolset"
+              title="Required tools">
   
   
-  Import custom roles and non-default role-permission mappings.
+  Create required tools, replacing any of the wrong class, and remove
+  forbidden ones.
+ 
+ </import-step>
+ <import-step id="actions" version="20040630-01"
+              handler="Products.CMFSetup.actions.importActionProviders"
+              title="Action Providers">
+  
+  
+  Import actions tool's action providers and their actions.
  
  
+  <dependency step="toolset" />
  </import-step>
- <import-step id="skins" version="20040523-01"
+ <import-step id="skins" version="20040630-01"
               handler="Products.CMFSetup.skins.importSkinsTool"
               title="Skins Tool">
   
@@ -26,8 +36,9 @@
   Import skins tool's filesystem directory views and skin path definitions.
  
  
+  <dependency step="toolset" />
  </import-step>
- <import-step id="typeinfo" version="20040523-01"
+ <import-step id="typeinfo" version="20040630-01"
               handler="Products.CMFSetup.typeinfo.importTypesTool"
               title="Types Tool">
   
@@ -35,8 +46,9 @@
   Import types tool's type information objects.
  
  
+  <dependency step="toolset" />
  </import-step>
- <import-step id="typeinfo" version="20040624-01"
+ <import-step id="typeinfo" version="20040630-01"
               handler="Products.CMFSetup.workflow.importWorkflowTool"
               title="Workflow Tool">
   
@@ -44,5 +56,6 @@
   Import workflow tool's workflow definitions and supporting scripts.
  
  
+  <dependency step="toolset" />
  </import-step>
 </import-steps>