[CMF-checkins] SVN: CMF/ - moved generic code to GenericSetup

Yvo Schubbe y.2005- at wcm-solutions.de
Sun Sep 25 11:42:00 EDT 2005


Log message for revision 38621:
  - moved generic code to GenericSetup

Changed:
  A   CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/catalog.xml
  U   CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/export_steps.xml
  U   CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/import_steps.xml
  A   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/adapters.py
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/configure.zcml
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/tests/test_adapters.py
  A   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/adapters.py
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/configure.zcml
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/tests/test_adapters.py
  A   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/adapters.py
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/configure.zcml
  U   CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/tests/test_adapters.py
  A   CMF/trunk/CMFCalendar/profiles/default/catalog.xml
  U   CMF/trunk/CMFCalendar/setuphandlers.py
  A   CMF/trunk/CMFSetup/catalog.py
  A   CMF/trunk/CMFSetup/tests/test_catalog.py
  A   CMF/trunk/GenericSetup/configure.zcml
  U   CMF/trunk/GenericSetup/interfaces.py
  A   CMF/trunk/GenericSetup/testing.py
  U   CMF/trunk/GenericSetup/utils.py

-=-
Copied: CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/catalog.xml (from rev 38606, CMF/branches/yuppie-catalog_setup/CMFDefault/profiles/default/catalog.xml)

Modified: CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/export_steps.xml
===================================================================
--- CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/export_steps.xml	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/export_steps.xml	2005-09-25 15:41:59 UTC (rev 38621)
@@ -22,6 +22,17 @@
  
  
  </export-step>
+ <export-step id="catalog"
+              handler="Products.CMFSetup.catalog.exportCatalogTool"
+              title="Catalog Tool">
+  
+  
+  
+  Export catalog tool's sub-objects, indexes and columns.
+ 
+ 
+ 
+ </export-step>
  <export-step id="properties"
               handler="Products.CMFSetup.properties.exportSiteProperties"
               title="Site Properties">

Modified: CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/import_steps.xml
===================================================================
--- CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/import_steps.xml	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/goldegg-folder_contents/CMFDefault/profiles/default/import_steps.xml	2005-09-25 15:41:59 UTC (rev 38621)
@@ -27,6 +27,19 @@
   
  
  </import-step>
+ <import-step id="catalog" version="20050918-01"
+              handler="Products.CMFSetup.catalog.importCatalogTool"
+              title="Catalog Tool">
+  <dependency step="toolset"/>
+  
+  
+  
+  Import catalog tool's sub-objects, indexes and columns.
+ 
+ 
+  
+ 
+ </import-step>
  <import-step id="properties" version="20041215-01"
               handler="Products.CMFSetup.properties.importSiteProperties"
               title="Site Properties">

