[Zope3-checkins] CVS: Zope3 - ftesting.zcml:1.4.6.1 site.zcml:1.21.6.1

[Jim Fulton]

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

Modified Files:
      Tag: user-preferences-branch
	ftesting.zcml site.zcml 
Log Message:
Checking in some work (on a branch) that Staphan and I did toward
implementing user preferences.  More work is needed to finish this up.
Detailed log messages need to be provided in the merge.


=== Zope3/ftesting.zcml 1.4 => 1.4.6.1 ===
--- Zope3/ftesting.zcml:1.4	Sun Aug  3 15:08:09 2003
+++ Zope3/ftesting.zcml	Tue Sep  2 17:40:35 2003
@@ -13,13 +13,14 @@
   <!-- Remove the following directive if you don't want public access -->
   <grant permission="zope.View" role="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.ManageCode"        role="Manager" />
+  <grant permission="zope.ManageContent"     role="Manager" />
+  <grant permission="zope.ManagePrincipals"  role="Manager" />
+  <grant permission="zope.ManageServices"    role="Manager" />
+  <grant permission="zope.Security"          role="Manager" />
+  <grant permission="zope.View"              role="Manager" />
 
   <include file="products.zcml" />
 


=== Zope3/site.zcml 1.21 => 1.21.6.1 ===
--- Zope3/site.zcml:1.21	Mon Aug  4 07:11:16 2003
+++ Zope3/site.zcml	Tue Sep  2 17:40:35 2003
@@ -12,14 +12,15 @@
 <!-- Remove the following directive if you don't want public access -->
 <grant permission="zope.View" role="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.ManageCode"        role="Manager" />
+<grant permission="zope.ManageContent"     role="Manager" />
+<grant permission="zope.ManagePrincipals"  role="Manager" />
+<grant permission="zope.ManageServices"    role="Manager" />
+<grant permission="zope.Security"          role="Manager" />
+<grant permission="zope.SendMail"          role="Manager" />
+<grant permission="zope.View"              role="Manager" />
 
 <!-- Grant Manager all necessary Permissions for using Workflows -->
 <grant permission="zope.workflow.ManageProcessDefinitions" role="Manager" />