[Zope3-checkins] CVS: Zope3 - ftesting.zcml:1.9 sample_principals.zcml:1.7 site.zcml:1.22

[Stephan Richter]

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

Modified Files:
	ftesting.zcml sample_principals.zcml site.zcml 
Log Message:
I remember that we were too lazy after ZCMLgeddon to require the principal
and role ids to be Id fields, since it required many places to change. 

While I was writing on the devel cookbook, I saw the metadirectives for the 
security again and could not resist fixing it.

All tests pass now and Zope seems to run fine as well. 


=== Zope3/ftesting.zcml 1.8 => 1.9 ===
--- Zope3/ftesting.zcml:1.8	Fri Dec 12 17:27:47 2003
+++ Zope3/ftesting.zcml	Sun Dec 14 03:25:32 2003
@@ -7,34 +7,34 @@
 
   <include package="zope.app" />
 
-  <role id="Manager" title="Site Manager" />
-  <role id="Member" title="Site Member" />
+  <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="Anonymous" />
+  <grant permission="zope.View" role="zope.Anonymous" />
 
-  <grant permission="zope.View"              role="Manager" />
-  <grant permission="zope.ManageContent"     role="Manager" />
-  <grant permission="zope.Security"          role="Manager" />
-  <grant permission="zope.ManageCode"        role="Manager" />
-  <grant permission="zope.ManageServices"    role="Manager" />
-  <grant permission="zope.ManageApplication" role="Manager" />
-  <grant permission="zope.ManageBindings"    role="Manager" />
+  <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" />
 
   <include file="products.zcml" />
 
   <!-- Principals -->
 
   <unauthenticatedPrincipal
-      id="anybody"
+      id="zope.anybody"
       title="Unauthenticated User" />
 
   <principal
-      id="mgr"
+      id="zope.mgr"
       title="Manager"
       login="mgr"
       password="mgrpw" />
 
-  <grant role="Manager" principal="mgr" />
+  <grant role="zope.Manager" principal="zope.mgr" />
 
 </configure>


=== Zope3/sample_principals.zcml 1.6 => 1.7 ===
--- Zope3/sample_principals.zcml:1.6	Sun Aug  3 15:08:09 2003
+++ Zope3/sample_principals.zcml	Sun Dec 14 03:25:32 2003
@@ -5,11 +5,12 @@
 <configure xmlns='http://namespaces.zope.org/zope'>
 
 
-<unauthenticatedPrincipal  id="anybody" 
-                           title="Unauthenticated User" />
+<unauthenticatedPrincipal 
+    id="zope.anybody" 
+    title="Unauthenticated User" />
 
 <principal
-    id="sample_manager"
+    id="zope.sample_manager"
     title="Sample Manager"
 
     login="gandalf"
@@ -18,7 +19,7 @@
     />
 
 <principal
-    id="sample_member"
+    id="zope.sample_member"
     title="Sample ordinary user (member)"
 
     login="frodo"
@@ -26,7 +27,7 @@
 
     />
 
-<grant role="Manager" principal="sample_manager" />
-<grant role="Member"  principal="sample_member" />
+<grant role="zope.Manager" principal="zope.sample_manager" />
+<grant role="zope.Member"  principal="zope.sample_member" />
 
 </configure>


=== Zope3/site.zcml 1.21 => 1.22 ===
--- Zope3/site.zcml:1.21	Mon Aug  4 07:11:16 2003
+++ Zope3/site.zcml	Sun Dec 14 03:25:32 2003
@@ -5,26 +5,32 @@
 <include package="zope.app" />
 
 <configure i18n_domain="zope">
-  <role id="Manager" title="Site Manager" />
-  <role id="Member" title="Site Member" />
+  <role id="zope.Manager" title="Site Manager" />
+  <role id="zope.Member" title="Site Member" />
 </configure>
 
 <!-- Remove the following directive if you don't want public access -->
-<grant permission="zope.View" role="Anonymous" />
+<grant permission="zope.View" role="zope.Anonymous" />
 
-<grant permission="zope.View"              role="Manager" />
-<grant permission="zope.ManageContent"     role="Manager" />
-<grant permission="zope.Security"          role="Manager" />
-<grant permission="zope.ManageCode"        role="Manager" />
-<grant permission="zope.ManageServices"    role="Manager" />
-<grant permission="zope.ManageApplication" role="Manager" />
-<grant permission="zope.ManageBindings"    role="Manager" />
-<grant permission="zope.SendMail"    role="Manager" />
+<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="Manager" />
-<grant permission="zope.workflow.CreateProcessInstances"  role="Manager" />
-<grant permission="zope.workflow.UseProcessInstances" role="Manager" />
+<grant 
+    permission="zope.workflow.ManageProcessDefinitions" 
+    role="zope.Manager" />
+<grant 
+    permission="zope.workflow.CreateProcessInstances"
+    role="zope.Manager" />
+<grant 
+    permission="zope.workflow.UseProcessInstances" 
+    role="zope.Manager" />
 
 <include file="products.zcml" />