[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/meta.zcml Get rid of a lot of custom registration code; we can now reuse the

[Philipp von Weitershausen]

Log message for revision 67159:
  Get rid of a lot of custom registration code; we can now reuse the
  very modular meta.zcml files from the various zope.* packages.
  

Changed:
  U   Products.Five/branches/philikon-local-components/meta.zcml

-=-
Modified: Products.Five/branches/philikon-local-components/meta.zcml
===================================================================
--- Products.Five/branches/philikon-local-components/meta.zcml	2006-04-19 17:43:42 UTC (rev 67158)
+++ Products.Five/branches/philikon-local-components/meta.zcml	2006-04-19 17:44:19 UTC (rev 67159)
@@ -2,6 +2,13 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:meta="http://namespaces.zope.org/meta">
 
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
+  <include package="zope.i18n" file="meta.zcml" />
+
+  <!-- BBB 2006/02/24, to be removed after 12 months -->
+  <include package="zope.modulealias" file="meta.zcml" />
+
   <include package=".site" file="meta.zcml" />
   <include package=".browser" file="meta.zcml" />
   <include package=".form" file="meta.zcml" />
@@ -9,42 +16,13 @@
   <meta:directives namespace="http://namespaces.zope.org/zope">
 
     <meta:directive
-        name="permission"
-        schema="zope.security.zcml.IPermissionDirective"
-        handler="zope.security.zcml.permission"
-        />
-
-    <meta:directive
-        name="interface"
-        schema="zope.component.zcml.IInterfaceDirective"
-        handler="zope.component.zcml.interface"
-        />
-
-    <meta:directive
         name="view"
         schema="zope.app.component.metadirectives.IViewDirective"
         handler="zope.app.component.metaconfigure.view"
         />
 
+    <!-- BBB 2006/02/24, to be removed after 12 months -->
     <meta:directive
-        name="adapter"
-        schema="zope.component.zcml.IAdapterDirective"
-        handler="zope.component.zcml.adapter"
-        />
-
-    <meta:directive
-        name="subscriber"
-        schema="zope.component.zcml.ISubscriberDirective"
-        handler="zope.component.zcml.subscriber"
-        />
-
-    <meta:directive
-        name="utility"
-        schema="zope.component.zcml.IUtilityDirective"
-        handler="zope.component.zcml.utility"
-        />
-
-    <meta:directive
         name="factory"
         schema="zope.app.component.metadirectives.IFactoryDirective"
         handler="zope.app.component.metaconfigure.factory"
@@ -97,6 +75,7 @@
 
     </meta:complexDirective>
 
+    <!-- BBB 2006/02/24, to be removed after 12 months -->
     <meta:directive
         name="vocabulary"
         schema="zope.app.schema.metadirectives.IVocabularyDirective"
@@ -183,17 +162,4 @@
 
   </meta:directives>
 
-  <meta:directive
-      name="redefinePermission"
-      namespace="http://namespaces.zope.org/meta"
-      schema="zope.security.zcml.IRedefinePermission"
-      handler="zope.security.zcml.redefinePermission"
-      />
-
-  <!-- load the zope:modulealias directive -->
-  <include package="zope.modulealias" file="meta.zcml" />
-
-  <!-- load the i18n:registerTranslations directive -->
-  <include package="zope.i18n" file="meta.zcml" />
-
 </configure>