[Zope3-checkins] CVS: Zope3/src/zope/app/security - meta.zcml:1.1.2.2 zopesecuritypolicy.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	meta.zcml zopesecuritypolicy.py 
Log Message:
changes to get zope.component tests to almost pass

=== Zope3/src/zope/app/security/meta.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/meta.zcml:1.1.2.1	Mon Dec 23 14:32:15 2002
+++ Zope3/src/zope/app/security/meta.zcml	Mon Dec 23 17:22:38 2002
@@ -1,7 +1,7 @@
 <zopeConfigure xmlns='http://namespaces.zope.org/zope'>
 
-  <include package=".Registries" file="meta.zcml" />
-  <include package=".Grants.Global" file="meta.zcml" />
+  <include package=".registries" file="meta.zcml" />
+  <include package=".grants" file="meta.zcml" />
 
   <directives namespace="http://namespaces.zope.org/zope">
     <directive name="securityPolicy" attributes="name"


=== Zope3/src/zope/app/security/zopesecuritypolicy.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/zopesecuritypolicy.py:1.1.2.1	Mon Dec 23 14:32:15 2002
+++ Zope3/src/zope/app/security/zopesecuritypolicy.py	Mon Dec 23 17:22:38 2002
@@ -36,11 +36,11 @@
 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 \
+from zope.app.security.grants.principalpermissionmanager \
      import principalPermissionManager 
-from zope.app.security.grants.global.rolepermissionmanager \
+from zope.app.security.grants.rolepermissionmanager \
      import rolePermissionManager 
-from zope.app.security.grants.global.principalrolemanager \
+from zope.app.security.grants.principalrolemanager \
      import principalRoleManager
 from zope.app.security.settings import Allow, Deny