[Zope-Checkins] SVN: Zope/trunk/src/ Move general meta/configure statements into files in Zope2/App

[Hanno Schlichting]

Log message for revision 110341:
  Move general meta/configure statements into files in Zope2/App
  

Changed:
  U   Zope/trunk/src/Products/Five/configure.zcml
  D   Zope/trunk/src/Products/Five/deprecated.zcml
  D   Zope/trunk/src/Products/Five/event.zcml
  D   Zope/trunk/src/Products/Five/i18n.zcml
  U   Zope/trunk/src/Products/Five/meta.zcml
  U   Zope/trunk/src/Products/Five/permissions.zcml
  D   Zope/trunk/src/Products/Five/publisher.zcml
  A   Zope/trunk/src/Zope2/App/configure.zcml
  A   Zope/trunk/src/Zope2/App/meta.zcml
  U   Zope/trunk/src/Zope2/utilities/skel/etc/site.zcml

-=-
Modified: Zope/trunk/src/Products/Five/configure.zcml
===================================================================
--- Zope/trunk/src/Products/Five/configure.zcml	2010-03-30 21:31:53 UTC (rev 110340)
+++ Zope/trunk/src/Products/Five/configure.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -1,13 +1,11 @@
 <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" />

Deleted: Zope/trunk/src/Products/Five/deprecated.zcml
===================================================================
--- Zope/trunk/src/Products/Five/deprecated.zcml	2010-03-30 21:31:53 UTC (rev 110340)
+++ Zope/trunk/src/Products/Five/deprecated.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -1,5 +0,0 @@
-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="OFS" file="deprecated.zcml"/>
-
-</configure>

Deleted: Zope/trunk/src/Products/Five/event.zcml
===================================================================
--- Zope/trunk/src/Products/Five/event.zcml	2010-03-30 21:31:53 UTC (rev 110340)
+++ Zope/trunk/src/Products/Five/event.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -1,5 +0,0 @@
-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="OFS" file="event.zcml"/>
-
-</configure>

Deleted: Zope/trunk/src/Products/Five/i18n.zcml
===================================================================
--- Zope/trunk/src/Products/Five/i18n.zcml	2010-03-30 21:31:53 UTC (rev 110340)
+++ Zope/trunk/src/Products/Five/i18n.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -1,6 +0,0 @@
-<configure
-    xmlns="http://namespaces.zope.org/zope">
-
-  <include package="ZPublisher" file="i18n.zcml" />
-
-</configure>

Modified: Zope/trunk/src/Products/Five/meta.zcml
===================================================================
--- Zope/trunk/src/Products/Five/meta.zcml	2010-03-30 21:31:53 UTC (rev 110340)
+++ Zope/trunk/src/Products/Five/meta.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -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 -->

Modified: Zope/trunk/src/Products/Five/permissions.zcml
===================================================================
--- Zope/trunk/src/Products/Five/permissions.zcml	2010-03-30 21:31:53 UTC (rev 110340)
+++ Zope/trunk/src/Products/Five/permissions.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -1,8 +1,6 @@
 <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"

Deleted: Zope/trunk/src/Products/Five/publisher.zcml
===================================================================
--- Zope/trunk/src/Products/Five/publisher.zcml	2010-03-30 21:31:53 UTC (rev 110340)
+++ Zope/trunk/src/Products/Five/publisher.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -1,5 +0,0 @@
-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <include package="ZPublisher" file="publisher.zcml"/>
-
-</configure>

Copied: Zope/trunk/src/Zope2/App/configure.zcml (from rev 110303, Zope/trunk/src/Products/Five/configure.zcml)
===================================================================
--- Zope/trunk/src/Zope2/App/configure.zcml	                        (rev 0)
+++ Zope/trunk/src/Zope2/App/configure.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -0,0 +1,11 @@
+<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>

Copied: Zope/trunk/src/Zope2/App/meta.zcml (from rev 110303, Zope/trunk/src/Products/Five/meta.zcml)
===================================================================
--- Zope/trunk/src/Zope2/App/meta.zcml	                        (rev 0)
+++ Zope/trunk/src/Zope2/App/meta.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -0,0 +1,20 @@
+<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>

Modified: Zope/trunk/src/Zope2/utilities/skel/etc/site.zcml
===================================================================
--- Zope/trunk/src/Zope2/utilities/skel/etc/site.zcml	2010-03-30 21:31:53 UTC (rev 110340)
+++ Zope/trunk/src/Zope2/utilities/skel/etc/site.zcml	2010-03-30 21:56:09 UTC (rev 110341)
@@ -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" />