[Zope3-checkins] CVS: Zope3/src/zope/app/security/grants/tests - test_annotationprincipalpermissionmanager.py:1.5 test_annotationprincipalrolemanager.py:1.5 test_annotationrolepermissionmanager.py:1.5 test_principalpermissionmanager.py:1.5 test_principalrolemanager.py:1.5 test_rolepermissionmanager.py:1.5

[R. Sean Bowman]

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

Modified Files:
	test_annotationprincipalpermissionmanager.py 
	test_annotationprincipalrolemanager.py 
	test_annotationrolepermissionmanager.py 
	test_principalpermissionmanager.py 
	test_principalrolemanager.py test_rolepermissionmanager.py 
Log Message:
moved non core CA service names to zope/app/services/servicenames.py,
renamed ResourceService to Resources


=== Zope3/src/zope/app/security/grants/tests/test_annotationprincipalpermissionmanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/grants/tests/test_annotationprincipalpermissionmanager.py:1.4	Thu Feb  6 01:49:50 2003
+++ Zope3/src/zope/app/security/grants/tests/test_annotationprincipalpermissionmanager.py	Tue Feb 11 21:17:32 2003
@@ -18,7 +18,7 @@
 
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.component import getService
-from zope.component.servicenames import Adapters
+from zope.app.services.servicenames import Adapters
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.app.security.registries.permissionregistry \


=== Zope3/src/zope/app/security/grants/tests/test_annotationprincipalrolemanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/grants/tests/test_annotationprincipalrolemanager.py:1.4	Thu Feb  6 01:49:50 2003
+++ Zope3/src/zope/app/security/grants/tests/test_annotationprincipalrolemanager.py	Tue Feb 11 21:17:32 2003
@@ -18,7 +18,7 @@
 
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.component import getService
-from zope.component.servicenames import Adapters
+from zope.app.services.servicenames import Adapters
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.app.security.registries.roleregistry import roleRegistry as rregistry


=== Zope3/src/zope/app/security/grants/tests/test_annotationrolepermissionmanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/grants/tests/test_annotationrolepermissionmanager.py:1.4	Thu Feb  6 01:49:50 2003
+++ Zope3/src/zope/app/security/grants/tests/test_annotationrolepermissionmanager.py	Tue Feb 11 21:17:32 2003
@@ -18,7 +18,7 @@
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.component \
      import getServiceManager, getService
-from zope.component.servicenames import Permissions, Adapters
+from zope.app.services.servicenames import Permissions, Adapters
 from zope.app.interfaces.security import IRoleService
 from zope.app.interfaces.security import IPermissionService
 from zope.app.security.registries.roleregistry import roleRegistry


=== Zope3/src/zope/app/security/grants/tests/test_principalpermissionmanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/grants/tests/test_principalpermissionmanager.py:1.4	Thu Feb  6 01:49:50 2003
+++ Zope3/src/zope/app/security/grants/tests/test_principalpermissionmanager.py	Tue Feb 11 21:17:32 2003
@@ -17,7 +17,7 @@
 import unittest
 
 from zope.component.service import serviceManager as services
-from zope.component.servicenames import Permissions, Authentication
+from zope.app.services.servicenames import Permissions, Authentication
 
 from zope.app.interfaces.security import IPermissionService
 from zope.app.interfaces.security import IAuthenticationService


=== Zope3/src/zope/app/security/grants/tests/test_principalrolemanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/grants/tests/test_principalrolemanager.py:1.4	Thu Feb  6 01:49:50 2003
+++ Zope3/src/zope/app/security/grants/tests/test_principalrolemanager.py	Tue Feb 11 21:17:32 2003
@@ -17,7 +17,7 @@
 import unittest
 
 from zope.component.service import serviceManager as services
-from zope.component.servicenames import Authentication
+from zope.app.services.servicenames import Authentication
 
 from zope.app.interfaces.security import IRoleService
 from zope.app.interfaces.security import IAuthenticationService


=== Zope3/src/zope/app/security/grants/tests/test_rolepermissionmanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/grants/tests/test_rolepermissionmanager.py:1.4	Thu Feb  6 01:49:50 2003
+++ Zope3/src/zope/app/security/grants/tests/test_rolepermissionmanager.py	Tue Feb 11 21:17:32 2003
@@ -17,7 +17,7 @@
 import unittest
 
 from zope.component.service import serviceManager as services
-from zope.component.servicenames import Permissions, Roles
+from zope.app.services.servicenames import Permissions, Roles
 
 from zope.app.interfaces.security import IPermissionService
 from zope.app.interfaces.security import IRoleService