[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Security - ISecurityContext.py:1.1.2.2 metaConfigure.py:1.1.2.19 publicClass.py:1.1.2.3

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	ISecurityContext.py metaConfigure.py publicClass.py 
Log Message:
updated to use non-generic registry names

=== Zope3/lib/python/Zope/App/Security/ISecurityContext.py 1.1.2.1 => 1.1.2.2 ===
              )
 
-    Attribute( 'user'
+    Attribute( 'principle'
              , 'The AUTHENTICATED_USER for the request.'
              )
 


=== Zope3/lib/python/Zope/App/Security/metaConfigure.py 1.1.2.18 => 1.1.2.19 ===
 from protectClass import protectClass
 from publicClass import publicClass
-from PermissionRegistry import registry as perm_reg
-from RoleRegistry import registry as role_reg
+from PermissionRegistry import permissionRegistry as perm_reg
+from RoleRegistry import roleRegistry as role_reg
 from SecurityManager import setSecurityPolicy
-from PrincipalRegistry import globalRegistry
-from RolePermissionManager import manager as role_perm_mgr
-from PrincipalPermissionManager import manager as principal_perm_mgr
-from PrincipalRoleManager import manager as principal_role_mgr
+from PrincipalRegistry import principalRegistry
+from RolePermissionManager import rolePermissionManager as role_perm_mgr
+from PrincipalPermissionManager import principalPermissionManager as principal_perm_mgr
+from PrincipalRoleManager import principalRoleManager as principal_role_mgr
 
 def setSecurityPolicy_directive( name ):
     """
@@ -52,10 +52,10 @@
              setSecurityPolicy_directive)
 
     register(namespace('security'), 'principal',
-             globalRegistry.definePrincipal)
+             principalRegistry.definePrincipal)
 
     register(namespace('security'), 'defaultPrincipal',
-             globalRegistry.defineDefaultPrincipal)
+             principalRegistry.defineDefaultPrincipal)
 
     register(namespace('security'), 'grantPermissionToRole',
              role_perm_mgr.grantPermissionToRole)
@@ -65,3 +65,5 @@
 
     register(namespace('security'), 'assignRoleToPrincipal',
              principal_role_mgr.assignRoleToPrincipal)
+
+


=== Zope3/lib/python/Zope/App/Security/publicClass.py 1.1.2.2 => 1.1.2.3 ===
 from Interface.Method import Method
 
-from PermissionRegistry import PublicPermission
+PublicPermission = 'Zope.Public'
 
 from protectClass import protectClass