[Plone-cvs] r38316 - in Products.LinguaPlone/trunk: . Products/LinguaPlone/exportimport

[Hanno S. <svn...@pl...>]

Author: hannosch
Date: Wed Jul 28 22:15:55 2010
New Revision: 38316

Removed:
   Products.LinguaPlone/trunk/Products/LinguaPlone/exportimport/reference.py
   Products.LinguaPlone/trunk/Products/LinguaPlone/exportimport/uid.py
Modified:
   Products.LinguaPlone/trunk/CHANGES.txt
   Products.LinguaPlone/trunk/Products/LinguaPlone/exportimport/configure.zcml
Log:
Removed Archetypes uid and reference catalog GenericSetup handlers. These are part of Archetypes now.


Modified: Products.LinguaPlone/trunk/CHANGES.txt
==============================================================================
--- Products.LinguaPlone/trunk/CHANGES.txt	(original)
+++ Products.LinguaPlone/trunk/CHANGES.txt	Wed Jul 28 22:15:55 2010
@@ -4,6 +4,10 @@
 4.0a1 - unreleased
 ------------------
 
+- Removed Archetypes uid and reference catalog GenericSetup handlers. These
+  are part of Archetypes now.
+  [hannosch]
+
 - Removed Plone 3.3 specific tests.
   [hannosch]
 

Modified: Products.LinguaPlone/trunk/Products/LinguaPlone/exportimport/configure.zcml
==============================================================================
--- Products.LinguaPlone/trunk/Products/LinguaPlone/exportimport/configure.zcml	(original)
+++ Products.LinguaPlone/trunk/Products/LinguaPlone/exportimport/configure.zcml	Wed Jul 28 22:15:55 2010
@@ -1,46 +1,7 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
-    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="linguaplone">
 
   <adapter factory=".LanguageIndex.LanguageIndexNodeAdapter" />
 
-  <configure zcml:condition="not-installed Products.Archetypes.exportimport.catalog">
-
-    <adapter factory=".reference.ReferenceCatalogXMLAdapter"/>
-    <adapter factory=".uid.UIDCatalogXMLAdapter"/>
-
-    <genericsetup:importStep
-        name="reference_catalog"
-        title="Reference Catalog"
-        description="Import reference catalog."
-        handler=".reference.importCatalogTool">
-      <depends name="toolset" />
-    </genericsetup:importStep>
-
-    <genericsetup:exportStep
-        name="reference_catalog"
-        title="Reference Catalog"
-        description="Export reference catalog."
-        handler=".reference.exportCatalogTool"
-        />
-
-    <genericsetup:importStep
-        name="uid_catalog"
-        title="UID Catalog"
-        description="Import uid catalog."
-        handler=".uid.importCatalogTool">
-      <depends name="toolset" />
-    </genericsetup:importStep>
-
-    <genericsetup:exportStep
-        name="uid_catalog"
-        title="UID Catalog"
-        description="Export uid catalog."
-        handler=".uid.exportCatalogTool"
-        />
-
-  </configure>
-
 </configure>