Copied: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes (from rev 38620, CMF/branches/yuppie-catalog_setup/CMFSetup/PluginIndexes)

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/adapters.py
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/PluginIndexes/adapters.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/adapters.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -15,11 +15,11 @@
 $Id$
 """
 
-from Products.CMFSetup.interfaces import INodeExporter
-from Products.CMFSetup.interfaces import INodeImporter
-from Products.CMFSetup.interfaces import PURGE
-from Products.CMFSetup.utils import NodeAdapterBase
-from Products.CMFSetup.utils import PropertyManagerHelpers
+from Products.GenericSetup.interfaces import INodeExporter
+from Products.GenericSetup.interfaces import INodeImporter
+from Products.GenericSetup.interfaces import PURGE
+from Products.GenericSetup.utils import NodeAdapterBase
+from Products.GenericSetup.utils import PropertyManagerHelpers
 
 from Products.PluginIndexes.interfaces import IDateIndex
 from Products.PluginIndexes.interfaces import IDateRangeIndex

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/configure.zcml
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/PluginIndexes/configure.zcml	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/configure.zcml	2005-09-25 15:41:59 UTC (rev 38621)
@@ -4,85 +4,85 @@
 
   <adapter
       factory=".adapters.PluggableIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.PluginIndexes.interfaces.IPluggableIndex"
       />
 
   <adapter
       factory=".adapters.PluggableIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.PluginIndexes.interfaces.IPluggableIndex"
       />
 
   <adapter
       factory=".adapters.DateIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.PluginIndexes.interfaces.IDateIndex"
       />
 
   <adapter
       factory=".adapters.DateIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.PluginIndexes.interfaces.IDateIndex"
       />
 
   <adapter
       factory=".adapters.DateRangeIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.PluginIndexes.interfaces.IDateRangeIndex"
       />
 
   <adapter
       factory=".adapters.DateRangeIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.PluginIndexes.interfaces.IDateRangeIndex"
       />
 
   <adapter
       factory=".adapters.PathIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.PluginIndexes.interfaces.IPathIndex"
       />
 
   <adapter
       factory=".adapters.PathIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.PluginIndexes.interfaces.IPathIndex"
       />
 
   <adapter
       factory=".adapters.VocabularyNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.PluginIndexes.interfaces.IVocabulary"
       />
 
   <adapter
       factory=".adapters.TextIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.PluginIndexes.interfaces.ITextIndex"
       />
 
   <adapter
       factory=".adapters.FilteredSetNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.PluginIndexes.interfaces.IFilteredSet"
       />
 
   <adapter
       factory=".adapters.FilteredSetNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.PluginIndexes.interfaces.IFilteredSet"
       />
 
   <adapter
       factory=".adapters.TopicIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.PluginIndexes.interfaces.ITopicIndex"
       />
 
   <adapter
       factory=".adapters.TopicIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.PluginIndexes.interfaces.ITopicIndex"
       />
 

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/tests/test_adapters.py
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/PluginIndexes/tests/test_adapters.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/PluginIndexes/tests/test_adapters.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -20,7 +20,7 @@
 import Zope2
 Zope2.startup()
 
-from Products.CMFSetup.testing import NodeAdapterTestCase
+from Products.GenericSetup.testing import NodeAdapterTestCase
 
 
 _DATE_XML = """\
@@ -73,7 +73,7 @@
 class DateIndexNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import DateIndexNodeAdapter
 
         return DateIndexNodeAdapter
@@ -88,7 +88,7 @@
 class DateRangeIndexNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import DateRangeIndexNodeAdapter
 
         return DateRangeIndexNodeAdapter
@@ -107,7 +107,7 @@
 class FieldIndexNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import PluggableIndexNodeAdapter
 
         return PluggableIndexNodeAdapter
@@ -125,7 +125,7 @@
 class KeywordIndexNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import PluggableIndexNodeAdapter
 
         return PluggableIndexNodeAdapter
@@ -144,7 +144,7 @@
 class PathIndexNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import PathIndexNodeAdapter
 
         return PathIndexNodeAdapter
@@ -159,7 +159,7 @@
 class VocabularyNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import VocabularyNodeAdapter
 
         return VocabularyNodeAdapter
@@ -177,7 +177,7 @@
 class TextIndexNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import TextIndexNodeAdapter
 
         return TextIndexNodeAdapter
@@ -195,7 +195,7 @@
 class FilteredSetNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import FilteredSetNodeAdapter
 
         return FilteredSetNodeAdapter
@@ -214,7 +214,7 @@
 class TopicIndexNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.PluginIndexes.adapters \
+        from Products.GenericSetup.PluginIndexes.adapters \
                 import TopicIndexNodeAdapter
 
         return TopicIndexNodeAdapter

Copied: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex (from rev 38620, CMF/branches/yuppie-catalog_setup/CMFSetup/ZCTextIndex)

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/adapters.py
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/ZCTextIndex/adapters.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/adapters.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -19,8 +19,8 @@
 from BTrees.Length import Length
 from BTrees.OIBTree import OIBTree
 
