[Zope3-checkins] CVS: Zope3/src/zope/app/security/registries - configure.zcml:1.5 meta.zcml:1.5 metaconfigure.py:1.6 metadirectives.py:1.6 roleregistry.py:NONE

[Chris McDonough]

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

Modified Files:
	configure.zcml meta.zcml metaconfigure.py metadirectives.py 
Removed Files:
	roleregistry.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/security/registries/configure.zcml 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/registries/configure.zcml:1.4	Sat Aug  2 16:05:39 2003
+++ Zope3/src/zope/app/security/registries/configure.zcml	Wed Jan 14 17:55:26 2004
@@ -3,14 +3,6 @@
    package="zope.app.security">
 
   <serviceType
-      id="Roles" 
-      interface="zope.app.interfaces.security.IRoleService" />
-
-  <service
-      serviceType="Roles" 
-      component=".registries.roleregistry.roleRegistry" />
-
-  <serviceType
       id="Permissions" 
       interface="zope.app.interfaces.security.IPermissionService" />
 
@@ -25,11 +17,6 @@
   <service
       serviceType="Authentication" 
       component=".registries.principalregistry.principalRegistry" />
-
-  <!-- protect Roles and Permissions -->
-  <content class=".registries.roleregistry.Role">
-    <allow interface="zope.app.interfaces.security.IRegisteredObject" />
-  </content>
 
   <content class=".registries.permissionregistry.Permission">
     <allow interface="zope.app.interfaces.security.IRegisteredObject" />


=== Zope3/src/zope/app/security/registries/meta.zcml 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/registries/meta.zcml:1.4	Sat Aug  2 16:05:39 2003
+++ Zope3/src/zope/app/security/registries/meta.zcml	Wed Jan 14 17:55:26 2004
@@ -10,12 +10,6 @@
 
   <meta:directive 
       namespace="http://namespaces.zope.org/zope"
-      name="role"
-      schema=".metadirectives.IDefineRoleDirective"
-      handler=".metaconfigure.defineRole" />
-
-  <meta:directive 
-      namespace="http://namespaces.zope.org/zope"
       name="principal" 
       schema=".metadirectives.IDefinePrincipalDirective"
       handler=".metaconfigure.principal" />


=== Zope3/src/zope/app/security/registries/metaconfigure.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/security/registries/metaconfigure.py:1.5	Sat Aug  2 16:05:39 2003
+++ Zope3/src/zope/app/security/registries/metaconfigure.py	Wed Jan 14 17:55:26 2004
@@ -17,7 +17,6 @@
 """
 from zope.app.security.registries.permissionregistry import \
      permissionRegistry as perm_reg
-from zope.app.security.registries.roleregistry import roleRegistry as role_reg
 from zope.app.security.registries.principalregistry import principalRegistry
 
 def definePermission(_context, id, title, description=''):
@@ -25,12 +24,6 @@
         discriminator = ('definePermission', id),
         callable = perm_reg.definePermission,
         args = (id, title, description) )
-
-def defineRole(_context, id, title, description=''):
-    _context.action(
-            discriminator = ('defineRole', id),
-            callable = role_reg.defineRole,
-            args = (id, title, description) )
 
 def principal(_context, id, title, login, password, description=''):
     _context.action(


=== Zope3/src/zope/app/security/registries/metadirectives.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/security/registries/metadirectives.py:1.5	Sun Dec 14 03:25:34 2003
+++ Zope3/src/zope/app/security/registries/metadirectives.py	Wed Jan 14 17:55:26 2004
@@ -33,16 +33,13 @@
         required=True)
 
     description = MessageID(
-        title=u"Title",
+        title=u"Description",
         description=u"Provides a description for the object.",
         required=False)
 
 
 class IDefinePermissionDirective(IBaseDefineDirective):
     """Define a new permission."""
-
-class IDefineRoleDirective(IBaseDefineDirective):
-    """Define a new role."""
 
 class IBasePrincipalDirective(Interface):
     

=== Removed File Zope3/src/zope/app/security/registries/roleregistry.py ===