Simplify site.zcml a tiny bit.

zopefoundation · Sep 8, 2016 · d13d464 · d13d464
1 parent 6d54e97
commit d13d464
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Zope2/App/configure.zcml b/src/Zope2/App/configure.zcml
@@ -1,5 +1,7 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:five="http://namespaces.zope.org/five">
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    xmlns:five="http://namespaces.zope.org/five">
 
   <include file="exclude.zcml" />
   <include file="meta.zcml" />
@@ -10,4 +12,10 @@
   <include package="ZPublisher" />
   <include package="five.globalrequest"/>
 
+  <include package="Products.Five" />
+  <meta:redefinePermission from="zope2.Public" to="zope.Public" />
+
+  <securityPolicy
+      component="AccessControl.security.SecurityPolicy" />
+
 </configure>
diff --git a/src/Zope2/utilities/skel/etc/site.zcml b/src/Zope2/utilities/skel/etc/site.zcml
@@ -4,8 +4,6 @@
     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" />
@@ -19,7 +17,4 @@
   <includeOverrides files="package-includes/*-overrides.zcml" />
   <five:loadProductsOverrides />
 
-  <securityPolicy
-      component="AccessControl.security.SecurityPolicy" />
-
 </configure>