-from Products.CMFSetup.interfaces import PURGE
-from Products.CMFSetup.utils import NodeAdapterBase
+from Products.GenericSetup.interfaces import PURGE
+from Products.GenericSetup.utils import NodeAdapterBase
 
 from Products.ZCTextIndex.interfaces import IZCLexicon
 from Products.ZCTextIndex.interfaces import IZCTextIndex

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/configure.zcml
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/ZCTextIndex/configure.zcml	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/configure.zcml	2005-09-25 15:41:59 UTC (rev 38621)
@@ -4,25 +4,25 @@
 
   <adapter
       factory=".adapters.ZCLexiconNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.ZCTextIndex.interfaces.IZCLexicon"
       />
 
   <adapter
       factory=".adapters.ZCLexiconNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.ZCTextIndex.interfaces.IZCLexicon"
       />
 
   <adapter
       factory=".adapters.ZCTextIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.ZCTextIndex.interfaces.IZCTextIndex"
       />
 
   <adapter
       factory=".adapters.ZCTextIndexNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.ZCTextIndex.interfaces.IZCTextIndex"
       />
 

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/tests/test_adapters.py
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/ZCTextIndex/tests/test_adapters.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCTextIndex/tests/test_adapters.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -22,7 +22,7 @@
 
 from Acquisition import Implicit
 
-from Products.CMFSetup.testing import NodeAdapterTestCase
+from Products.GenericSetup.testing import NodeAdapterTestCase
 
 
 class _extra:
@@ -55,7 +55,7 @@
 class ZCLexiconNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.ZCTextIndex.adapters \
+        from Products.GenericSetup.ZCTextIndex.adapters \
                 import ZCLexiconNodeAdapter
 
         return ZCLexiconNodeAdapter
@@ -76,7 +76,7 @@
 class ZCTextIndexNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.ZCTextIndex.adapters \
+        from Products.GenericSetup.ZCTextIndex.adapters \
                 import ZCTextIndexNodeAdapter
 
         return ZCTextIndexNodeAdapter

Copied: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog (from rev 38620, CMF/branches/yuppie-catalog_setup/CMFSetup/ZCatalog)

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/adapters.py
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/ZCatalog/adapters.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/adapters.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -15,12 +15,12 @@
 $Id$
 """
 
-from Products.CMFSetup.interfaces import INodeExporter
-from Products.CMFSetup.interfaces import INodeImporter
-from Products.CMFSetup.interfaces import PURGE
-from Products.CMFSetup.utils import NodeAdapterBase
-from Products.CMFSetup.utils import ObjectManagerHelpers
-from Products.CMFSetup.utils import PropertyManagerHelpers
+from Products.GenericSetup.interfaces import INodeExporter
+from Products.GenericSetup.interfaces import INodeImporter
+from Products.GenericSetup.interfaces import PURGE
+from Products.GenericSetup.utils import NodeAdapterBase
+from Products.GenericSetup.utils import ObjectManagerHelpers
+from Products.GenericSetup.utils import PropertyManagerHelpers
 
 from Products.ZCatalog.interfaces import IZCatalog
 

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/configure.zcml
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/ZCatalog/configure.zcml	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/configure.zcml	2005-09-25 15:41:59 UTC (rev 38621)
@@ -4,13 +4,13 @@
 
   <adapter
       factory=".adapters.ZCatalogNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeExporter"
+      provides="Products.GenericSetup.interfaces.INodeExporter"
       for="Products.ZCatalog.interfaces.IZCatalog"
       />
 
   <adapter
       factory=".adapters.ZCatalogNodeAdapter"
-      provides="Products.CMFSetup.interfaces.INodeImporter"
+      provides="Products.GenericSetup.interfaces.INodeImporter"
       for="Products.ZCatalog.interfaces.IZCatalog"
       />
 

Modified: CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/tests/test_adapters.py
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/ZCatalog/tests/test_adapters.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/branches/yuppie-catalog_setup-redo/GenericSetup/ZCatalog/tests/test_adapters.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -20,9 +20,9 @@
 import Zope2
 Zope2.startup()
 
-from Products.CMFSetup.interfaces import INodeExporter
-from Products.CMFSetup.testing import NodeAdapterTestCase
-from Products.CMFSetup.utils import PrettyDocument
+from Products.GenericSetup.interfaces import INodeExporter
+from Products.GenericSetup.testing import NodeAdapterTestCase
+from Products.GenericSetup.utils import PrettyDocument
 
 
 class _extra:
@@ -76,7 +76,8 @@
 class ZCatalogNodeAdapterTests(NodeAdapterTestCase):
 
     def _getTargetClass(self):
-        from Products.CMFSetup.ZCatalog.adapters import ZCatalogNodeAdapter
+        from Products.GenericSetup.ZCatalog.adapters \
+                import ZCatalogNodeAdapter
 
         return ZCatalogNodeAdapter
 

Copied: CMF/trunk/CMFCalendar/profiles/default/catalog.xml (from rev 38606, CMF/branches/yuppie-catalog_setup/CMFCalendar/profiles/default/catalog.xml)

Modified: CMF/trunk/CMFCalendar/setuphandlers.py
===================================================================
--- CMF/trunk/CMFCalendar/setuphandlers.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/trunk/CMFCalendar/setuphandlers.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -17,7 +17,6 @@
 
 from Products.CMFCore.utils import getToolByName
 
-from exceptions import CatalogError
 from exceptions import MetadataError
 
 
@@ -28,27 +27,8 @@
     are implemented for these steps.
     """
     site = context.getSite()
