Thu, 20 Jun 2002 11:55:34 -0400

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

Modified Files:
	TestModuleHookup.py testProtectClass.py testProtectSubClass.py 
	testSecurityDirectives.py testZSP.py 
Removed Files:
	PermissionService.py RolePermissionManager.py RoleService.py 
	testAnnotationPrincipalPermissionManager.py 
	testAnnotationPrincipalRoleManager.py 
	testAnnotationRolePermissionManager.py 
	testPermissionRegistry.py testPrincipalPermissionManager.py 
	testPrincipalPermissionView.py testPrincipalRegistry.py 
	testPrincipalRoleManager.py testPrincipalRoleView.py 
	testRolePermissionManager.py testRolePermissionView.py 
	testRoleRegistry.py 
Log Message:
implemented:

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/MergeSecurityIntoZopeNamespace

While I was at it, I couldn't resist implementing a variation of:

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/SecurityPackageReorg

which was a lot more work. 



=== Zope3/lib/python/Zope/App/Security/tests/TestModuleHookup.py 1.2 => 1.3 ===
 
 template_bracket = """<zopeConfigure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:security='http://namespaces.zope.org/security'>
+   xmlns="http://namespaces.zope.org/zope" >
    %s
 </zopeConfigure>"""


=== Zope3/lib/python/Zope/App/Security/tests/testProtectClass.py 1.2 => 1.3 ===
 
 from TestModuleHookup import *
-from Zope.App.Security.PermissionRegistry import permissionRegistry
+from Zope.App.Security.Registries.PermissionRegistry import permissionRegistry
 from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
 from Zope.App.Security.protectClass import protectName, protectLikeUnto
 


=== Zope3/lib/python/Zope/App/Security/tests/testProtectSubClass.py 1.2 => 1.3 ===
 from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
 from Zope.App.Security.protectClass import protectName
-from Zope.App.Security.PermissionRegistry import permissionRegistry
+from Zope.App.Security.Registries.PermissionRegistry import permissionRegistry
 from Zope.Security.Checker import selectChecker
 
 class Test(CleanUp, TestCase):


=== Zope3/lib/python/Zope/App/Security/tests/testSecurityDirectives.py 1.3 => 1.4 ===
 """
 
-import unittest, sys, os
-
-from Zope.Configuration.xmlconfig import xmlconfig
+import unittest
 from StringIO import StringIO
-from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
+
 from Zope.Configuration.xmlconfig import ZopeXMLConfigurationError
-from Zope.App.Security.PrincipalRegistry import principalRegistry
-from Zope.App.Security.PermissionRegistry \
+from Zope.Configuration.xmlconfig import XMLConfig, xmlconfig
+
+from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
+
+import Zope.App.Security
+from Zope.App.Security.Settings import Allow, Deny, Unset, Remove, Assign
+from Zope.App.Security.Registries.PrincipalRegistry import principalRegistry
+from Zope.App.Security.Registries.PermissionRegistry \
         import permissionRegistry as pregistry
-from Zope.App.Security.RoleRegistry import roleRegistry as rregistry
-from Zope.App.Security.RolePermissionManager \
+from Zope.App.Security.Registries.RoleRegistry import roleRegistry as rregistry
+from Zope.App.Security.Grants.Global.RolePermissionManager \
         import rolePermissionManager as role_perm_mgr
-from Zope.App.Security.PrincipalPermissionManager \
+from Zope.App.Security.Grants.Global.PrincipalPermissionManager \
     import principalPermissionManager as principal_perm_mgr
-from Zope.App.Security.PrincipalRoleManager \
+from Zope.App.Security.Grants.Global.PrincipalRoleManager \
     import principalRoleManager as principal_role_mgr
-from Zope.App.Security.Settings import Allow, Deny, Unset, Remove, Assign
 
 
-import Zope.App.Security
-defs_path = os.path.join(
-    os.path.split(Zope.App.Security.__file__)[0],
-    'meta.zcml')
-
 def configfile(s):
     return StringIO("""<zopeConfigure
-      xmlns='http://namespaces.zope.org/zope'
-      xmlns:security='http://namespaces.zope.org/security'>
+      xmlns='http://namespaces.zope.org/zope'>
       %s
       </zopeConfigure>
       """ % s)
 
 class TestPrincipalDirective(CleanUp, unittest.TestCase):
     def setUp(self):
-        xmlconfig(open(defs_path))
+        XMLConfig('meta.zcml', Zope.App.Security)()
 
     def testRegister(self):
-        f = configfile("""<security:principal id="1"
+        f = configfile("""<principal id="1"
                              title="Sir Tim Peters"
                              description="Tim Peters"
                              login="tim" password="123" />
-                          <security:principal id="2"
+                          <principal id="2"
                              title="Sir Jim Fulton"
                              description="Jim Fulton"
                              login="jim" password="123" />""")
@@ -79,11 +76,11 @@
 
 class TestPermissionDirective(CleanUp, unittest.TestCase):
     def setUp(self):
-        xmlconfig(open(defs_path))
+        XMLConfig('meta.zcml', Zope.App.Security)()
 
     def testRegister(self):
         f = configfile("""
- <security:permission
+ <permission
      id="Can Do It"
      title="A Permissive Permission"
      description="This permission lets you do anything" />""")
