[CMF-checkins] CVS: CMF/CMFSetup - README.txt:1.7 registry.py:1.14 tool.py:1.15

[Tres Seaver]

Update of /cvs-repository/CMF/CMFSetup
In directory cvs.zope.org:/tmp/cvs-serv2866

Modified Files:
	README.txt registry.py tool.py 
Log Message:


  - README.txt

    o Update punch list.

  - registry.py:

    o Sort tool lists for CVS friendliness.

  - tool.py:

    o Fix buglet in exportToolset.

  - profiles/default/import_steps.xml:

    o Fix ID clash.

  - tests/test_all.py:

    o Janitorial.


=== CMF/CMFSetup/README.txt 1.6 => 1.7 ===
--- CMF/CMFSetup/README.txt:1.6	Fri Jun 25 16:21:56 2004
+++ CMF/CMFSetup/README.txt	Wed Jun 30 14:58:51 2004
@@ -13,7 +13,7 @@
     The 'portal_setup' tool knows how to export / import configurations
     and scripts for the following tools:
 
-      - ( ) removal / creation of specified tools
+      - (x) removal / creation of specified tools
 
       - (x) itself :)
 
@@ -44,7 +44,7 @@
 
             o DCWorkflow definitions, including supporting scripts
 
-      - ( ) 'portal_catalogs'
+      - ( ) 'portal_catalog'
             (Products.CMFCore.CatalogTool.CatalogTool)
 
             o index names / types
@@ -59,12 +59,36 @@
 
             o member properties
 
+      - ( ) 'content_type_registry'
+
+            o predicate -> portal_type bindings.
+
+      - ( ) 'caching_policy_manager'
+
+            o policy settins
+
+      - ( ) 'portal_metadata'
+
+            o global properties
+
+            o default element policies
+
+            o type-specific element policies
+
       - ( ) 'portal_actionicons'
             (Products.CMFActionIcons.ActionIconsTool.ActionIconsTool)
 
             o action title / icon bindings
 
-      - ( ) cookie crumbler configuration
+      - ( ) 'cookie_authentication'
+
+            o tool properties
+
+      - ( ) 'MailHost'
+
+            o tool properties
+
+      - ( ) user folder configuration
 
       - ( ) folder structure
 


=== CMF/CMFSetup/registry.py 1.13 => 1.14 ===
--- CMF/CMFSetup/registry.py:1.13	Wed Jun 30 14:12:59 2004
+++ CMF/CMFSetup/registry.py	Wed Jun 30 14:58:51 2004
@@ -415,7 +415,9 @@
 
         """ See IToolsetRegistry.
         """
-        return tuple( self._forbidden )
+        result = list( self._forbidden )
+        result.sort()
+        return result
 
     security.declareProtected( ManagePortal, 'addForbiddenTool' )
     def addForbiddenTool( self, tool_id ):
@@ -435,7 +437,9 @@
 
         """ See IToolsetRegistry.
         """
-        return self._required.keys()
+        result = list( self._required.keys() )
+        result.sort()
+        return result
 
     security.declareProtected( ManagePortal, 'getRequiredToolInfo' )
     def getRequiredToolInfo( self, tool_id ):
@@ -450,7 +454,7 @@
         """ See IToolsetRegistry.
         """
         return [ self.getRequiredToolInfo( x )
-                        for x in self._required.keys() ]
+                        for x in self.listRequiredTools() ]
 
     security.declareProtected( ManagePortal, 'addRequiredTool' )
     def addRequiredTool( self, tool_id, dotted_name ):


=== CMF/CMFSetup/tool.py 1.14 => 1.15 ===
--- CMF/CMFSetup/tool.py:1.14	Wed Jun 30 14:12:59 2004
+++ CMF/CMFSetup/tool.py	Wed Jun 30 14:58:51 2004
@@ -89,7 +89,8 @@
     """ Export required / forbidden tools to XML file.
     """
     site = context.getSite()
-    toolset = ToolsetRegistry().__of__( site )
+    setup_tool = getToolByName( site, 'portal_setup' )
+    toolset = setup_tool.getToolsetRegistry()
 
     xml = toolset.generateXML()
     context.writeDataFile( TOOLSET_XML, xml, 'text/xml' )