-    ctool = getToolByName(site, 'portal_catalog')
     mdtool = getToolByName(site, 'portal_metadata')
 
-    # Set up a catalog indexes and metadata
-    try:
-        ctool.addIndex('start', 'DateIndex')
-    except CatalogError:
-        pass
-    try:
-        ctool.addIndex('end', 'DateIndex')
-    except CatalogError:
-        pass
-    try:
-        ctool.addColumn('start')
-    except CatalogError:
-        pass
-    try:
-        ctool.addColumn('end')
-    except CatalogError:
-        pass
-
     # Set up a MetadataTool element policy for events
     try:
         _ = str # MetadataTool ist not aware of MessageIDs

Copied: CMF/trunk/CMFSetup/catalog.py (from rev 38606, CMF/branches/yuppie-catalog_setup/CMFSetup/catalog.py)
===================================================================
--- CMF/branches/yuppie-catalog_setup/CMFSetup/catalog.py	2005-09-24 22:35:29 UTC (rev 38606)
+++ CMF/trunk/CMFSetup/catalog.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -0,0 +1,63 @@
+##############################################################################
+#
+# Copyright (c) 2005 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.
+#
+##############################################################################
+"""Catalog tool setup handlers.
+
+$Id$
+"""
+
+from xml.dom.minidom import parseString
+
+from Products.CMFCore.utils import getToolByName
+from Products.GenericSetup.interfaces import INodeExporter
+from Products.GenericSetup.interfaces import INodeImporter
+from Products.GenericSetup.interfaces import PURGE, UPDATE
+from Products.GenericSetup.utils import PrettyDocument
+
+_FILENAME = 'catalog.xml'
+
+
+def importCatalogTool(context):
+    """ Import catalog tool.
+    """
+    site = context.getSite()
+    mode = context.shouldPurge() and PURGE or UPDATE
+    ctool = getToolByName(site, 'portal_catalog')
+
+    body = context.readDataFile(_FILENAME)
+    if body is None:
+        return 'Catalog tool: Nothing to import.'
+
+    importer = INodeImporter(ctool, None)
+    if importer is None:
+        return 'Catalog tool: Import adapter misssing.'
+
+    importer.importNode(parseString(body).documentElement, mode=mode)
+    return 'Catalog tool imported.'
+
+def exportCatalogTool(context):
+    """ Export catalog tool.
+    """
+    site = context.getSite()
+
+    ctool = getToolByName(site, 'portal_catalog', None)
+    if ctool is None:
+        return 'Catalog tool: Nothing to export.'
+
+    exporter = INodeExporter(ctool)
+    if exporter is None:
+        return 'Catalog tool: Export adapter misssing.'
+
+    doc = PrettyDocument()
+    doc.appendChild(exporter.exportNode(doc))
+    context.writeDataFile(_FILENAME, doc.toprettyxml(' '), 'text/xml')
+    return 'Catalog tool exported.'

