[Zope3-checkins] CVS: Zope3 - ftesting.zcml:1.11.4.1 products.zcml.in:1.10.20.1 site.zcml:1.22.4.1

[Steve Alexander]

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

Modified Files:
      Tag: steveachrismcd-securitypolicy-branch
	ftesting.zcml products.zcml.in site.zcml 
Log Message:
Cleaned up the zcml. Still more clean-up to do.
The goal is to move out grants using roles, and perhaps other stuff,
to the securitypolicy add-on.


=== Zope3/ftesting.zcml 1.11 => 1.11.4.1 ===
--- Zope3/ftesting.zcml:1.11	Wed Dec 17 16:30:01 2003
+++ Zope3/ftesting.zcml	Wed Jan 14 15:15:12 2004
@@ -7,6 +7,7 @@
 
   <include package="zope.app" />
 
+  <include file="products.zcml" />
   <role id="zope.Manager" title="Site Manager" />
   <role id="zope.Member" title="Site Member" />
 
@@ -21,7 +22,6 @@
   <grant permission="zope.ManageApplication" role="zope.Manager" />
   <grant permission="zope.ManageBindings"    role="zope.Manager" />
 
-  <include file="products.zcml" />
 
   <!-- Principals -->
 


=== Zope3/products.zcml.in 1.10 => 1.10.20.1 ===
--- Zope3/products.zcml.in:1.10	Sun Aug  3 15:08:09 2003
+++ Zope3/products.zcml.in	Wed Jan 14 15:15:12 2004
@@ -2,6 +2,11 @@
 
 <!-- add include directives for products here -->
 
+<!-- The default security policy, including roles
+     stuff.
+  -->
+<include package="zope.products.securitypolicy"/>
+
 <!-- Example:
 <include package="zopeproducts.demo.jobboard" />
 -->


=== Zope3/site.zcml 1.22 => 1.22.4.1 ===
--- Zope3/site.zcml:1.22	Sun Dec 14 03:25:32 2003
+++ Zope3/site.zcml	Wed Jan 14 15:15:12 2004
@@ -4,6 +4,7 @@
 
 <include package="zope.app" />
 
+<include file="products.zcml" />
 <configure i18n_domain="zope">
   <role id="zope.Manager" title="Site Manager" />
   <role id="zope.Member" title="Site Member" />
@@ -32,7 +33,6 @@
     permission="zope.workflow.UseProcessInstances" 
     role="zope.Manager" />
 
-<include file="products.zcml" />
 
 <!-- Provide local overrides of standard configurations-->