@@ -98,12 +95,12 @@
 
     def testDuplicationRegistration(self):
         f = configfile("""
- <security:permission
+ <permission
      id="Can Do It"
      title="A Permissive Permission"
      description="This permission lets you do anything" />
 
- <security:permission
+ <permission
      id="Can Do It"
      title="A Permissive Permission"
      description="This permission lets you do anything" />
@@ -114,11 +111,11 @@
         
 class TestRoleDirective(CleanUp, unittest.TestCase):
     def setUp(self):
-        xmlconfig(open(defs_path))
+        XMLConfig('meta.zcml', Zope.App.Security)()
 
     def testRegister(self):
         f = configfile("""
- <security:role
+ <role
      id="Everyperson"
      title="Tout le monde"
      description="The common man, woman, person, or thing" />
@@ -134,12 +131,12 @@
         
     def testDuplicationRegistration(self):
         f = configfile("""
- <security:role
+ <role
      id="Everyperson"
      title="Tout le monde"
      description="The common man, woman, person, or thing" />
 
- <security:role
+ <role
      id="Everyperson"
      title="Tout le monde"
      description="The common man, woman, person, or thing" />
@@ -151,11 +148,11 @@
 class TestRolePermission(CleanUp, unittest.TestCase):
 
     def setUp( self ):
-        xmlconfig(open(defs_path))
+        XMLConfig('meta.zcml', Zope.App.Security)()
 
     def testMap( self ):
         f = configfile("""
- <security:grantPermissionToRole
+ <grant
      permission="Foo"
      role="Bar" />
      """)
@@ -174,11 +171,11 @@
 class TestPrincipalPermission(CleanUp, unittest.TestCase):
 
     def setUp( self ):
-        xmlconfig(open(defs_path))
+        XMLConfig('meta.zcml', Zope.App.Security)()
 
     def testMap( self ):
         f = configfile("""
- <security:grantPermissionToPrincipal
+ <grant
      permission="Foo"
      principal="Bar" />
      """)
@@ -197,11 +194,11 @@
 class TestPrincipalRole(CleanUp, unittest.TestCase):
 
     def setUp( self ):
-        xmlconfig(open(defs_path))
+        XMLConfig('meta.zcml', Zope.App.Security)()
 
     def testMap( self ):
         f = configfile("""
- <security:assignRoleToPrincipal
+ <grant
      role="Foo"
      principal="Bar" />
      """)


=== Zope3/lib/python/Zope/App/Security/tests/testZSP.py 1.2 => 1.3 ===
 from Zope.ComponentArchitecture import getService
 from Zope.App.Security.IRolePermissionManager import IRolePermissionManager
-from Zope.App.Security.PermissionRegistry import permissionRegistry 
-from Zope.App.Security.PrincipalRegistry import principalRegistry 
-from Zope.App.Security.RoleRegistry import roleRegistry
-from Zope.App.Security.PrincipalPermissionManager \
+from Zope.App.Security.Registries.PermissionRegistry import permissionRegistry 
+from Zope.App.Security.Registries.PrincipalRegistry import principalRegistry 
+from Zope.App.Security.Registries.RoleRegistry import roleRegistry
+from Zope.App.Security.Grants.Global.PrincipalPermissionManager \
      import principalPermissionManager 
-from Zope.App.Security.RolePermissionManager import rolePermissionManager 
-from Zope.App.Security.PrincipalRoleManager import principalRoleManager 
-from Zope.App.Security.AnnotationPrincipalPermissionManager \
+from Zope.App.Security.Grants.Global.RolePermissionManager \
+     import rolePermissionManager 
+from Zope.App.Security.Grants.Global.PrincipalRoleManager \
+     import principalRoleManager 
+from Zope.App.Security.Grants.AnnotationPrincipalPermissionManager \
     import AnnotationPrincipalPermissionManager 
-from Zope.App.Security.PrincipalPermissionManager \
+from Zope.App.Security.Grants.Global.PrincipalPermissionManager \
     import PrincipalPermissionManager 
 from Zope.App.Security.IPrincipalPermissionManager \
     import IPrincipalPermissionManager 
-from Zope.App.Security.AnnotationPrincipalRoleManager \
+from Zope.App.Security.Grants.AnnotationPrincipalRoleManager \
     import AnnotationPrincipalRoleManager 
-from Zope.App.Security.PrincipalRoleManager \
+from Zope.App.Security.Grants.Global.PrincipalRoleManager \
     import PrincipalRoleManager 
-from Zope.App.Security.AnnotationRolePermissionManager \
+from Zope.App.Security.Grants.AnnotationRolePermissionManager \
     import AnnotationRolePermissionManager 
 from Zope.App.Security.IPrincipalRoleManager import IPrincipalRoleManager 
 from Zope.Exceptions import Unauthorized, Forbidden

=== Removed File Zope3/lib/python/Zope/App/Security/tests/PermissionService.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/RolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/RoleService.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testAnnotationPrincipalPermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testAnnotationPrincipalRoleManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testAnnotationRolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPermissionRegistry.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalPermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalPermissionView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalRegistry.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalRoleManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalRoleView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testRolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testRolePermissionView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testRoleRegistry.py ===




