[Zope3-checkins] CVS: Zope3/src/zope/app/services - auth.py:1.22 auth.zcml:1.3 configure.zcml:1.63 servicenames.py:1.13 role.py:NONE

[Chris McDonough]

Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv5558/src/zope/app/services

Modified Files:
	auth.py auth.zcml configure.zcml servicenames.py 
Removed Files:
	role.py 
Log Message:
Merge security policy refactoring:

 - Moved all role- and grant-related functionality into
   zope.products.securitypolicy (and out of zope.app.security.grant).
   The zope.products.securitypolicy implementation is exactly
   the same as the old implementation; no changes were made
   to the actual mechanics of role-permission or principal-permission
   grants.  The only real difference is that all functionality
   that is the purview of what we want a security policy to have
   control of is now in that one place.

 - Created new modulealias directive which can be used to provide
   aliases to older modules (to not break existing ZODBs when
   module locations change).

 - Added minor feature: "make debug" launches a debug session in the
   spirit of Zope 2's "zopectl debug".
   


=== Zope3/src/zope/app/services/auth.py 1.21 => 1.22 ===
--- Zope3/src/zope/app/services/auth.py:1.21	Tue Jan 13 14:05:12 2004
+++ Zope3/src/zope/app/services/auth.py	Wed Jan 14 17:55:28 2004
@@ -65,7 +65,7 @@
     def authenticate(self, request):
         'See IAuthenticationService'
         import warnings
-        warnings.warn('The Simple Authentication Service is deprecated and'
+        warnings.warn('The Simple Authentication Service is deprecated and '
                       'will be removed in a future revision of Zope 3',
                       DeprecationWarning)
         a = queryAdapter(request, ILoginPassword, None)


=== Zope3/src/zope/app/services/auth.zcml 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/auth.zcml:1.2	Fri Aug 22 16:02:20 2003
+++ Zope3/src/zope/app/services/auth.zcml	Wed Jan 14 17:55:28 2004
@@ -1,7 +1,4 @@
-<configure
-    xmlns='http://namespaces.zope.org/zope'
-    xmlns:fssync='http://namespaces.zope.org/fssync'
-    >
+<configure xmlns='http://namespaces.zope.org/zope'>
 
 <!-- Note that the simmple auth ios only being kept around
      for some backward comptability. We will eventually remove it.
@@ -9,29 +6,10 @@
      XXX We really need to conversion scheme.
   -->
 
-  <content class="zope.app.services.auth.AuthenticationService">
-
-    <require
-        permission="zope.View"
-        interface="zope.app.interfaces.security.IAuthenticationService" />
-    <require
-        permission="zope.View"
-        attributes="getAllUsers" />
-
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.interfaces.container.IContainer" />
-
-    </content>
-
   <content class="zope.app.services.auth.User">
-    <factory id="User" permission="zope.ManageServices" />
       <require
           permission="zope.View"
           interface="zope.app.interfaces.services.auth.IReadUser" />
-      <require
-          permission="zope.ManageContent"
-          interface="zope.app.interfaces.services.auth.IWriteUser" />
       <implements
           interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
     </content>


=== Zope3/src/zope/app/services/configure.zcml 1.62 => 1.63 ===
--- Zope3/src/zope/app/services/configure.zcml:1.62	Fri Dec 19 11:53:18 2003
+++ Zope3/src/zope/app/services/configure.zcml	Wed Jan 14 17:55:28 2004
@@ -63,30 +63,6 @@
 <!-- Menu Service -->
 <include file="menu.zcml"/>
 
-<!-- Role Templates -->
-
-<content class="zope.app.services.role.RoleService">
-  <factory
-      id="RoleService"
-      permission="zope.ManageServices"
-      />
-  <require
-      permission="zope.Security"
-      interface="zope.app.interfaces.security.IRoleService"
-      />
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.container.IContainer"
-      />
-</content>
-
-<content class="zope.app.services.role.Role">
-  <factory />
-  <require
-      permission="zope.Security"
-      interface="zope.app.interfaces.security.IRole"
-      />
-</content>
 
 <!-- Session Templates -->
 


=== Zope3/src/zope/app/services/servicenames.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/services/servicenames.py:1.12	Mon Dec 29 11:41:03 2003
+++ Zope3/src/zope/app/services/servicenames.py	Wed Jan 14 17:55:28 2004
@@ -29,6 +29,5 @@
 HubIds = 'HubIds'
 Permissions = 'Permissions'
 PrincipalAnnotation = 'PrincipalAnnotation'
-Roles = 'Roles'
 Translation = 'Translation'
 Workflows = 'Workflows'

=== Removed File Zope3/src/zope/app/services/role.py ===