I'm probably missing something, hence my asking. If GenericSetup is generic, why is it in the CMF repository? Sure, bundle it with CMF, like BTreeFolder2 used to be, but why not also release it seperately and have it in its own repo? cheers, Chris Yvo Schubbe wrote:

Log message for revision 40429: CMFSetup is dead. Long live GenericSetup!

- removed obsolete CMFSetup product - added bbb code and __module_aliases__ to support setup tools created with CMFSetup

Changed: U CMF/trunk/CHANGES.txt D CMF/trunk/CMFSetup/ U CMF/trunk/GenericSetup/__init__.py A CMF/trunk/GenericSetup/bbb/ A CMF/trunk/GenericSetup/bbb/__init__.py A CMF/trunk/GenericSetup/bbb/registry.py A CMF/trunk/GenericSetup/bbb/tool.py

-=- Modified: CMF/trunk/CHANGES.txt =================================================================== --- CMF/trunk/CHANGES.txt 2005-11-30 12:47:07 UTC (rev 40428) +++ CMF/trunk/CHANGES.txt 2005-11-30 22:12:58 UTC (rev 40429) @@ -43,7 +43,7 @@ - ActionsTool: Improved add form for 'CMF Action' objects. Presettings can now be loaded from Action settings in setup profiles.

- - CMFSetup and GenericSetup: Added catalog tool setup handlers. + - CMFCore and GenericSetup: Added catalog tool setup handlers. This includes node adapters for PluginIndexes, ZCTextIndex and ZCatalog. Support for additional indexes can be added by providing INodeExporter and INodeImporter adapters. All indexes are cleared by this handler, so @@ -87,7 +87,7 @@

- Replaced user messages by MassageIDs to improve the i18n support.

- - CMFDefault CMFSetup profile: Added CMF BTree Folder to the list of + - CMFDefault GenericSetup profile: Added CMF BTree Folder to the list of automatically instantiated types in the types tool. (http://www.zope.org/Collectors/CMF/371)

@@ -117,9 +117,6 @@

Bug Fixes

- - CMFSetup: fixed empty attribute parsing when an encoding is - defined. - - ActionProviderBase: getActionObject did stumble over newstyle Actions.

- CMFCore.exportimport.content: Ensure that BODYFILE in our "faux" @@ -163,6 +160,9 @@

Others

+ - CMFSetup and GenericSetup: Removed obsolete CMFSetup product. + Added __module_aliases__ to support setup tools created with CMFSetup. + - DCWorkflow: Removed hardcoded default workflows.

- Workflow: Removed deprecated WorkflowInformation and getActionsFor.

Modified: CMF/trunk/GenericSetup/__init__.py =================================================================== --- CMF/trunk/GenericSetup/__init__.py 2005-11-30 12:47:07 UTC (rev 40428) +++ CMF/trunk/GenericSetup/__init__.py 2005-11-30 22:12:58 UTC (rev 40429) @@ -24,3 +24,15 @@ interfaces=None, icon='www/tool.png', ) + +# BBB: for setup tools created with CMF 1.5 if CMFSetup isn't installed +try: + import Products.CMFSetup +except ImportError: + import bbb + import bbb.registry + import bbb.tool + + __module_aliases__ = (('Products.CMFSetup', bbb), + ('Products.CMFSetup.registry', bbb.registry), + ('Products.CMFSetup.tool', bbb.tool))

Copied: CMF/trunk/GenericSetup/bbb/__init__.py (from rev 40417, CMF/trunk/CMFSetup/__init__.py) =================================================================== --- CMF/trunk/CMFSetup/__init__.py 2005-11-29 20:40:33 UTC (rev 40417) +++ CMF/trunk/GenericSetup/bbb/__init__.py 2005-11-30 22:12:58 UTC (rev 40429) @@ -0,0 +1,16 @@ +############################################################################## +# +# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +############################################################################## +""" CMFSetup product initialization. + +$Id$ +"""

Copied: CMF/trunk/GenericSetup/bbb/registry.py (from rev 40417, CMF/trunk/CMFSetup/registry.py)

Copied: CMF/trunk/GenericSetup/bbb/tool.py (from rev 40417, CMF/trunk/CMFSetup/tool.py)

_______________________________________________ CMF-checkins mailing list CMF-checkins@zope.org http://mail.zope.org/mailman/listinfo/cmf-checkins

-- Simplistix - Content Management, Zope & Python Consulting - http://www.simplistix.co.uk