[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Security - configure.zcml:1.3.6.1

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Security
In directory cvs.zope.org:/tmp/cvs-serv29256/lib/python/Zope/App/Security

Modified Files:
      Tag: Zope3-Bangalore-TTW-Branch
	configure.zcml 
Log Message:
Earlier today I fixed a bug in configuration conflict
checking. Unfortunately, I forgot to try running Zope after that
change. It turns out that there were a number of configuration errors
that were revealed by the fix and Zope would not start as a result.

This checkin fixes those configuration errors.


=== Zope3/lib/python/Zope/App/Security/configure.zcml 1.3 => 1.3.6.1 ===
--- Zope3/lib/python/Zope/App/Security/configure.zcml:1.3	Thu Jun 20 16:00:27 2002
+++ Zope3/lib/python/Zope/App/Security/configure.zcml	Mon Oct 21 09:47:23 2002
@@ -4,6 +4,45 @@
    >
 
   <include package=".Registries" />
+
+  <!-- Standard Permissions -->
+
+  <permission id="Zope.View"
+                       title="View"
+                       />
+
+  <permission id="Zope.Security"
+                       title="Change security settings"
+                       />
+
+  <permission id="Zope.ManageContent" 
+                       title="Manage Content"
+                       />
+
+  <permission id="Zope.ManageBindings" 
+                       title="Manage Service Bindings"
+                       />
+
+  <permission id="Zope.ManageCode" 
+                       title="Manage Code"
+                       description="Manage executable code, including
+                                    Python, SQL, ZPT, etc."
+                        />
+
+  <permission id="Zope.ManageServices" 
+                       title="Manage Services"
+                        />
+
+  <!-- XXX What is this for? -->
+  <permission id="Zope.ManageApplication" 
+                       title="Manage Application"
+                       />
+
+  <!-- XXX What is this for? -->
+  <permission id="Zope.I18n" 
+                       title="Use Internationalization (?XXX)"
+                       />
+
   <include package=".Grants" />
 
   <securityPolicy 
@@ -12,10 +51,6 @@
   <adapter factory="Zope.App.Security.BasicAuthAdapter."
            provides="Zope.App.Security.ILoginPassword."
            for="Zope.Publisher.HTTP.IHTTPCredentials." />
-
-  <adapter factory="Zope.App.Security.BasicVFSAuthAdapter."
-           provides="Zope.App.Security.ILoginPassword."
-           for="Zope.Publisher.VFS.IVFSCredentials." />
 
   <adapter factory="Zope.App.Security.BasicVFSAuthAdapter."
            provides="Zope.App.Security.ILoginPassword."