[CMF-checkins] SVN: CMF/branches/1.5/C - fixed meta_type conflict with DCWorkflow workflows (http://www.zope.org/Collectors/CMF/298)

[Yvo Schubbe]

Log message for revision 40193:
  - fixed meta_type conflict with DCWorkflow workflows (http://www.zope.org/Collectors/CMF/298)
  - moved post-beta change notes into the correct section of CHANGES.txt

Changed:
  U   CMF/branches/1.5/CHANGES.txt
  U   CMF/branches/1.5/CMFDefault/DefaultWorkflow.py

-=-
Modified: CMF/branches/1.5/CHANGES.txt
===================================================================
--- CMF/branches/1.5/CHANGES.txt	2005-11-17 13:20:58 UTC (rev 40192)
+++ CMF/branches/1.5/CHANGES.txt	2005-11-17 14:30:28 UTC (rev 40193)
@@ -1,3 +1,22 @@
+CMF 1.5.5 (unreleased)
+
+  Bug Fixes
+
+    - DefaultWorkflowDefinition: Changed meta_type to make it unique.
+      (http://www.zope.org/Collectors/CMF/298)
+
+    - CMFSetup: fixed empty attribute parsing when an encoding is
+      defined.
+
+  Others
+
+    - CMFCore: removed old backward compatibility code that slowed down
+      TypeInformation.allowType and gave PortalFolder.allowedContentTypes
+      quadratic complexity.
+
+    - Removed deprecated 'all_cmf_tests.py' and supporting 'test_all.py'
+      from products (use 'zopectl test' to run CMF tests instead).
+
 CMF 1.5.5-beta (2005/11/06)
 
   Bug Fixes
@@ -14,9 +33,6 @@
       in the list of events for the day starting at midnight.
       (http://www.zope.org/Collectors/CMF/246)
 
-    - CMFSetup: fixed empty attribute parsing when an encoding is
-      defined.
-
   Features
 
     - CMFCore:  added 'skinname' to the thread-specific tuple created by
@@ -57,9 +73,6 @@
 
   Others
 
-    - Removed deprecated 'all_cmf_tests.py' and supporting 'test_all.py'
-      from products (use 'zopectl test' to run CMF tests instead).
-
     - CMFDefault.Portal:  deprecated 'manage_addCMFSite'.
 
     - Collectors #384:  Added '__traceback_info__' to FSDTMLMethod's
@@ -78,10 +91,6 @@
     - CMFSetup: allow export of properties of old objects that were
       stored as lists (instead of tuples now).
 
-    - CMFCore: removed old backward compatibility code that slowed down
-      TypeInformation.allowType and gave PortalFolder.allowedContentTypes
-      quadratic complexity.
-
 CMF 1.5.4 (2005/09/04)
 
   Bug Fixes

Modified: CMF/branches/1.5/CMFDefault/DefaultWorkflow.py
===================================================================
--- CMF/branches/1.5/CMFDefault/DefaultWorkflow.py	2005-11-17 13:20:58 UTC (rev 40192)
+++ CMF/branches/1.5/CMFDefault/DefaultWorkflow.py	2005-11-17 14:30:28 UTC (rev 40193)
@@ -43,7 +43,7 @@
 
     __implements__ = IWorkflowDefinition
 
-    meta_type = 'Workflow'
+    meta_type = 'CMF Default Workflow'
     id = 'default_workflow'
     title = 'Simple Review / Publish Policy'
     _isAWorkflow = 1