[Zope-Checkins] SVN: Zope/trunk/ Made sure to exclude a number of meta ZCML handlers from ``zope.*`` packages where Zope2 provides its own implementations.

[Hanno Schlichting]

Log message for revision 115438:
  Made sure to exclude a number of meta ZCML handlers from ``zope.*`` packages where Zope2 provides its own implementations.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Zope2/App/configure.zcml
  A   Zope/trunk/src/Zope2/App/exclude.zcml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2010-08-04 13:47:06 UTC (rev 115437)
+++ Zope/trunk/doc/CHANGES.rst	2010-08-04 18:10:02 UTC (rev 115438)
@@ -11,6 +11,9 @@
 Bugs Fixed
 ++++++++++
 
+- Made sure to exclude a number of meta ZCML handlers from ``zope.*`` packages
+  where Zope2 provides its own implementations.
+
 - Fix support for non-public permission attributes in the
   browser:view directive so that attributes which are not included in
   allowed_interface or allowed_attributes but which have declarations from a

Modified: Zope/trunk/src/Zope2/App/configure.zcml
===================================================================
--- Zope/trunk/src/Zope2/App/configure.zcml	2010-08-04 13:47:06 UTC (rev 115437)
+++ Zope/trunk/src/Zope2/App/configure.zcml	2010-08-04 18:10:02 UTC (rev 115438)
@@ -1,6 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:five="http://namespaces.zope.org/five">
 
+  <include file="exclude.zcml" />
   <include file="meta.zcml" />
   <include package="AccessControl" file="permissions.zcml" />
 

Added: Zope/trunk/src/Zope2/App/exclude.zcml
===================================================================
--- Zope/trunk/src/Zope2/App/exclude.zcml	                        (rev 0)
+++ Zope/trunk/src/Zope2/App/exclude.zcml	2010-08-04 18:10:02 UTC (rev 115438)
@@ -0,0 +1,9 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <exclude package="zope.browserpage" file="meta.zcml" />
+  <exclude package="zope.browsermenu" file="meta.zcml" />
+  <exclude package="zope.browserresource" file="meta.zcml" />
+  <exclude package="zope.publisher" file="meta.zcml" />
+  <exclude package="zope.viewlet" file="meta.zcml" />
+
+</configure>


Property changes on: Zope/trunk/src/Zope2/App/exclude.zcml
___________________________________________________________________
Added: svn:eol-style
   + native