[Checkins] SVN: Zope/branches/Zope211-3.4-integration/lib/python/Products/ fixes for Zope 2.11 integration

[Andreas Jung]

Log message for revision 76199:
  fixes for Zope 2.11 integration
  

Changed:
  U   Zope/branches/Zope211-3.4-integration/lib/python/Products/Five/event.zcml
  U   Zope/branches/Zope211-3.4-integration/lib/python/Products/Five/meta.zcml
  U   Zope/branches/Zope211-3.4-integration/lib/python/Products/PageTemplates/www/ptEdit.zpt

-=-
Modified: Zope/branches/Zope211-3.4-integration/lib/python/Products/Five/event.zcml
===================================================================
--- Zope/branches/Zope211-3.4-integration/lib/python/Products/Five/event.zcml	2007-06-03 10:27:43 UTC (rev 76198)
+++ Zope/branches/Zope211-3.4-integration/lib/python/Products/Five/event.zcml	2007-06-03 10:49:54 UTC (rev 76199)
@@ -1,7 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <!-- Enable object event dispatcher -->
-  <include package="zope.app.event" />
+  <include package="zope.component" />
 
   <!-- Adapter giving sublocations for ObjectManagers, used
        by dispatchToSublocations -->

Modified: Zope/branches/Zope211-3.4-integration/lib/python/Products/Five/meta.zcml
===================================================================
--- Zope/branches/Zope211-3.4-integration/lib/python/Products/Five/meta.zcml	2007-06-03 10:27:43 UTC (rev 76198)
+++ Zope/branches/Zope211-3.4-integration/lib/python/Products/Five/meta.zcml	2007-06-03 10:49:54 UTC (rev 76199)
@@ -75,21 +75,7 @@
 
     </meta:complexDirective>
 
-    <!-- BBB 2006/02/24, to be removed after 12 months -->
     <meta:directive
-        name="vocabulary"
-        schema="zope.app.schema.metadirectives.IVocabularyDirective"
-        handler="zope.app.schema.metaconfigure.vocabulary"
-        />
-
-    <!-- BBB 2006/02/24, to be removed after 12 months -->
-    <meta:directive
-        name="defaultLayer"
-        schema="zope.app.component.metadirectives.IDefaultLayerDirective"
-        handler="zope.app.component.metaconfigure.defaultLayer"
-        />
-
-    <meta:directive
         name="securityPolicy"
         schema="zope.security.zcml.ISecurityPolicyDirective"
         handler="zope.security.zcml.securityPolicy"

Modified: Zope/branches/Zope211-3.4-integration/lib/python/Products/PageTemplates/www/ptEdit.zpt
===================================================================
--- Zope/branches/Zope211-3.4-integration/lib/python/Products/PageTemplates/www/ptEdit.zpt	2007-06-03 10:27:43 UTC (rev 76198)
+++ Zope/branches/Zope211-3.4-integration/lib/python/Products/PageTemplates/www/ptEdit.zpt	2007-06-03 10:49:54 UTC (rev 76199)
@@ -51,7 +51,7 @@
 <pre tal:content="python:'\n'.join(errors)">errors</pre>
     </td>
   </tr>
-
+<!--
   <tr tal:define="warnings context/pt_warnings" tal:condition="warnings">
     <td align="left" valign="middle" class="form-label">Warnings</td>
     <td align="left" valign="middle" style="background-color: #FFEEDD"
@@ -59,7 +59,7 @@
 <pre tal:content="python:'\n'.join(warnings)">errors</pre>
     </td>
   </tr>
-
+-->
   <tr>
     <td align="left" valign="top" colspan="4"
         tal:define="width request/dtpref_cols | string:100%;