[Zope3-checkins] CVS: Zope3 - overrides.zcml.in:1.1 site.zcml:1.21

[Jim Fulton]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv14557

Modified Files:
	site.zcml 
Added Files:
	overrides.zcml.in 
Log Message:
Added a standard overrides.zcml(.in) file for including site-local
overrides of standard directives.  If you want to override something
in the standard configuration, but or include your overrides in
overrides.zcml.

Put a configure around the role definitions in site.zcml so that only
that part of the file gets a zope domain.


=== Added File Zope3/overrides.zcml.in ===
<configure xmlns='http://namespaces.zope.org/zope'
           xmlns:browser='http://namespaces.zope.org/browser'
           >

<!-- Provide local overrides of standard configurations-->

<!-- For example, define a different default skin --> 
<!-- <browser:skin name="" layers="default" /> -->
</configure>


=== Zope3/site.zcml 1.20 => 1.21 ===
--- Zope3/site.zcml:1.20	Sun Aug  3 15:08:09 2003
+++ Zope3/site.zcml	Mon Aug  4 07:11:16 2003
@@ -1,13 +1,13 @@
-<configure
-    xmlns='http://namespaces.zope.org/zope'
-    xmlns:browser='http://namespaces.zope.org/browser'
-    i18n_domain='zope'
-    >
+<configure xmlns='http://namespaces.zope.org/zope'
+           xmlns:browser='http://namespaces.zope.org/browser'
+           >
 
 <include package="zope.app" />
 
-<role id="Manager" title="Site Manager" />
-<role id="Member" title="Site Member" />
+<configure i18n_domain="zope">
+  <role id="Manager" title="Site Manager" />
+  <role id="Member" title="Site Member" />
+</configure>
 
 <!-- Remove the following directive if you don't want public access -->
 <grant permission="zope.View" role="Anonymous" />
@@ -28,10 +28,10 @@
 
 <include file="products.zcml" />
 
-<include file="principals.zcml" />
+<!-- Provide local overrides of standard configurations-->
+
+<includeOverrides file="overrides.zcml" />
 
-<!--
-<browser:skin name="" layers="rotterdam default" />
--->
+<include file="principals.zcml" />
 
 </configure>