[Zope3-checkins] CVS: Zope3 - ftesting.zcml:1.13 site.zcml:1.24

[Sidnei da Silva]

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

Modified Files:
	ftesting.zcml site.zcml 
Log Message:
Reindent some files. Move grants and role definitions to zope.products.securitypolicy, as suggested by SteveA.


=== Zope3/ftesting.zcml 1.12 => 1.13 ===
--- Zope3/ftesting.zcml:1.12	Wed Jan 14 17:55:15 2004
+++ Zope3/ftesting.zcml	Thu Jan 15 11:16:21 2004
@@ -1,27 +1,11 @@
-<configure
-    xmlns="http://namespaces.zope.org/zope"
-    i18n_domain="zope"
-    >
+<configure xmlns="http://namespaces.zope.org/zope"
+           i18n_domain="zope"
+           >
 
   <!-- This file is the equivalent of site.zcml used for functional testing -->
 
   <include package="zope.app" />
-
   <include file="products.zcml" />
-  <role id="zope.Manager" title="Site Manager" />
-  <role id="zope.Member" title="Site Member" />
-
-  <!-- Remove the following directive if you don't want public access -->
-  <grant permission="zope.View" role="zope.Anonymous" />
-
-  <grant permission="zope.View"              role="zope.Manager" />
-  <grant permission="zope.ManageContent"     role="zope.Manager" />
-  <grant permission="zope.Security"          role="zope.Manager" />
-  <grant permission="zope.ManageCode"        role="zope.Manager" />
-  <grant permission="zope.ManageServices"    role="zope.Manager" />
-  <grant permission="zope.ManageApplication" role="zope.Manager" />
-  <grant permission="zope.ManageBindings"    role="zope.Manager" />
-
 
   <!-- Principals -->
 


=== Zope3/site.zcml 1.23 => 1.24 ===
--- Zope3/site.zcml:1.23	Wed Jan 14 17:55:15 2004
+++ Zope3/site.zcml	Thu Jan 15 11:16:21 2004
@@ -1,43 +1,13 @@
-<configure xmlns='http://namespaces.zope.org/zope'
-           xmlns:browser='http://namespaces.zope.org/browser'
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:browser="http://namespaces.zope.org/browser"
            >
 
-<include package="zope.app" />
+  <include package="zope.app" />
+  <include file="products.zcml" />
 
-<include file="products.zcml" />
-<configure i18n_domain="zope">
-  <role id="zope.Manager" title="Site Manager" />
-  <role id="zope.Member" title="Site Member" />
-</configure>
+  <!-- Provide local overrides of standard configurations-->
+  <includeOverrides file="overrides.zcml" />
 
-<!-- Remove the following directive if you don't want public access -->
-<grant permission="zope.View" role="zope.Anonymous" />
-
-<grant permission="zope.View"              role="zope.Manager" />
-<grant permission="zope.ManageContent"     role="zope.Manager" />
-<grant permission="zope.Security"          role="zope.Manager" />
-<grant permission="zope.ManageCode"        role="zope.Manager" />
-<grant permission="zope.ManageServices"    role="zope.Manager" />
-<grant permission="zope.ManageApplication" role="zope.Manager" />
-<grant permission="zope.ManageBindings"    role="zope.Manager" />
-<grant permission="zope.SendMail"          role="zope.Manager" />
-
-<!-- Grant Manager all necessary Permissions for using Workflows -->
-<grant 
-    permission="zope.workflow.ManageProcessDefinitions" 
-    role="zope.Manager" />
-<grant 
-    permission="zope.workflow.CreateProcessInstances"
-    role="zope.Manager" />
-<grant 
-    permission="zope.workflow.UseProcessInstances" 
-    role="zope.Manager" />
-
-
-<!-- Provide local overrides of standard configurations-->
-
-<includeOverrides file="overrides.zcml" />
-
-<include file="principals.zcml" />
+  <include file="principals.zcml" />
 
 </configure>