Move general meta/configure statements into files in Zope2/App

src/Products/Five/configure.zcml

 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:five="http://namespaces.zope.org/five">
 
+  <include package="Zope2.App" file="configure.zcml" />
+
   <include file="meta.zcml" />
   <include file="permissions.zcml" />
 
-  <include package="zope.traversing" />
-  <include package="OFS "/>
-  <include package="ZPublisher" />
-
   <include package=".component" />
   <include package=".browser" />
   <include package=".skin" />

src/Products/Five/deprecated.zcml

-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="OFS" file="deprecated.zcml"/>
-
-</configure>

src/Products/Five/event.zcml

-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="OFS" file="event.zcml"/>
-
-</configure>

src/Products/Five/i18n.zcml

-<configure
-    xmlns="http://namespaces.zope.org/zope">
-
-  <include package="ZPublisher" file="i18n.zcml" />
-
-</configure>

src/Products/Five/meta.zcml

@@ -2,23 +2,9 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:meta="http://namespaces.zope.org/meta">
 
-  <include package="AccessControl" file="meta.zcml" />
-  <include package="OFS" file="meta.zcml" />
-  <include package="zope.component" file="meta.zcml" />
-  <include package="zope.i18n" file="meta.zcml" />
-
+  <include package="Zope2.App" file="meta.zcml" />
   <include package=".browser" file="meta.zcml" />
 
-  <meta:directives namespace="http://namespaces.zope.org/zope">
-
-    <meta:directive
-        name="view"
-        schema="zope.component.zcml.IViewDirective"
-        handler="zope.component.zcml.view"
-        />
-
-  </meta:directives>
-
   <meta:directives namespace="http://namespaces.zope.org/five">
 
     <!-- specific to Five -->

src/Products/Five/permissions.zcml

 <configure xmlns="http://namespaces.zope.org/zope"
            i18n_domain="Five">
 
-  <include package="AccessControl" file="permissions.zcml" />
-
   <permission
       id="five.ManageSite"
       title="Manage Five local sites"

src/Products/Five/publisher.zcml

-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="ZPublisher" file="publisher.zcml"/>
-
-</configure>

src/Zope2/App/configure.zcml

+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:five="http://namespaces.zope.org/five">
+
+  <include file="meta.zcml" />
+  <include package="AccessControl" file="permissions.zcml" />
+
+  <include package="zope.traversing" />
+  <include package="OFS "/>
+  <include package="ZPublisher" />
+
+</configure>

src/Zope2/App/meta.zcml

+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta">
+
+  <include package="AccessControl" file="meta.zcml" />
+  <include package="OFS" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.i18n" file="meta.zcml" />
+
+  <meta:directives namespace="http://namespaces.zope.org/zope">
+
+    <meta:directive
+        name="view"
+        schema="zope.component.zcml.IViewDirective"
+        handler="zope.component.zcml.view"
+        />
+
+  </meta:directives>
+
+</configure>

src/Zope2/utilities/skel/etc/site.zcml

@@ -3,10 +3,10 @@
     xmlns:meta="http://namespaces.zope.org/meta"
     xmlns:five="http://namespaces.zope.org/five">
 
+  <include package="Zope2.App" />
   <include package="Products.Five" />
   <meta:redefinePermission from="zope2.Public" to="zope.Public" />
 
-
   <!-- Load the meta -->
   <include files="package-includes/*-meta.zcml" />
   <five:loadProducts file="meta.zcml"/>
@@ -19,7 +19,6 @@
   <includeOverrides files="package-includes/*-overrides.zcml" />
   <five:loadProductsOverrides />
 
-
   <securityPolicy
       component="AccessControl.security.SecurityPolicy" />