Copied: CMF/trunk/CMFSetup/tests/test_catalog.py (from rev 38606, CMF/branches/yuppie-catalog_setup/CMFSetup/tests/test_catalog.py)

Copied: CMF/trunk/GenericSetup/configure.zcml (from rev 38606, CMF/branches/yuppie-catalog_setup/CMFSetup/configure.zcml)

Modified: CMF/trunk/GenericSetup/interfaces.py
===================================================================
--- CMF/trunk/GenericSetup/interfaces.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/trunk/GenericSetup/interfaces.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -18,7 +18,8 @@
 from zope.interface import Interface
 
 
-BASE, EXTENSION = range(2)
+BASE, EXTENSION = range(1,3)
+PURGE, UPDATE = range(1, 3)
 
 
 class IPseudoInterface( Interface ):
@@ -511,3 +512,23 @@
         o If 'ignore_whitespace', then suppress diffs due only to whitespace
           (c.f:  'diff -wbB')
         """
+
+
+class INodeExporter(Interface):
+
+    """Node exporter.
+    """
+
+    def exportNode(doc):
+        """Export the object as a DOM node.
+        """
+
+
+class INodeImporter(Interface):
+
+    """Node importer.
+    """
+
+    def importNode(node, mode=PURGE):
+        """Import the object from the DOM node.
+        """

Copied: CMF/trunk/GenericSetup/testing.py (from rev 38606, CMF/branches/yuppie-catalog_setup/CMFSetup/testing.py)

Modified: CMF/trunk/GenericSetup/utils.py
===================================================================
--- CMF/trunk/GenericSetup/utils.py	2005-09-25 15:06:17 UTC (rev 38620)
+++ CMF/trunk/GenericSetup/utils.py	2005-09-25 15:41:59 UTC (rev 38621)
@@ -17,6 +17,11 @@
 
 import os
 from inspect import getdoc
+from xml.dom.minidom import _nssplit
+from xml.dom.minidom import _write_data
+from xml.dom.minidom import Document
+from xml.dom.minidom import Element
+from xml.dom.minidom import Node
 from xml.dom.minidom import parseString as domParseString
 from xml.sax.handler import ContentHandler
 
@@ -27,8 +32,12 @@
 from Globals import InitializeClass
 from Globals import package_home
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from zope.interface import implements
 
 from exceptions import BadRequest
+from interfaces import INodeExporter
+from interfaces import INodeImporter
+from interfaces import PURGE
 from permissions import ManagePortal
 
 
@@ -38,6 +47,7 @@
 _xmldir = os.path.join( _pkgdir, 'xml' )
 
 CONVERTER, DEFAULT, KEY = range(3)
+I18NURI = 'http://xml.zope.org/namespaces/i18n'
 
 
 def _getDottedName( named ):
@@ -512,3 +522,264 @@
         return _coalesceTextNodeChildren(d_nodes[0], encoding)
     else:
         return ''
+
+
+# XXX: Is there any code available in Zope that generates pretty XML? If not,
+#      this code has to be improved.
+class _Element(Element):
+
+    """minidom element with 'pretty' XML output.
+    """
+
+    def writexml(self, writer, indent="", addindent="", newl=""):
+        # indent = current indentation
+        # addindent = indentation to add to higher levels
+        # newl = newline string
+        writer.write(indent+"<" + self.tagName)
+
+        attrs = self._get_attributes()
+        a_names = attrs.keys()
+        a_names.sort()
+        if 'title' in a_names:
+            a_names.remove('title')
+            a_names.insert(0, 'title')
+        if 'meta_type' in a_names:
+            a_names.remove('meta_type')
+            a_names.insert(0, 'meta_type')
+        if 'name' in a_names:
+            a_names.remove('name')
+            a_names.insert(0, 'name')
+
+        for a_name in a_names:
+            writer.write(" %s=\"" % a_name)
+            _write_data(writer, attrs[a_name].value)
+            writer.write("\"")
+        if self.childNodes:
+            if self.firstChild.nodeType == Node.TEXT_NODE:
+                writer.write(">")
+            else:
+                writer.write(">%s"%(newl))
+            for node in self.childNodes:
+                if node.nodeType == Node.TEXT_NODE:
+                    writer.write(node.data)
+                else:
+                    node.writexml(writer,indent+addindent,addindent,newl)
+            if self.lastChild.nodeType == Node.TEXT_NODE:
+                writer.write("</%s>%s" % (self.tagName,newl))
+            else:
+                writer.write("%s</%s>%s" % (indent,self.tagName,newl))
+        else:
+            writer.write("/>%s"%(newl))
+
+
+class PrettyDocument(Document):
+
+    """minidom document with 'pretty' XML output.
+    """
+
+    def createElement(self, tagName):
+        e = _Element(tagName)
+        e.ownerDocument = self
+        return e
+
+    def createElementNS(self, namespaceURI, qualifiedName):
+        prefix, localName = _nssplit(qualifiedName)
+        e = _Element(qualifiedName, namespaceURI, prefix)
+        e.ownerDocument = self
+        return e
+
+    def writexml(self, writer, indent="", addindent="", newl="",
+                 encoding = None):
+        if encoding is None:
+            writer.write('<?xml version="1.0"?>\n')
+        else:
+            writer.write('<?xml version="1.0" encoding="%s"?>\n' % encoding)
+        for node in self.childNodes:
+            node.writexml(writer, indent, addindent, newl)
+
+
+class NodeAdapterBase(object):
+
+    """Node im- and exporter base.
+    """
+
+    implements(INodeExporter, INodeImporter)
+
+    def __init__(self, context):
+        self.context = context
+
+    def exportNode(self, doc):
+        """Export the object as a DOM node.
+        """
+        self._doc = doc
+        return self._getObjectNode('object')
+
+    def importNode(self, node, mode=PURGE):
+        """Import the object from the DOM node.
+        """
+
+    def _getObjectNode(self, name):
+        node = self._doc.createElement(name)
+        node.setAttribute('name', self.context.getId())
+        node.setAttribute('meta_type', self.context.meta_type)
+        i18n_domain = getattr(self.context, 'i18n_domain', None)
+        if i18n_domain:
+            node.setAttributeNS(I18NURI, 'i18n:domain', i18n_domain)
+            self._i18n_props = ('title', 'description')
+        return node
+
+    def _getNodeText(self, node):
+        text = ''
+        for child in node.childNodes:
+            if child.nodeName != '#text':
+                continue
+            text += child.nodeValue.lstrip()
+        return text
+
+    def _getNodeTextBoolean(self, node):
+        text = self._getNodeText(node)
+        return text.lower() in ('true', 'yes', '1')
+
+
+class ObjectManagerHelpers(object):
+
+    """ObjectManager im- and export helpers.
+    """
+
+    def _extractObjects(self):
+        fragment = self._doc.createDocumentFragment()
+        for obj in self.context.objectValues():
+            exporter = INodeExporter(obj, None)
+            if exporter is None:
+                continue
+            fragment.appendChild(exporter.exportNode(self._doc))
+        return fragment
+
+    def _purgeObjects(self):
+        for obj_id in self.context.objectIds():
+            self.context._delObject(obj_id)
+
+    def _initObjects(self, node, mode):
+        for child in node.childNodes:
+            if child.nodeName != 'object':
+                continue
+            if child.hasAttribute('deprecated'):
+                continue
+            parent = self.context
+
+            obj_id = str(child.getAttribute('name'))
+            if obj_id not in parent.objectIds():
+                meta_type = str(child.getAttribute('meta_type'))
+                for mt_info in Products.meta_types:
+                    if mt_info['name'] == meta_type:
+                        parent._setObject(obj_id, mt_info['instance'](obj_id))
+                        break
+                else:
+                    raise ValueError('unknown meta_type \'%s\'' % obj_id)
+
+            if child.hasAttribute('insert-before'):
+                insert_before = child.getAttribute('insert-before')
+                if insert_before == '*':
+                    parent.moveObjectsToTop(obj_id)
+                else:
+                    try:
+                        position = parent.getObjectPosition(insert_before)
+                        parent.moveObjectToPosition(obj_id, position)
+                    except ValueError:
+                        pass
+            elif child.hasAttribute('insert-after'):
+                insert_after = child.getAttribute('insert-after')
+                if insert_after == '*':
+                    parent.moveObjectsToBottom(obj_id)
+                else:
+                    try:
+                        position = parent.getObjectPosition(insert_after)
+                        parent.moveObjectToPosition(obj_id, position+1)
+                    except ValueError:
+                        pass
+
+            obj = getattr(self.context, obj_id)
+            INodeImporter(obj).importNode(child, mode)
+
+
+class PropertyManagerHelpers(object):
+
+    """PropertyManager im- and export helpers.
+    """
+
+    def _extractProperties(self):
+        fragment = self._doc.createDocumentFragment()
+
+        for prop_map in self.context._propertyMap():
+            if prop_map['id'] == 'i18n_domain':
+                continue
+            node = self._doc.createElement('property')
+
+            prop_id = prop_map['id']
+            node.setAttribute('name', prop_id)
+
+            prop = self.context.getProperty(prop_id)
+            if isinstance(prop, (tuple, list)):
+                for value in prop:
+                    child = self._doc.createElement('element')
+                    child.setAttribute('value', value)
+                    node.appendChild(child)
+            else:
+                if not isinstance(prop, basestring):
+                    prop = str(prop)
+                child = self._doc.createTextNode(prop)
+                node.appendChild(child)
+
+            if 'd' in prop_map.get('mode', 'wd') and not prop_id == 'title':
+                type = prop_map.get('type', 'string')
+                node.setAttribute('type', type)
+                select_variable = prop_map.get('select_variable', None)
+                if select_variable is not None:
+                    node.setAttribute('select_variable', select_variable)
+
+            if hasattr(self, '_i18n_props') and prop_id in self._i18n_props:
+                node.setAttribute('i18n:translate', '')
+
+            fragment.appendChild(node)
+
+        return fragment
+
+    def _purgeProperties(self):
+        #XXX: not implemented
+        pass
+
+    def _initProperties(self, node, mode):
+        self.context.i18n_domain = node.getAttribute('i18n:domain')
+        for child in node.childNodes:
+            if child.nodeName != 'property':
+                continue
+            obj = self.context
+            prop_id = str(child.getAttribute('name'))
+            prop_map = obj.propdict().get(prop_id, None)
+
+            if prop_map is None:
+                if child.hasAttribute('type'):
+                    val = child.getAttribute('select_variable')
+                    obj._setProperty(prop_id, val, child.getAttribute('type'))
+                    prop_map = obj.propdict().get(prop_id, None)
+                else:
+                    raise ValueError('undefined property \'%s\'' % prop_id)
+
+            if not 'w' in prop_map.get('mode', 'wd'):
+                raise BadRequest('%s cannot be changed' % prop_id)
+
+            elements = []
+            for sub in child.childNodes:
+                if sub.nodeName == 'element':
+                    elements.append(sub.getAttribute('value'))
+
+            if elements or prop_map.get('type') == 'multiple selection':
+                prop_value = tuple(elements) or ()
+            elif prop_map.get('type') == 'boolean':
+                prop_value = self._getNodeTextBoolean(child)
+            else:
+                # if we pass a *string* to _updateProperty, all other values
+                # are converted to the right type
+                prop_value = self._getNodeText(child)
+
+            obj._updateProperty(prop_id, prop_value)



More information about the CMF-checkins mailing list