[Plone-cvs] r48293 - in Products.CMFPlone/trunk: . Products/CMFPlone docs

[David G. <svn...@pl...>]

Author: davisagli
Date: Wed Mar 30 23:27:56 2011
New Revision: 48293

Modified:
   Products.CMFPlone/trunk/Products/CMFPlone/configure.zcml
   Products.CMFPlone/trunk/Products/CMFPlone/meta.zcml
   Products.CMFPlone/trunk/docs/CHANGES.txt
   Products.CMFPlone/trunk/setup.py
Log:
make wicked optional

Modified: Products.CMFPlone/trunk/Products/CMFPlone/configure.zcml
==============================================================================
--- Products.CMFPlone/trunk/Products/CMFPlone/configure.zcml	(original)
+++ Products.CMFPlone/trunk/Products/CMFPlone/configure.zcml	Wed Mar 30 23:27:56 2011
@@ -48,7 +48,9 @@
   <include package="archetypes.referencebrowserwidget" />
 
   <!-- wicked -->
-  <include package="wicked.plone" file="selective-atct.zcml" />
+  <configure zcml:condition="installed wicked">
+    <include package="wicked.plone" file="selective-atct.zcml" />
+  </configure>
 
   <!-- extra portlets -->
   <include package="plone.portlet.static" />

Modified: Products.CMFPlone/trunk/Products/CMFPlone/meta.zcml
==============================================================================
--- Products.CMFPlone/trunk/Products/CMFPlone/meta.zcml	(original)
+++ Products.CMFPlone/trunk/Products/CMFPlone/meta.zcml	Wed Mar 30 23:27:56 2011
@@ -28,7 +28,9 @@
     <include package="kss.core" file="meta.zcml" />
 
     <!-- wicked -->
-    <include package="wicked.fieldevent" file="meta.zcml" />
+    <configure zcml:condition="installed wicked">
+      <include package="wicked.fieldevent" file="meta.zcml" />
+    </configure>
 
     <!-- z3c.autoinclude's `includePlugins` directive finds
          and executes ZCML files from any installed packages

Modified: Products.CMFPlone/trunk/docs/CHANGES.txt
==============================================================================
--- Products.CMFPlone/trunk/docs/CHANGES.txt	(original)
+++ Products.CMFPlone/trunk/docs/CHANGES.txt	Wed Mar 30 23:27:56 2011
@@ -8,6 +8,10 @@
 4.1b2 - Unreleased
 ------------------
 
+- Make wicked an optional dependency. (It is still pulled in by the Plone
+  distribution.)
+  [davisagli]
+
 - Fix import of RoleManager to avoid deprecation warning.
   [davisagli]
 

Modified: Products.CMFPlone/trunk/setup.py
==============================================================================
--- Products.CMFPlone/trunk/setup.py	(original)
+++ Products.CMFPlone/trunk/setup.py	Wed Mar 30 23:27:56 2011
@@ -113,7 +113,6 @@
           'plonetheme.classic',
           'plonetheme.sunburst',
           'transaction',
-          'wicked',
           'z3c.autoinclude',
           'zope.app.container',
           'zope.app.locales >= 3.6.0',