[CMF-checkins] SVN: CMF/branches/2.1/ - updated GenericSetup

[Yvo Schubbe]

Log message for revision 78624:
  - updated GenericSetup
  - synced default profile with exports

Changed:
  _U  CMF/branches/2.1/
  U   CMF/branches/2.1/CMFDefault/profiles/default/componentregistry.xml
  U   CMF/branches/2.1/CMFDefault/profiles/default/export_steps.xml
  U   CMF/branches/2.1/CMFDefault/profiles/default/import_steps.xml
  U   CMF/branches/2.1/CMFDefault/profiles/default/workflows/default_workflow/definition.xml
  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 -r78545 svn://svn.zope.org/repos/main/GenericSetup/branches/1.3

   + #
# 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 -r78622 svn://svn.zope.org/repos/main/GenericSetup/branches/1.3


Modified: CMF/branches/2.1/CMFDefault/profiles/default/componentregistry.xml
===================================================================
--- CMF/branches/2.1/CMFDefault/profiles/default/componentregistry.xml	2007-08-06 08:06:08 UTC (rev 78623)
+++ CMF/branches/2.1/CMFDefault/profiles/default/componentregistry.xml	2007-08-06 08:45:07 UTC (rev 78624)
@@ -2,29 +2,20 @@
 <componentregistry>
  <adapters/>
  <utilities>
-  <utility
-     interface="Products.CMFCore.interfaces.IDiscussionTool"
+  <utility interface="Products.CMFCore.interfaces.IDiscussionTool"
      object="portal_discussion"/>
-  <utility
-     interface="Products.CMFCore.interfaces.IMetadataTool"
+  <utility interface="Products.CMFCore.interfaces.IMetadataTool"
      object="portal_metadata"/>
-  <utility
-     interface="Products.CMFCore.interfaces.IPropertiesTool"
+  <utility interface="Products.CMFCore.interfaces.IPropertiesTool"
      object="portal_properties"/>
-  <utility
-     interface="Products.CMFCore.interfaces.ISiteRoot"
-     object=""/>
-  <utility
-     interface="Products.CMFCore.interfaces.ISyndicationTool"
+  <utility interface="Products.CMFCore.interfaces.ISiteRoot" object=""/>
+  <utility interface="Products.CMFCore.interfaces.ISyndicationTool"
      object="portal_syndication"/>
-  <utility
-     interface="Products.CMFCore.interfaces.IUndoTool"
+  <utility interface="Products.CMFCore.interfaces.IUndoTool"
      object="portal_undo"/>
-  <utility
-     interface="Products.GenericSetup.interfaces.ISetupTool"
+  <utility interface="Products.GenericSetup.interfaces.ISetupTool"
      object="portal_setup"/>
-  <utility
-     interface="Products.MailHost.interfaces.IMailHost"
+  <utility interface="Products.MailHost.interfaces.IMailHost"
      object="MailHost"/>
  </utilities>
 </componentregistry>

Modified: CMF/branches/2.1/CMFDefault/profiles/default/export_steps.xml
===================================================================
--- CMF/branches/2.1/CMFDefault/profiles/default/export_steps.xml	2007-08-06 08:06:08 UTC (rev 78623)
+++ CMF/branches/2.1/CMFDefault/profiles/default/export_steps.xml	2007-08-06 08:45:07 UTC (rev 78624)
@@ -17,7 +17,7 @@
  </export-step>
  <export-step id="componentregistry"
               handler="Products.GenericSetup.components.exportComponentRegistry"
-    title="Local Component Registry">
+              title="Local Component Registry">
     Export local component registry configuration.
  </export-step>
  <export-step id="content_type_registry"

Modified: CMF/branches/2.1/CMFDefault/profiles/default/import_steps.xml
===================================================================
--- CMF/branches/2.1/CMFDefault/profiles/default/import_steps.xml	2007-08-06 08:06:08 UTC (rev 78623)
+++ CMF/branches/2.1/CMFDefault/profiles/default/import_steps.xml	2007-08-06 08:45:07 UTC (rev 78624)
@@ -18,12 +18,11 @@
   <dependency step="toolset"/>
   Import catalog tool's sub-objects, indexes and columns.
  </import-step>
- <import-step id="componentregistry"
-    version="20061025-01"
-    handler="Products.GenericSetup.components.importComponentRegistry"
-    title="Local Component Registry">
-    <dependency step="various"/>
-    Import local component registry configuration.
+ <import-step id="componentregistry" version="20061025-01"
+              handler="Products.GenericSetup.components.importComponentRegistry"
+              title="Local Component Registry">
+  <dependency step="various"/>
+  Import local component registry configuration.
  </import-step>
  <import-step id="content_type_registry"
               version="20051013-01"

Modified: CMF/branches/2.1/CMFDefault/profiles/default/workflows/default_workflow/definition.xml
===================================================================
--- CMF/branches/2.1/CMFDefault/profiles/default/workflows/default_workflow/definition.xml	2007-08-06 08:06:08 UTC (rev 78623)
+++ CMF/branches/2.1/CMFDefault/profiles/default/workflows/default_workflow/definition.xml	2007-08-06 08:45:07 UTC (rev 78624)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <dc-workflow workflow_id="default_workflow"
              title="CMF default workflow [Classic]"
-             state_variable="review_state"
+             description="" state_variable="review_state"
              initial_state="private">
  <permission>Access contents information</permission>
  <permission>Modify portal content</permission>

Modified: CMF/branches/2.1/EXTERNALS.txt
===================================================================
--- CMF/branches/2.1/EXTERNALS.txt	2007-08-06 08:06:08 UTC (rev 78623)
+++ CMF/branches/2.1/EXTERNALS.txt	2007-08-06 08:45:07 UTC (rev 78624)
@@ -5,4 +5,4 @@
 #
 # svn propset svn:externals -F ./EXTERNALS.TXT .
 #
-GenericSetup -r78545 svn://svn.zope.org/repos/main/GenericSetup/branches/1.3
+GenericSetup -r78622 svn://svn.zope.org/repos/main/GenericSetup/branches/1.3