[Zope3-checkins] SVN: Zope3/trunk/ enable overriding zcml slugs that look like their *-meta and

[Philipp von Weitershausen]

Log message for revision 37396:
  enable overriding zcml slugs that look like their *-meta and
  *-configure.zcml equivalents, as discussed on IRC during the
  pre-EuroPython sprint
  

Changed:
  U   Zope3/trunk/overrides_ftesting.zcml.in
  U   Zope3/trunk/site.zcml
  U   Zope3/trunk/zopeskel/etc/overrides_ftesting.zcml
  U   Zope3/trunk/zopeskel/etc/site.zcml

-=-
Modified: Zope3/trunk/overrides_ftesting.zcml.in
===================================================================
--- Zope3/trunk/overrides_ftesting.zcml.in	2005-07-23 23:24:37 UTC (rev 37395)
+++ Zope3/trunk/overrides_ftesting.zcml.in	2005-07-23 23:30:20 UTC (rev 37396)
@@ -3,10 +3,12 @@
   <!-- Here you can include overrides directives for-->
   <!-- functional testing, may your products need so. -->
 
-  <!-- For example, you may want to include overrides.zcml on -->
-  <!-- functional tests to make sure that the system will-->
-  <!-- behave as expected in the presence of overrides.-->
+  <!-- For example, you may want to include site or package overrides
+       on functional tests to make sure that the system will behave as
+       expected in the presence of overrides. -->
+
   <!-- Example:
+       <includeOverrides files="package-includes/*-overrides.zcml" />
        <includeOverrides file="overrides.zcml" />
   -->
 

Modified: Zope3/trunk/site.zcml
===================================================================
--- Zope3/trunk/site.zcml	2005-07-23 23:24:37 UTC (rev 37395)
+++ Zope3/trunk/site.zcml	2005-07-23 23:30:20 UTC (rev 37396)
@@ -7,6 +7,7 @@
   <include files="package-includes/*-configure.zcml" />
 
   <!-- Provide local overrides of standard configurations-->
+  <includeOverrides files="package-includes/*-overrides.zcml" />
   <includeOverrides file="overrides.zcml" />
 
   <include file="securitypolicy.zcml" />

Modified: Zope3/trunk/zopeskel/etc/overrides_ftesting.zcml
===================================================================
--- Zope3/trunk/zopeskel/etc/overrides_ftesting.zcml	2005-07-23 23:24:37 UTC (rev 37395)
+++ Zope3/trunk/zopeskel/etc/overrides_ftesting.zcml	2005-07-23 23:30:20 UTC (rev 37396)
@@ -3,10 +3,12 @@
   <!-- Here you can include overrides directives for-->
   <!-- functional testing, may your products need so. -->
 
-  <!-- For example, you may want to include overrides.zcml on -->
-  <!-- functional tests to make sure that the system will-->
-  <!-- behave as expected in the presence of overrides.-->
+  <!-- For example, you may want to include site or package overrides
+       on functional tests to make sure that the system will behave as
+       expected in the presence of overrides. -->
+
   <!-- Example:
+       <includeOverrides files="package-includes/*-overrides.zcml" />
        <includeOverrides file="overrides.zcml" />
   -->
 

Modified: Zope3/trunk/zopeskel/etc/site.zcml
===================================================================
--- Zope3/trunk/zopeskel/etc/site.zcml	2005-07-23 23:24:37 UTC (rev 37395)
+++ Zope3/trunk/zopeskel/etc/site.zcml	2005-07-23 23:30:20 UTC (rev 37396)
@@ -7,6 +7,7 @@
   <include files="package-includes/*-configure.zcml" />
 
   <!-- Provide local overrides of standard configurations-->
+  <includeOverrides files="package-includes/*-overrides.zcml" />
   <includeOverrides file="overrides.zcml" />
 
   <include file="securitypolicy.zcml" />